Compare commits

...

1914 Commits

Author SHA1 Message Date
Kevin Decherf
66697b29b9 views: escape piwik host and siteId to prevent XSS
Fixes CVE-2018-11352

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-09-23 22:46:09 +02:00
Kevin Decherf
8013f35d96 Merge pull request #3719 from wallabag/fix-sort-parameters
Fix sort parameters
2018-09-07 17:02:39 +02:00
Jeremy Benoist
c0b65ad1c9 Updating node to 6.10
Same as defined in .travis.yml
2018-09-07 15:18:00 +02:00
Jeremy Benoist
4408ebd40a Fix tests 2018-09-07 15:18:00 +02:00
Jeremy Benoist
8d109df851 Jump to the new Scrutinizer PHP analysis engine 2018-09-07 15:18:00 +02:00
Jeremy Benoist
17476f4d8d Add missing parameters
Parameters weren’t passed to the sub function.
2018-09-07 13:56:14 +02:00
Jérémy Benoist
495f83c925 Merge pull request #3712 from wallabag/refactor-entry-queries
Rename getBuilderByUser and refactor query for untagged entries
2018-09-07 11:43:07 +00:00
Kevin Decherf
eb5e3f1d1d Merge pull request #3717 from wallabag/php-72
PHP 7.2 shouldn't fail
2018-09-06 11:28:57 +02:00
Jérémy Benoist
04f85fd9a8 PHP 7.2 shouldn't fail 2018-09-06 07:58:26 +02:00
Kevin Decherf
b8115ff46b php-cs-fixer
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-09-05 18:44:08 +02:00
Kevin Decherf
0636697289 EntryRepository: refactor getBuilderForUntaggedByUser
Improve SQL performance by replacing size(e.tags) with a left join and a
null condition

Move the QueryBuilder logic into getRawBuilderForUntaggedByUser

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-09-05 18:44:08 +02:00
Kevin Decherf
b7c5fda512 EntryRepository: refactor getBuilderByUser
We refactor getBuilderByUser to separate QueryBuilder getter and the
orderBy(). The previous code of getBuilderByUser() has been moved to
getSortedQueryBuilderByUser(). getBuildByUser() now returns a
QueryBuilder without the call to orderBy().

A new method named sortQueryBuilder() returns a given QueryBuilder with
an orderBy() call using given sort parameters.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-09-05 18:44:08 +02:00
Kevin Decherf
69b563948d AnnotationRepository: rename getBuilderByUser
We rename getBuilderByUser to getSortedQueryBuilderByUser as long as the
method currently returns a QueryBuilder with an orderBy()

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-09-05 18:44:08 +02:00
Jérémy Benoist
ada5d5b269 Merge pull request #3716 from wallabag/csfixer
php-cs-fixer: native_function_invocation
2018-09-05 16:38:20 +00:00
Kevin Decherf
2a1ceb67b4 php-cs-fixer
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-09-05 14:25:32 +02:00
Jérémy Benoist
685a5d745e Merge pull request #3707 from wallabag/fix-test-de-at
Removing failing test from Travis
2018-08-19 18:15:11 +02:00
Jeremy Benoist
72efc80fdc Removing failing test from Travis 2018-08-19 16:38:48 +02:00
Jérémy Benoist
fea06d19f3 Merge pull request #3705 from wallabag/update-release
Update release script
2018-08-19 09:17:40 +02:00
Jeremy Benoist
2bf568ff46 Update release script 2018-08-17 14:40:06 +02:00
Jérémy Benoist
1421236800 Merge pull request #3702 from aleksandar-todorovic/patch-1
Fixes a typo
2018-08-16 14:45:23 +02:00
Aleksandar Todorović (r3bl)
e0a9791412 Fixes another typo 2018-08-10 20:28:48 +02:00
Aleksandar Todorović (r3bl)
7fd4ad6564 Fixes a typo 2018-08-10 20:15:46 +02:00
Jérémy Benoist
d29b18e82e Merge pull request #3690 from Simounet/fix/srcset-attribute
More robust srcset image attribute handling
2018-07-23 16:24:20 +00:00
Simounet
e6f12c0734 More robust srcset image attribute handling
Linked to HTMLawed PR https://github.com/kesar/HTMLawed/pull/17
2018-07-12 14:29:30 +02:00
Jérémy Benoist
0f36a88e16 Merge pull request #3692 from Simounet/feature/svg-logo
Feature/svg logo
2018-07-12 11:31:30 +00:00
Simounet
e93f37206a wallabag logo (side-nav) replaced by an SVG one 2018-07-11 21:57:53 +02:00
Simounet
4c78612eb4 wallabag logo with typo replaced by an SVG one 2018-07-11 21:51:52 +02:00
Simounet
2fdd512488 Fake wallabag logo data image replaced by real SVG 2018-07-11 21:25:46 +02:00
Jérémy Benoist
9b12f822e1 Merge pull request #3691 from Simounet/feature/login-username-autofocus
Autofocus the username field on the login page
2018-07-11 18:49:38 +00:00
Simounet
d02e6850c2 Autofocus the username field on the login page 2018-07-11 20:10:51 +02:00
Jérémy Benoist
6337b46e80 Merge pull request #3678 from anmol26s/patch-1
Propose YunoHost badge for installing
2018-07-06 05:40:03 +00:00
Jérémy Benoist
9216bab8c9 Merge pull request #3683 from Simounet/fix/iframe-video-width-shared
Fix mobile viewport on big iframe and video elements
2018-07-06 05:38:39 +00:00
Jérémy Benoist
9bc086071a Merge pull request #3686 from wallabag/remove-trusted-proxies
Remove remaining deprecation notices
2018-07-06 05:38:02 +00:00
Jeremy Benoist
80336f77fd The 'framework.trusted_proxies' configuration key has been deprecated in Symfony 3.3 2018-07-05 21:01:45 +02:00
Jérémy Benoist
200392b462 Merge pull request #3685 from wallabag/fix-random-failing-test
Replace SO url by lemonde.fr to avoid random failing test
2018-07-05 13:37:28 +00:00
Jeremy Benoist
9c48053b14 Replace SO url by lemonde
Looks like we got a lot of random failing while grabing SO content, replacing it might fix the problem.
2018-07-05 14:50:27 +02:00
Jérémy Benoist
18167b9a24 Merge pull request #3684 from Simounet/fix/empty-image-download-error
Fix image downloading on null image path
2018-07-05 12:15:50 +00:00
Simounet
3fbbe0d9f1 Fix image downloading on null image path 2018-07-05 11:40:51 +02:00
Simounet
6cf7f21dcb Fix mobile viewport on big iframe and video elements 2018-06-28 15:22:51 +02:00
anmol26s
8d09f57c0d Propose YunoHost badge for installing
The YunoHost have working Wallabag package with working install,remove,update,backup and restore scripts. YunoHost makes self -hosting easy for the end users. Please add the this badge so that people can find this solution.
2018-06-22 02:43:43 +05:30
Jérémy Benoist
e586d65b64 Merge pull request #3675 from wallabag/prepare-2.3.3
Prepare 2.3.3 release
2018-06-19 07:44:48 +00:00
Jeremy Benoist
7ddba67745 Prepare 2.3.3 release 2018-06-19 06:50:13 +02:00
Jérémy Benoist
7ebd4bdcf7 Merge pull request #3538 from wallabag/fix-migrations-dash
Fixed migrations with dash into db names
2018-06-15 05:25:44 +00:00
Jeremy Benoist
49b4c87598 We should able to get the table name unescaped
When we want to perform complex queries to retrieve metadata from the database
2018-06-14 14:15:07 +02:00
Jeremy Benoist
bfe7a69226 Fixed migrations with dash into db name 2018-06-14 13:43:09 +02:00
Jérémy Benoist
36054f5dd4 Merge pull request #3636 from flozz/syntax-highlight
Highlight code in articles using highlight.js
2018-06-07 06:22:14 +00:00
Jérémy Benoist
c00a691019 Merge pull request #3668 from wallabag/fix-tests
Fix tests
2018-06-07 06:21:06 +00:00
Jeremy Benoist
778543311f Fix tests 2018-06-06 17:34:20 +02:00
Jérémy Benoist
a550a64c84 Merge pull request #3614 from comradekingu/patch-3
Spelling: GitHub, Log out, of the dev
2018-06-06 14:26:40 +00:00
Jérémy Benoist
def73759ae Merge pull request #3664 from Simounet/fix/entry-attributes-encoding
Fix authors and preview alt encoding display
2018-06-05 04:33:37 +00:00
Simounet
03f2cacb58 Fix authors and preview alt encoding display 2018-06-04 12:04:37 +02:00
Jérémy Benoist
fea68d1a72 Merge pull request #3646 from Quenty31/master
[i18n] Occitan update
2018-06-01 14:53:49 +02:00
Jérémy Benoist
8fe73e076c Merge pull request #3661 from Simounet/fix/2981-srcset-image
Fix srcset attribute on images downloaded
2018-06-01 14:53:04 +02:00
Simounet
c15bb5ad72 Fix srcset attribute on images downloaded 2018-06-01 13:49:16 +02:00
Jérémy Benoist
9707ac4661 Merge pull request #3653 from Simounet/fix/firefox-mobile-unneeded-resize
Fix/firefox mobile unneeded resize
2018-05-24 21:36:51 +02:00
Simounet
53ec80be94 Fix missing generated CSS 2018-05-24 11:57:22 +02:00
Simounet
f136d288d6 Fix Firefox mobile unneeded resize
Before that, on Firefox Mobile, when you were moving to the top or to
the bottom of the page, you were stopped before to go to the opposite
side.
2018-05-24 09:04:02 +02:00
Jérémy Benoist
1d770f9867 Merge pull request #3652 from Simounet/fix/overflow-wrap
Fix overflow wrap issue
2018-05-24 07:16:36 +02:00
Simounet
a6e5637507 Fix overflow wrap issue 2018-05-21 19:47:28 +02:00
Quentí
65f499b4ac Update wallabag_user.oc.yml 2018-05-06 12:36:55 +02:00
Quentí
4745ca3fde Update CraueConfigBundle.oc.yml 2018-05-05 21:16:20 +02:00
Quentí
7c3184376c Update wallabag_user.oc.yml
Mens dialectal, mai estandard
2018-05-05 21:15:01 +02:00
Quentí
609adaca9b Update messages.oc.yml 2018-05-05 21:13:55 +02:00
Quentí
9562a8aca8 Update CraueConfigBundle.oc.yml 2018-05-05 21:09:00 +02:00
Fabien LOISON
b2e7b8b600 Highlight code in articles using highlight.js 2018-04-23 19:11:24 +02:00
Jérémy Benoist
11f15430ff Merge pull request #3615 from notFloran/3612-login-by-email
Allow login by email
2018-04-03 22:08:42 +02:00
Jérémy Benoist
a0f126b973 Merge pull request #3616 from notFloran/3404-bookmarklet-encoding
Better encoding of the URI for the bookmarklet
2018-04-03 22:07:52 +02:00
Floran Brutel
08d6bedcaa Allow login by email 2018-04-01 20:57:10 +02:00
Floran Brutel
8e5b91180e Better encoding of the URI for the bookmarklet 2018-04-01 20:55:45 +02:00
Jérémy Benoist
3b46d0f947 Merge pull request #3619 from notFloran/fix-tests
Fix tests
2018-04-01 11:12:32 +02:00
Floran Brutel
80d4260a8e Fix CS in UtilsTest.php 2018-03-31 12:55:27 +02:00
Floran Brutel
739a4024fa Replace zataz url 2018-03-30 23:09:03 +02:00
Floran Brutel
3be96dcb17 Use https instead of http for bild.de to fix tests 2018-03-29 22:58:40 +02:00
Allan Nordhøy
f400aa1281 GitHub, Log out, of the dev 2018-03-25 04:31:22 +02:00
Jérémy Benoist
727880c950 Merge pull request #3597 from wallabag/fix-tests
Fix tests
2018-03-17 13:28:10 +01:00
Jérémy Benoist
2ff26deaf8 Merge pull request #3592 from Simounet/fix/html-entities-on-default-title
Fix title card HTML parsing
2018-02-24 22:24:24 +01:00
Jeremy Benoist
ad77c3451f Looked UserBundle again.
See https://github.com/FriendsOfSymfony/FOSUserBundle/compare/v2.0.2...v2.1.0#diff-8a79d0e62995dd549be4e463c35a8cc3

It generate an error about a variable called `registration_enabled` which can not be found.
So I guess we are in the case of “such usage” about BC in UserBundle. Don’t want to loose time finding how to fix it. Rollback to the working version.
2018-02-24 22:12:48 +01:00
Jeremy Benoist
bf283db8e6 20 Minutes is now https 2018-02-24 22:02:52 +01:00
Jérémy Benoist
228d317204 Merge pull request #3573 from shulard/fix/unknown-withremove-variable
Fix error when withRemove variable is not defined.
2018-02-24 21:52:56 +01:00
Simounet
4d9128ded9 Fix title card HTML parsing 2018-02-12 22:19:15 +01:00
Stéphane HULARD
cc09434ea4 Fix error when withRemove variable is not defined.
Since the withRemove variable is a template flag, it can be undefined.

In the Entry\Card\_content.html.twig template for example, the withRemove variable is not defined.
2018-01-23 18:51:52 +01:00
Nicolas Lœuillet
f24e9bfab0 Merge pull request #3568 from wallabag/prepare-2.3.2
Prepare 2.3.2 release
2018-01-22 11:10:12 +01:00
Jeremy Benoist
ac1811f83e Prepare 2.3.2 release 2018-01-22 10:06:31 +01:00
Nicolas Lœuillet
fd637b9a5a Merge pull request #3541 from Simounet/feature/nav-label-replaced-by-buttons
Nav actions updated
2018-01-12 23:10:21 +01:00
Nicolas Lœuillet
5614df19cf Fixed tests 2018-01-12 11:19:11 +01:00
Simounet
91f5992423 Close add entry and search nav JS action improved 2018-01-12 10:07:46 +01:00
Simounet
2831e77cce Nav close button alignment and nav boxes improved 2018-01-12 10:07:46 +01:00
Simounet
63771b9ae3 Fix nav new entry and search form alignment 2018-01-12 10:07:46 +01:00
Simounet
f86c2b5fa6 Label replaced by a button on the nav search form 2018-01-12 10:07:46 +01:00
Simounet
e9e3f93805 Label replaced by a button on the nav new entry form 2018-01-12 10:07:46 +01:00
Kevin Decherf
99e8c2785b Merge pull request #3546 from Strubbl/fix-2957-abort-update-on-error
add `set -eu` to update.sh
2018-01-03 21:00:43 +01:00
Nicolas Lœuillet
410216f435 Merge pull request #3536 from wallabag/tag-link-3534
Fix broken link to remove tags from entries
2018-01-03 20:37:57 +01:00
Sven Fischer
f3e71b5dd5 add set -eu to update.sh
fixes #2957
2018-01-03 05:34:29 +01:00
Kevin Decherf
b8568662bd php-cs
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-31 13:19:26 +01:00
Kevin Decherf
e0a862b626 Add test to prevent regression for #3534
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-31 00:56:40 +01:00
Nicolas Lœuillet
2679eb9d84 Merge pull request #3539 from wallabag/wallabag/new-client-button
Replaced Create new client link with a button
2017-12-28 11:12:06 +01:00
Nicolas Lœuillet
8fa6d62197 Replaced Create new client link with a button 2017-12-28 10:21:28 +01:00
Kevin Decherf
8e15ece7df Fix broken link to remove tags from entries
Fixes #3534

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-27 22:53:03 +01:00
Nicolas Lœuillet
3473e600b1 Merge pull request #3525 from Simounet/fix/empty-card-title-link
Fix empty card title link
2017-12-26 16:00:58 +01:00
Nicolas Lœuillet
c04bde29a3 Added default value for title on entry view 2017-12-26 15:40:38 +01:00
Nicolas Lœuillet
11ed735c09 Merge pull request #3532 from wallabag/prepare-231
Prepared wallabag 2.3.1
2017-12-26 10:13:11 +01:00
Nicolas Lœuillet
f83e9e32fc Prepared wallabag 2.3.1 2017-12-26 09:15:39 +01:00
Nicolas Lœuillet
8ffcee8aff Updated baggy theme for the no-title fix 2017-12-26 09:07:28 +01:00
Simounet
5e0c44a2ac Using new 'entry.default_title' as translation key 2017-12-26 09:02:00 +01:00
Simounet
49fb9e7cab Card tags template shared 2017-12-26 09:02:00 +01:00
Simounet
a8541089be Useless span removed from the card's title 2017-12-26 09:00:33 +01:00
Simounet
ac8489f5f7 Default card title 2017-12-26 08:55:23 +01:00
Simounet
3c9548257c Content card template shared 2017-12-26 08:55:23 +01:00
Nicolas Lœuillet
726e2cf3c6 Merge pull request #3524 from wallabag/fix-assets-sub
Fix assets for subfolder install
2017-12-26 08:49:59 +01:00
Kevin Decherf
0d9c8081fe cs-fixer
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-20 22:18:26 +01:00
Kevin Decherf
575d1d03d9 Update prod assets
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-20 21:55:34 +01:00
Kevin Decherf
e8694faad6 Remove fixed relative path for assets 2017-12-20 21:53:48 +01:00
Nicolas Lœuillet
887073dedc Merge pull request #3521 from wallabag/mruminski-patch-1
Update messages.pl.yml
2017-12-19 10:02:52 +01:00
Mateusz Rumiński
a9d274424f Update messages.pl.yml
add polish translation for 'provided by' and 'origin url'
2017-12-18 21:01:22 +01:00
Nicolas Lœuillet
ef5c8a7d01 Merge pull request #3515 from wallabag/php-7.2
Add PHP 7.2 compatibility
2017-12-18 14:32:21 +01:00
Nicolas Lœuillet
01ea7f5855 Merge pull request #3348 from pmichelazzo/master
Update PT translations
2017-12-18 13:34:01 +01:00
Jeremy Benoist
ad880894a8 Update CHANGELOG 2017-12-18 13:30:03 +01:00
Jeremy Benoist
acc0a80179 Add missing assertion in tests 2017-12-18 13:29:34 +01:00
Jeremy Benoist
5661e8d42a Fix countable in tests 2017-12-18 13:29:34 +01:00
Jeremy Benoist
7185fbff62 Update dama/doctrine-test-bundle
Because:

PHP Fatal error:  Class 'PHPUnit_Framework_BaseTestListener' not found in /home/travis/build/wallabag/wallabag/vendor/dama/doctrine-test-bundle/src/DAMA/DoctrineTestBundle/PHPUnit/LegacyPHPUnitListener.php on line 7
2017-12-18 13:29:34 +01:00
Jeremy Benoist
4b6942d2d8 Add missing TestCase namespace 2017-12-18 13:29:33 +01:00
Jeremy Benoist
26e2f07419 Fix typo 2017-12-18 13:29:33 +01:00
Jeremy Benoist
eb3754509d Add missing parameter for test 2017-12-18 13:29:33 +01:00
Jeremy Benoist
bd91bd5c32 Use namespaced PHPUnit classes 2017-12-18 13:29:33 +01:00
Nicolas Lœuillet
3ccf086391 Merge pull request #3516 from wallabag/delete-id
api: copy entry object before sending, to keep id
2017-12-18 12:33:05 +01:00
Nicolas Lœuillet
9e89bf7aca Removed duplicated line 2017-12-17 21:20:23 +01:00
Kevin Decherf
f5ea67e4cf api: copy entry object before sending, to keep id
Workaround for https://github.com/wallabag/android-app/issues/646

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-17 21:07:46 +01:00
Paulino Michelazzo
a5849ac956 Update PT translations 2017-12-17 10:57:17 +01:00
Jérémy Benoist
d1f260e2d7 Merge pull request #3504 from aaa2000/fix-initial-migration-with-table-prefix
Fix initial migration when using custom table prefix
2017-12-16 22:24:06 +01:00
Jeremy Benoist
ccb52fb461 Use getTable() to retrieve prefixed table name 2017-12-16 22:08:00 +01:00
Nicolas Lœuillet
d1224bf9f6 Merge pull request #3513 from wallabag/icons-3437
material: replace exit_to_app, redo and autorenew icons
2017-12-16 21:35:32 +01:00
Nicolas Lœuillet
b10be65ec7 Merge pull request #3511 from wallabag/install-command-note
command: replace note regarding server:run --env=prod
2017-12-16 20:16:13 +01:00
Kevin Decherf
65d885da00 material: replace exit_to_app, redo and autorenew icons
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-16 20:07:11 +01:00
Kevin Decherf
f565e10817 command: replace note regarding server:run --env=prod
server:run --env=prod does not exist anymore
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-16 19:14:25 +01:00
Nicolas Lœuillet
64e7c90ae9 Merge pull request #3507 from wallabag/fix-lowercase-migration
Fixed lower case tags migration
2017-12-16 09:02:56 +01:00
Nicolas Lœuillet
9b606725fe Merge pull request #3510 from wallabag/update-robotstxt
Updated robots.txt to prevent crawling
2017-12-16 09:02:40 +01:00
Nicolas Lœuillet
e4ae6b976f Updated robots.txt to prevent crawling 2017-12-15 21:51:12 +01:00
Nicolas Lœuillet
caf719f163 Fixed lower case tags migration 2017-12-15 13:59:02 +01:00
adev
f1f2cf2bce Fix initial migration when using custom table prefix
Fix #3503
2017-12-14 19:14:10 +01:00
Jérémy Benoist
a68a80f654 Merge pull request #3442 from wallabag/empty-entry
Fix empty title and domain_name when exception is thrown during fetch
2017-12-14 11:19:44 +01:00
Kevin Decherf
b457d7bd32 Update CHANGELOG
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-13 22:52:30 +01:00
Kevin Decherf
300f293cb1 Add test on EntryControllerTest for #3442
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-13 22:44:31 +01:00
Kevin Decherf
af29e1bf07 Fix empty title and domain_name when exception is thrown during fetch
Add a new helper to set a default title when it's empty:
1/ use basename part of entry's path, if any
2/ or use domain name

Fixes #2053

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-13 22:44:31 +01:00
Jérémy Benoist
70265817ae Merge pull request #3488 from wallabag/pg-10
Add custom driver & schema manager for PostgreSQL 10
2017-12-13 13:50:15 +01:00
Nicolas Lœuillet
08d6497c9c Merge pull request #3495 from wallabag/wallabag/remove-make-run-readme
Removed "make run" in the README
2017-12-13 12:06:38 +01:00
Nicolas Lœuillet
cef72d87a6 Removed "make run" in the README 2017-12-12 20:52:05 +01:00
Nicolas Lœuillet
d80e9931f5 Merge pull request #3492 from bdunogier/fix-3484-disable_share_link
Fix 3484: hide the share toggle button if no service is enabled
2017-12-12 20:24:36 +01:00
Nicolas Lœuillet
71318d6103 Merge pull request #3490 from wallabag/fix-rss-unread-icon
Displayed the RSS icon on homepage route
2017-12-12 20:20:52 +01:00
Nicolas Lœuillet
1f198256ed Merge pull request #3487 from wallabag/initial-migration
Change the way to check for initial migration
2017-12-12 20:20:31 +01:00
Bertrand Dunogier
0ef1ffbf71 Fix #3484: hide the share toggle button if no service is enabled 2017-12-12 18:36:24 +01:00
Nicolas Lœuillet
629f913b8d Displayed the RSS icon on homepage route 2017-12-12 15:42:49 +01:00
Jeremy Benoist
3fadf42a1c CS 2017-12-12 14:30:22 +01:00
Jeremy Benoist
ad46f2fb46 Use hasTable instead of try/catch 2017-12-12 13:41:44 +01:00
Jeremy Benoist
2e9747a59a Fix tests 2017-12-12 13:34:06 +01:00
Jeremy Benoist
a1661af17c Add custom driver & schema manager for PostgreSQL 10 2017-12-12 12:14:40 +01:00
Jeremy Benoist
43e1711eb6 Change the way to check for initial migration 2017-12-12 11:17:16 +01:00
Nicolas Lœuillet
f209798368 Merge pull request #3481 from wallabag/fix-make-run
Replaced env by dev for make run
2017-12-12 09:50:33 +01:00
Nicolas Lœuillet
60f53cf46f Replaced env by dev for make run
The symfony server:run command can only be used in dev environment
2017-12-12 08:55:18 +01:00
Nicolas Lœuillet
cabadf169b Merge pull request #3478 from odolbeau/patch-1
Update README.md
2017-12-12 07:42:53 +01:00
Olivier Dolbeau
63e6ee1293 Update README.md
Be ready for next year!
2017-12-11 22:32:39 +00:00
Nicolas Lœuillet
bd527a9f4c Merge pull request #3474 from wallabag/update-changelog
Updated changelog for 2.3
2017-12-11 19:53:10 +01:00
Nicolas Lœuillet
42f4f11ef0 Updated changelog for 2.3 2017-12-11 19:52:21 +01:00
Nicolas Lœuillet
98869090f6 Merge pull request #3468 from wallabag/fix-migration-3139
Fix migration from #3139
2017-12-11 19:38:46 +01:00
Nicolas Lœuillet
c31daf4725 Merge pull request #3473 from cvergne/fix-rssall
Fix All RSS not accessible if not logged in + Tests
2017-12-11 19:38:21 +01:00
Jérémy Benoist
12e7599b35 Merge pull request #3471 from cvergne/fix-rssdate
Fix #3448 - pubDate now conformant to DateTime RFC822 specifications
2017-12-11 16:11:23 +01:00
Christophe VERGNE
a40a8038d3 Fix All RSS not accessible if not logged in + Tests 2017-12-11 16:04:06 +01:00
Christophe VERGNE
70d73bdd86 Fix #3448 - pubDate now conformant to Date and Time specifications defined by RFC822 2017-12-11 13:17:42 +01:00
Kevin Decherf
40a63c8b11 migrations: fix duplicate violation during lowercase tag migration
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-10 19:31:30 +01:00
Kevin Decherf
6c5904ba7f Replace raw query with named parameter
Fix possible issue with special chars on #3139

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-12-10 18:22:41 +01:00
Jérémy Benoist
e9a4231d4f Merge pull request #3465 from wallabag/fix-tests
Fix bad key matching
2017-12-10 13:33:23 +01:00
Jérémy Benoist
55bd59962c Merge pull request #3467 from Simounet/feat/nav-improved
Feat/nav improved
2017-12-10 13:33:06 +01:00
Simounet
f072829ce3 More space for navbar actions on mobile 2017-12-08 21:10:36 +01:00
Simounet
da2a5fe222 Toggle menu anchor replaced by a button 2017-12-08 21:01:44 +01:00
Jeremy Benoist
4ac0e65963 Fix bad key matching
I didn't try to find which package introduced a BC (might be user-bundle
or jms serializer)
2017-12-08 12:10:28 +01:00
Jérémy Benoist
e99be2c134 Merge pull request #3461 from Simounet/fix/rss-on-tag-list
Tag's list improved
2017-12-08 10:27:43 +01:00
Simounet
7475924eac Border radius on every corner of tag's list 2017-12-08 10:20:58 +01:00
Simounet
c235cb75cd Fix duplicated code removed 2017-12-08 10:18:49 +01:00
Simounet
3e7d86b2c5 Tags list view improved
No text ellipsis so we can see the whole tag, better responsiveness, bigger
touch height on links.
2017-12-08 10:18:49 +01:00
Jérémy Benoist
77a53ea724 Merge pull request #3463 from Simounet/feature/footer-improved
Footer improved
2017-12-08 10:10:15 +01:00
Simounet
93e3329c58 Fix nav title nowrap on mobile 2017-12-07 23:46:29 +01:00
Simounet
a6beec1bd2 Footer's stats displayed on mobile 2017-12-06 22:46:24 +01:00
Simounet
39217f3108 Fix line-height issue on the footer 2017-12-06 22:21:19 +01:00
Nicolas Lœuillet
613a8ec312 Merge pull request #3438 from strobeltobias/patch-1
Translate new strings
2017-12-05 17:46:40 +01:00
Jérémy Benoist
aeab8b342e Merge pull request #3459 from Simounet/fix/pagination
Pagination improved
2017-12-05 10:03:32 +01:00
Simounet
1f84aa903d Fix wrong selected page number alignment on pagination 2017-12-04 22:46:35 +01:00
Simounet
f836b98fa6 Fix pagination on list mode 2017-12-04 22:31:30 +01:00
Jérémy Benoist
b9be1cf1ee Merge pull request #3449 from Simounet/feature/share-page
Share page improved (mobile + header's padding)
2017-12-04 10:11:32 +01:00
Simounet
2784f674ea Figure image and figcaption centered on share page 2017-12-03 14:41:15 +01:00
Simounet
970e107524 Share page improved (mobile + header's padding) 2017-12-03 14:38:46 +01:00
Tobias Strobel
e2ee70f477 Translate new validators string 2017-11-26 14:49:59 +01:00
Tobias Strobel
ca8d3ed598 Translate new strings 2017-11-26 14:24:03 +01:00
Nicolas Lœuillet
1d91f14516 Merge pull request #3436 from wallabag/origin-shaarli
Add craue setting to enable sharing of origin url to Shaarli
2017-11-26 08:58:17 +01:00
Kevin Decherf
893fd6434f Add craue setting to enable sharing of origin url to Shaarli
Also fix the field name used in the query string and add it to baggy
theme

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-25 17:07:55 +01:00
Jérémy Benoist
773ac5b0f7 Merge pull request #3419 from NatJNP/patch1
Add Thai language
2017-11-25 12:29:53 +01:00
Jérémy Benoist
ceff312db8 Merge pull request #3401 from aaa2000/migration-initial
Add an initial doctrine migration
2017-11-25 12:28:41 +01:00
NatPi
2020b4456c Add all file thai Language for translate 2017-11-24 02:53:01 +07:00
Jérémy Benoist
f818f64145 Merge pull request #3431 from wallabag/disable-site-credentials
Disable controller access if feature disabled
2017-11-22 15:11:25 +01:00
Jeremy Benoist
ef2b4041fb Disable controller access if feature disabled
If `restricted_access` is disabled, accessing `/site-credentials/` must be disabled.
2017-11-22 10:00:45 +01:00
adev
f4e7a0df0e Fix phpcs 2017-11-21 22:07:37 +01:00
adev
e36c85eb79 Fix travis fold 2017-11-21 21:35:17 +01:00
adev
4c0ac1d10b Remove data sql files 2017-11-21 21:35:17 +01:00
adev
18865cec86 Implements down migration 2017-11-21 21:35:17 +01:00
adev
2680b0bc8c Fix installation command 2017-11-21 21:35:17 +01:00
adev
2054740fdb Fold travis make prepare 2017-11-21 21:35:16 +01:00
adev
18fb777b89 Add an initial migration 2017-11-21 21:35:16 +01:00
Nicolas Lœuillet
d3d0defabc Merge pull request #3398 from wallabag/issue-1735
Replace ant with Makefile
2017-11-21 15:12:48 +01:00
Nicolas Lœuillet
95b7d92ea5 Merge pull request #3425 from wallabag/add-setting-for-headers
Added internal setting to enable/disable headers storage
2017-11-21 13:26:24 +01:00
Nicolas Lœuillet
fb258aeef0 Merge pull request #3426 from wallabag/fix-migration-3373
Fix MySQL issue on mig from #3373
2017-11-21 11:03:39 +01:00
Jeremy Benoist
709e21a3f4 Define storeArticleHeaders false by default
Fix tests which must use `$storeArticleHeaders`.
Fix CS
2017-11-21 10:37:36 +01:00
Jeremy Benoist
64a5a6cfc5 CS 2017-11-21 10:30:35 +01:00
Kevin Decherf
b3d85e69e9 Fix MySQL issue on mig from #3373
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-20 22:39:33 +01:00
Nicolas Lœuillet
f4f7994c40 Merge pull request #3346 from Kdecherf/origin-property
Add originUrl property to Entry
2017-11-20 21:10:33 +01:00
Kevin Decherf
16b1939827 Merge pull request #3423 from wallabag/composer
composer: update dependency versions to reduce memory footprint
2017-11-20 19:51:03 +01:00
Nicolas Lœuillet
8a21985474 Added internal setting to enable/disable headers storage 2017-11-20 18:47:48 +01:00
Kevin Decherf
b495929c0d composer: update dependency versions to reduce memory footprint
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 21:00:27 +01:00
Kevin Decherf
eae8138b33 Fix phpcs
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:26:13 +01:00
Kevin Decherf
65152fcb89 Improve EntryRestControllerTest for origin_url
Ensure that origin_url is initially null
Ensure patching entry with origin_url=''
Ensure patching entry with origin_url=null

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
Kevin Decherf
97444566db Update EntryControllerTest to handle origin_url
Set an origin_url in testEditUpdate
Test origin_url deletion in testEditRemoveOriginUrl

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
Kevin Decherf
ecf41ab3fa Replace hardcoded 'Provided by' string with i18n string
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
Kevin Decherf
3b771f51a6 Improve origin_url field description and translations
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
Kevin Decherf
8425f5cc3d Form: move url and origin_url to UrlType 2017-11-19 15:02:11 +01:00
Kevin Decherf
6de4cd35b5 Add support of originUrl field in baggy entry view 2017-11-19 15:02:11 +01:00
Kevin Decherf
00f2368f7a Add some tests for OriginUrl in EntryRestController
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
Kevin Decherf
3198ea9682 Handle original_url querystring in Shaarli sharing link
This feature needs at least shaarli-plugin-via 0.2 from
https://github.com/Kdecherf/shaarli-plugin-via to work.

Shaarli will silently ignore this parameter if this plugin is missing.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
Kevin Decherf
f0f162b8d2 Add support of originUrl field in material entry view
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
Kevin Decherf
e50e45d6fa Twig: add removeSchemeAndWww filter
This twig filter removes scheme (only http and https are supported) and
pass the result to removeWww filter to also remove 'www.' at the
beginning of an url.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
Kevin Decherf
03b020eb20 Entry: handle originUrl in edit form, update translations
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
Kevin Decherf
e0ef1a1c8b Add originUrl property to Entry, handle that in EntryRestController, handle migration
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
Nicolas Lœuillet
e585dde46c Merge pull request #3422 from wallabag/simpleue-2
Jump to Simpleue 2.0
2017-11-19 13:53:13 +01:00
Kevin Decherf
8bde7de1ee Replace ant with Makefile
Fixes #1735

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 12:33:21 +01:00
Kevin Decherf
f6988b5aa3 Merge pull request #3421 from comradekingu/patch-2
Spelling: diaspora, e-mail, moved ?, URL, sharing
2017-11-19 11:31:46 +01:00
Kevin Decherf
00d66d39fc Merge pull request #3420 from comradekingu/patch-1
Spelling: Two-factor for wallabag connection
2017-11-19 11:31:26 +01:00
Jeremy Benoist
c8ac32cf17 Jump to Simpleue 2.0
The 1.3.0 tag is introducing BC so we jump to the 2.0
2017-11-18 16:28:54 +01:00
Allan Nordhøy
2c437e930c "for the public wallabag demo", paywalled websites, diaspora* 2017-11-18 04:55:33 +01:00
Allan Nordhøy
3c6b00dc28 Spelling: diaspora, e-mail, moved ?, URL, sharing 2017-11-18 04:52:28 +01:00
Allan Nordhøy
13e677648c Spelling: Two-factor for wallabag connection 2017-11-18 04:39:52 +01:00
NatPi
d0c596461b Add CraueConfigBundle.th.yml 2017-11-18 01:27:51 +07:00
Jérémy Benoist
2a4a861b34 Merge pull request #3412 from aaa2000/fix-tests
Fix the tests
2017-11-12 11:33:18 +01:00
adev
cc79712738 Fix phpcs 2017-11-11 23:55:13 +01:00
adev
d81bf605af Fix tests 2017-11-11 23:37:57 +01:00
Kevin Decherf
f39cfa4690 Merge pull request #3404 from wallabag/issue-2424
material: replace card activator with article link on card preview
2017-11-07 13:59:47 +01:00
Kevin Decherf
2f510787e7 material: replace card activator with article link on card preview
Fixes #2424

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-06 20:49:41 +01:00
Kevin Decherf
8abb6c1321 Merge pull request #3397 from wallabag/issue-1871
material: disable editing of entry url input when submitting new url
2017-11-06 20:43:48 +01:00
Kevin Decherf
46ee68ea48 Update assets for #3397 2017-11-05 13:20:50 +01:00
Kevin Decherf
3d46eeeb33 material: disable editing of entry url input when submitting new url
Fixes #1871

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-05 13:14:47 +01:00
Jérémy Benoist
b0f9e52b7e Merge pull request #3387 from Kdecherf/fix-assets-23
Fix assets for 2.3
2017-11-02 15:49:37 +02:00
Jérémy Benoist
dccec95401 Merge pull request #3399 from aaa2000/editorconfig-makefile
Update .editorconfig for makefile
2017-11-02 10:21:10 +02:00
adev
5872cd191c Update .editorconfig for makefile 2017-11-01 14:47:06 +01:00
Kevin Decherf
c20327fc72 Merge pull request #3395 from wallabag/issue-3393
views/config: fix overlaying drop down menu
2017-11-01 11:12:44 +01:00
Kevin Decherf
8801764583 views/config: fix overlaying drop down menu
Fixes #3393
2017-10-31 23:16:15 +01:00
Jérémy Benoist
494b47f299 Merge pull request #3392 from mart-e/add-title-page-epub
add the title of article on the epub export
2017-10-31 15:10:41 +02:00
Jeremy Benoist
15a6402f75 Properly run php-cs-fixer 2017-10-28 20:16:43 +02:00
Martin Trigaux
385e651684 php-cs-fixer
php bin/php-cs-fixer fix src/Wallabag/CoreBundle/Helper/EntriesExport.php
2017-10-28 17:17:22 +02:00
Martin Trigaux
c779373f2c Set the title in a separated chapter
Set the export option on the same page, same as done in producePdf
Move the ToC at the end of the book so the title page is the first one
2017-10-28 14:49:14 +02:00
Martin Trigaux
a6e9ad0b7d add a title page
The first page of the book is the title
2017-10-28 10:45:37 +02:00
Kevin Decherf
efbbfe0135 Updating .gitignore
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-24 00:20:56 +02:00
Kevin Decherf
0b3ab03782 Removing web/bundles/wallabagcore and adding prod assets in web/wallassets
baggy.css, baggy.js, material.css, material.js and public.js are seen as
new files, something changed in these files.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-24 00:19:00 +02:00
Kevin Decherf
9ff628ca56 webpack & views: replace bundles/wallabagcore with wallassets
This change will prevent composer from removing wallabagcore assets when
installing assets.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-24 00:15:52 +02:00
Jérémy Benoist
1953a87293 Merge pull request #3011 from wallabag/2.3
wallabag 2.3.0
2017-10-23 11:09:17 +02:00
Nicolas Lœuillet
702f2d67d6 Merge pull request #3385 from wallabag/prepare-23
Prepare wallabag 2.3.0
2017-10-20 15:43:13 +02:00
Nicolas Lœuillet
b4da3ee8e5 Prepare wallabag 2.3.0 2017-10-20 14:17:37 +02:00
Nicolas Lœuillet
8a30241dc5 Merge pull request #3384 from wallabag/mruminski-patch-1
Update messages.pl.yml
2017-10-19 15:07:43 +02:00
Mateusz Rumiński
3828f525e1 Update messages.pl.yml
add polish translation for export footer_template
2017-10-19 13:07:24 +02:00
Nicolas Lœuillet
1c5081cdc5 Merge pull request #3373 from wallabag/change-readingtime-notnull
Changed reading_time field to prevent null values
2017-10-18 11:33:30 +02:00
Jérémy Benoist
91f9bacf73 Merge pull request #3362 from sviande/fix_3361_api_warning
Fix #3361 check type for tags in entry repository
2017-10-18 11:16:50 +02:00
Nicolas Lœuillet
7f5d03a98d Merge pull request #3383 from Kdecherf/fix-webpack-and-login
Fix webpack and login screen
2017-10-16 09:02:47 +02:00
Kevin Decherf
3f29386cb7 Update prod assets
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-16 00:07:12 +02:00
Kevin Decherf
7a1e1247cb webpack: handle _global img folder
Fixes missing image files after composer cleaning assets

Source of requireAll(): https://stackoverflow.com/a/30652110

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-16 00:01:52 +02:00
Kevin Decherf
ef7f187fa8 Fix non-centered login form
Fixes #3343

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-16 00:01:52 +02:00
Jérémy Benoist
3930201003 Merge pull request #3382 from nclsHart/replace-kernel-rootdir
Replace kernel.root_dir by kernel.project_dir
2017-10-15 09:24:32 +02:00
Jérémy Benoist
64f4112cae Merge pull request #3381 from nclsHart/webserverbundle
Enable WebServerBundle in dev environment
2017-10-15 09:23:31 +02:00
Nicolas Hart
9ca069a6fe Replace kernel.root_dir by kernel.project_dir
kernel.root_dir and Kernel::getRootDir() are deprecated since Symfony 3.3.
See https://symfony.com/blog/new-in-symfony-3-3-a-simpler-way-to-get-the-project-root-directory and https://github.com/symfony/symfony/blob/3.3/UPGRADE-3.3.md#httpkernel for more information.
2017-10-14 00:32:56 +02:00
Nicolas Hart
3c9fbb4e32 Enable WebServerBundle in dev environment
Since #3376, the web server console commands were not available.
2017-10-13 23:04:16 +02:00
Sébastien Viande
0978bd849e Fix #3361 Entry Rest controller getEntries cast tags params to string 2017-10-13 10:28:05 +02:00
Nicolas Lœuillet
abce2f05dd Fixed @Kdecherf's review 2017-10-13 10:11:24 +02:00
Jeremy Benoist
705d3c38dc CS 2017-10-13 09:35:44 +02:00
Nicolas Lœuillet
88bac4a33e Changed reading_time field to prevent null values 2017-10-13 09:35:44 +02:00
Jeremy Benoist
bb86dc6486 CS 2017-10-12 07:38:27 +02:00
Sébastien Viande
d03b72f405 Fix #3361 add test 2017-10-12 07:38:27 +02:00
Sébastien Viande
fafdf17117 Fix #3361 check type for tags in entry repository
Check is $tags is a string before explode
2017-10-12 07:38:27 +02:00
Nicolas Lœuillet
f44a927530 Merge pull request #3372 from wallabag/translate-export-page
Translated first page of exported article
2017-10-11 14:12:49 +02:00
Jeremy Benoist
9dd67fa342 CS 2017-10-11 10:43:36 +02:00
Nicolas Lœuillet
8f187e280f Fixed @j0k3r's review 2017-10-11 10:43:19 +02:00
Nicolas Lœuillet
dc7fa8dfc6 Fixed @tcitworld's review 2017-10-11 10:43:19 +02:00
Nicolas Lœuillet
b1428a1cf8 Translated first page of exported article 2017-10-11 10:43:19 +02:00
Jérémy Benoist
d8dc7372ab Merge pull request #3376 from wallabag/symfony-3.3
Symfony 3.3
2017-10-11 09:55:03 +02:00
Jérémy Benoist
21bdbb2d5e Merge pull request #3378 from wallabag/2.3-ru
Add Russian language
2017-10-10 12:22:22 +02:00
Олег
4bea44da92 update Russian language 2017-10-10 10:48:38 +02:00
Олег
ef5fcdee20 add Russian language 2017-10-10 10:48:29 +02:00
Олег
28af2989ec Add Russian language in CoreBundle Resources and CraueConfigBundle 2017-10-10 10:47:48 +02:00
Jeremy Benoist
f645d371ce Fix MondeDiplo https url 2017-10-10 10:20:57 +02:00
Jeremy Benoist
3ef055ced3 CS 2017-10-09 16:47:15 +02:00
Jeremy Benoist
f40c88eb1f Jump to Symfony 3.3 & update others deps
Also update tests urls
2017-10-09 16:45:12 +02:00
Nicolas Lœuillet
ed5e175c20 Merge pull request #3347 from Kdecherf/entry-stats
Entry view: update .stats margins and color
2017-09-16 13:01:33 +02:00
Kevin Decherf
79ea33c9d3 Entry view: update .stats margins and color
Decreasing margin of .stats, increasing vertical margin of .stats li,
increasing right margin of material icons and reducing contrast of
material icons.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-09-09 21:35:19 +02:00
Jérémy Benoist
23246a5da6 Merge pull request #3345 from wallabag/Quent-in-patch-1
Update messages.oc.yml
2017-09-09 18:57:50 +02:00
Quent-in
f764407daf Update messages.oc.yml 2017-09-09 18:23:59 +02:00
Jérémy Benoist
061fca8c6e Merge pull request #3340 from Kdecherf/fix-webpack
Fix webpack error on comments
2017-09-07 07:17:05 +02:00
Jérémy Benoist
f6d042f56d Merge pull request #3309 from wallabag/fix-multiple-tag-search
Multiple tag search, which was broken from API
2017-09-07 07:16:26 +02:00
Jeremy Benoist
9c4a7388da Remove unused function
Introduce after the rebase I guess
2017-09-06 22:58:35 +02:00
Jeremy Benoist
33264c2d02 Fix tests 2017-09-06 22:49:16 +02:00
Jeremy Benoist
7c04b7396a Multiple tag search was broken from API
First, the setParameter() were done on the same parameter which in fact
just duplicated the condition in the SQL query (like `where t.label =
'test' and t.label = 'test'`.

Changed the parameter doesn't help because the query was then wrong.

Changing the way to match associated tags for an entry and it worked.
2017-09-06 22:49:15 +02:00
Kevin Decherf
e317a5ab60 Fix webpack error on comments
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-09-06 22:42:23 +02:00
Nicolas Lœuillet
78b36d4dbe Merge pull request #3332 from nclsHart/better-txt-export
Better entry txt export using html2text
2017-09-06 15:08:12 +02:00
Jérémy Benoist
b9c26b6330 Merge pull request #3337 from strobeltobias/patch-1
Add missing quotation marks and small fixes (2)
2017-09-04 12:09:26 +02:00
Jérémy Benoist
e85657fb10 Update messages.de.yml 2017-09-04 11:17:26 +02:00
Jérémy Benoist
f3e688207d Merge pull request #3333 from Quent-in/2.3
Update OC
2017-09-03 20:26:16 +02:00
Jérémy Benoist
3af5d41759 Merge pull request #3139 from Kdecherf/2502-tag-case
Ignore tag's case
2017-09-03 20:25:15 +02:00
Jérémy Benoist
9c4d1eb56a Merge pull request #3338 from strobeltobias/patch-2
Translate missing strings, add quotation marks
2017-09-03 20:24:41 +02:00
Tobias Strobel
bcb10aeef8 Update to comply with suggested changes 2017-09-03 15:15:38 +02:00
Tobias Strobel
973392cc48 Translate missing strings, add quotation marks 2017-09-01 23:15:18 +02:00
Tobias Strobel
6c2a56458b Add missing quotation marks and small fixes (2) 2017-09-01 23:01:57 +02:00
Quent-in
442147d923 Update wallabag_user.oc.yml 2017-08-30 20:10:58 +02:00
Quent-in
a09136d2d2 Update CraueConfigBundle.oc.yml 2017-08-30 20:09:16 +02:00
Quent-in
de4bbe4968 Update validators.oc.yml 2017-08-30 20:06:34 +02:00
Quent-in
9f33293b7e Update 2017-08-30 20:01:11 +02:00
Jérémy Benoist
119e6c5edb Merge pull request #3330 from franek/set-starred-date
Add starred_at field which is set when an entry is starred
2017-08-30 13:53:49 +02:00
Jérémy Benoist
854616ac6d Merge pull request #3294 from wallabag/export-tag-null
Empty currentTag should be null
2017-08-30 13:51:20 +02:00
Kevin Decherf
7b4f66881d php-cs-fixer on DoctrineMigrations/Version20170719231144
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-08-27 16:59:02 +02:00
Jeremy Benoist
e437ad810b Fix tests
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-08-27 16:51:23 +02:00
Kevin Decherf
bd164a75c4 Add migration to change case of tags
This migration does not support SQLite as long as this engine does not
support Unicode in LOWER().

This migration starts by retrieving the list of lowercase tags which
need to be migrated. Then it retrieves the list of tags for each tags
from the previous step in order to migrate entries. It handles deletion
of empty tags. At the end the migration makes a full scan to update the
label of all remaining tags.

WARNING: THIS MIGRATION IS IRREVERSIBLE.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-08-27 16:51:23 +02:00
Kevin Decherf
7036d91fe7 Tag: render tags case-insensitive by storing them in lowercase
Fixes #2502

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-08-27 16:51:23 +02:00
Nicolas Hart
c660878388 better entry txt export using html2text 2017-08-27 00:04:21 +02:00
François D
a991c46eed Set a starred_at field when an entry is starred.
This date is used to sort starred entries.

Can not use Entry::timestamps method otherwise starred_at will be updated each time entry is updated.
Add an updateStar method into Entry class
A migration script has been added in order to set starred_at field.
2017-08-25 21:19:47 +02:00
Jeremy Benoist
2490f61dca Merge remote-tracking branch 'origin/master' into 2.3 2017-08-22 11:22:47 +02:00
Jérémy Benoist
54171dd796 Merge pull request #3326 from nclsHart/reload-entry-command
Add reload entry command
2017-08-22 11:21:04 +02:00
Nicolas Hart
dbf1188c5b rename getAllEntriesIdAndUrl into findAllEntriesIdAndUrlByUserId 2017-08-22 10:42:54 +02:00
Nicolas Hart
215409a8b2 rename getAllEntriesId into findAllEntriesIdByUserId 2017-08-22 10:41:28 +02:00
Nicolas Hart
511f1ce1e8 Add reload entry command 2017-08-21 10:45:48 +02:00
Jérémy Benoist
d83d25dade Merge pull request #3323 from egilli/fix-export-link-with-baggy
Fix export links in baggy theme
2017-08-14 17:45:16 +02:00
Étienne Gilli
aa29fc4ec6 Fix export links in baggy theme 2017-08-13 18:03:32 +02:00
Jérémy Benoist
73b3d449b1 Merge pull request #3322 from braco/patch-1
Update Readme with crucial information
2017-08-12 09:32:51 +02:00
braco
d0804524a1 Update Readme with crucial information 2017-08-10 14:54:58 -04:00
Jérémy Benoist
4d2758dfa0 Merge pull request #3319 from Quent-in/2.3
Translation : OC small changes
2017-08-10 10:13:09 +02:00
Quent-in
0d7d472c91 Small change
Apostrophe par erreur, et "aller À votre compte" et non "sur", pas choquant mais mieux je pense en OC.
2017-08-09 18:40:19 +02:00
Jérémy Benoist
86ecd2b543 Merge pull request #3314 from nclsHart/fix-3313
Reduce number of queries on tag list
2017-08-08 19:48:47 +02:00
Jérémy Benoist
aff1dd4ff1 Merge pull request #3317 from wallabag/mruminski-patch-1
Update messages.pl.yml
2017-08-08 19:38:43 +02:00
Mateusz Rumiński
e86ee7fd1e Update messages.pl.yml
add polish translation for credentials
2017-08-08 15:45:44 +02:00
Nicolas Hart
935e9fffb4 Reduce number of queries on tag list 2017-08-06 23:02:32 +02:00
Jérémy Benoist
f11a3cf21c Merge pull request #3312 from Quent-in/2.3
Occitan language updates
2017-08-06 15:39:04 +02:00
Quent-in
1aa5b75804 Correction apostrophe encadrée par simples apostrophes 2017-08-05 20:20:18 +02:00
Quent-in
efeaadcf9d Correction indent. L538
Correction indentation suite rapport Travis
2017-08-05 19:48:45 +02:00
Jérémy Benoist
fccc3a2e07 Merge pull request #3311 from nclsHart/makefile-webpack
Fix make build by replacing grunt with webpack
2017-08-05 19:19:09 +02:00
Quent-in
162740b798 Update
2FA : choix des occitanophones interrogés : autentificacion en dos temps.
+ fautes de frappes
2017-08-05 15:19:34 +02:00
Quent-in
86de3eb766 Update OC: correction fautes de frappe 2017-08-05 15:14:34 +02:00
Quent-in
5942d358b7 Update with new strings
L538 : not quite sure about the number of space.
2017-08-05 14:58:15 +02:00
Quent-in
a4fcb2e5c6 Update registration using API 2017-08-05 14:46:33 +02:00
Nicolas Hart
5385fda8ab Fix make build by replacing grunt with webpack 2017-08-05 00:21:05 +02:00
Jérémy Benoist
8b5bef48d5 Merge pull request #3301 from nclsHart/list-user-command
Add list users command
2017-08-02 07:25:02 +02:00
Nicolas Hart
f7a4b44136 add search argument and limit option to list users command 2017-07-31 23:20:41 +02:00
Nicolas Hart
af31cfed76 Add list user command 2017-07-30 22:04:29 +02:00
Jérémy Benoist
882da5c5eb Merge pull request #3297 from nclsHart/commands-better-rendering
Better rendering for all core commands
2017-07-30 08:31:04 +02:00
Jérémy Benoist
4fc7eba349 Merge pull request #3298 from nclsHart/fix-namespace-phpdoc
Fix some namespaces and phpdoc
2017-07-30 08:27:39 +02:00
Jérémy Benoist
e492f8da13 Merge pull request #3299 from nclsHart/missing-method-prepare-entry
Add missing abstract method prepareEntry in BrowserImport
2017-07-30 08:10:50 +02:00
Nicolas Hart
fe312015d2 Add missing abstract method prepareEntry in BrowserImport 2017-07-29 22:59:11 +02:00
Nicolas Hart
52b84c11a5 Fix some namespaces and phpdoc 2017-07-29 22:51:50 +02:00
Nicolas Hart
e1b33efb3d Better rendering for all core commands 2017-07-29 11:09:02 +02:00
Jérémy Benoist
d69a66a58e Merge pull request #3290 from nclsHart/fix-3019
Add a dedicated title for all entries page
2017-07-29 09:34:29 +02:00
Jeremy Benoist
bde23a44f8 Empty currentTag should be null
And when a parameter is null, it won't appear in the url like `?tag=`.
2017-07-28 08:07:11 +02:00
Jérémy Benoist
233eb91be4 Merge pull request #3291 from nclsHart/show-user-io
Better rendering for show user command using symfony style
2017-07-28 07:38:15 +02:00
Jérémy Benoist
e56f82142a Merge pull request #3292 from nclsHart/remove-getdoctrine
Remove unused method getDoctrine in several commands
2017-07-28 07:36:27 +02:00
Jérémy Benoist
6f9aba78a7 Merge pull request #3293 from nclsHart/remove-unused-use
Remove unused use statement in install command
2017-07-28 07:35:48 +02:00
Nicolas Hart
04f19537e7 Remove unused use statement in install command 2017-07-27 23:51:01 +02:00
Nicolas Hart
a19e212f43 Remove unused method getDoctrine in several commands 2017-07-27 23:44:12 +02:00
Nicolas Hart
d58199f362 Better rendering for show user command using symfony style 2017-07-27 23:34:57 +02:00
Nicolas Hart
383215866f add a dedicated title for all entries page 2017-07-27 23:08:08 +02:00
Jérémy Benoist
839edf32cc Merge pull request #3280 from Simounet/fix/2.3-date
Fix updatePublishedAt on already parsed article's date
2017-07-25 16:54:43 +02:00
Jérémy Benoist
35c1f1376c Merge pull request #3284 from wallabag/travis-7.2
Testing on PHP 7.2
2017-07-24 17:38:41 +02:00
Jeremy Benoist
ff9f89fd23 Add a test for updatePublishedAt
To avoid error when a content is re-submitted and it previously add a
published date.

Also, fix the `testPostSameEntry`
2017-07-24 17:07:47 +02:00
Simounet
b236d3f627 Fix updatePublishedAt on already parsed article's date 2017-07-24 16:39:07 +02:00
Jérémy Benoist
9ab45e6813 Testing on PHP 7.2 2017-07-24 15:48:53 +02:00
Jérémy Benoist
ea127a401b Merge pull request #3283 from wallabag/fix-language-validation
Put the final URL in data test
2017-07-24 13:54:01 +02:00
Jeremy Benoist
459374022f CS 2017-07-24 11:52:43 +02:00
Jeremy Benoist
c6c45673af Put the final URL in data test 2017-07-24 11:13:53 +02:00
Jérémy Benoist
f39152ad6e Merge pull request #3266 from egilli/export-domain-as-author
Use the article publisher as author for exported files
2017-07-11 09:21:49 +02:00
Jérémy Benoist
c7fcca533d Merge pull request #3270 from wallabag/do-not-allow-html-api
Disallow html for API templating formats
2017-07-11 07:30:30 +02:00
Jérémy Benoist
9aa11176b8 Merge pull request #3264 from wallabag/trait-timestamps
Add EntityTimestampsTrait to handle dates
2017-07-11 07:30:08 +02:00
Étienne Gilli
eeabca8090 Make updateAuthor code simpler to read 2017-07-10 10:08:20 +02:00
Jérémy Benoist
337e807297 Merge pull request #3267 from wallabag/revert-client-credentials
Revert client_credentials grant types
2017-07-09 21:22:28 +02:00
Étienne Gilli
c57f69d967 Use the article publisher as author for export
When exporting an entry, use the publishedBy field as author name for
epub, mobi and pdf formats. Fallback to domain name if empty.
2017-07-09 18:33:14 +02:00
Jeremy Benoist
2e6239bb9f Disallow html for templating formats
Using html template format will then put the html format in the allowed list for the api doc which we don’t want since the api doesn’t response for html format.
2017-07-09 10:07:14 +02:00
Étienne Gilli
07320a2bd2 Use the article domain as author for export files
When exporting an entry, use the domain name as author name for epub,
mobi and pdf formats, instead of 'wallabag'.
Change the author from array to string, because for now, there is always
only one author.
2017-07-08 19:53:43 +02:00
Jeremy Benoist
2e5b2fa808 Revert client_credentials grant types 2017-07-08 19:28:12 +02:00
Jeremy Benoist
927c9e796f Add EntityTimestampsTrait to handle dates
Refactorize timestamps() method to avoid re-writing it on each entity
2017-07-06 09:01:51 +02:00
Jérémy Benoist
b5d7eb148c Merge pull request #3256 from wallabag/fix-patch
Fix PATCH method
2017-07-05 15:00:24 +02:00
Jérémy Benoist
896f981ff5 Merge pull request #3257 from wallabag/fix-mapping-entities
Fixed mapping entities
2017-07-03 17:15:45 +02:00
Jeremy Benoist
c18a2476b6 CS 2017-07-03 13:56:39 +02:00
Jeremy Benoist
d0ec2ddd23 Fix validateAndSetPreviewPicture
Which wasn't covered by a test!
2017-07-03 13:45:04 +02:00
Jeremy Benoist
a05b61159e Fix PATCH method
The PATCH method for the entry should only update what user sent to us and not the whole entry as it was before.
Also, sending tags when patching an entry will now remove all current tags & assocatied new ones.
2017-07-03 13:45:04 +02:00
Jeremy Benoist
e50d7d31c0 CS 2017-07-03 13:40:47 +02:00
Jeremy Benoist
9114615adc Fixed mapping entities
There were this error in the console:

> The association Wallabag\CoreBundle\Entity\SiteCredential#user refers to the inverse side field Wallabag\UserBundle\Entity\User#site_credentials which does not exist.
2017-07-03 13:40:47 +02:00
Jérémy Benoist
71e1cbc8eb Merge pull request #3258 from wallabag/cs-fixer
Add a real configuration for CS-Fixer
2017-07-03 13:39:54 +02:00
Jeremy Benoist
38520658ad Fix tests 2017-07-03 07:30:54 +02:00
Jeremy Benoist
f808b01692 Add a real configuration for CS-Fixer 2017-07-01 09:52:38 +02:00
Jérémy Benoist
822c877949 Merge pull request #3245 from wallabag/fix-bc
Avoid BC on exists endpoint
2017-06-29 11:17:58 +02:00
Jérémy Benoist
331e5b0261 CS 2017-06-28 09:18:22 +02:00
Jeremy Benoist
39ffaba323 Return null instead of false 2017-06-28 08:15:06 +02:00
Jeremy Benoist
42708d1121 Merge remote-tracking branch 'origin/master' into 2.3 2017-06-26 10:05:48 +02:00
Jérémy Benoist
53e1892eb6 Merge pull request #3237 from matteocoder/master
Revised messages.it.yml file
2017-06-26 10:00:35 +02:00
matteocoder
559cbfdc2f Fixed broken lines and added new lines
In addition to fixing broken lines, I've also added a couple of lines from recent PRs.
2017-06-24 11:06:09 +02:00
Jeremy Benoist
18696f77fd Avoid BC on exists endpoint 2017-06-23 08:30:23 +02:00
Jérémy Benoist
29714661b1 Merge pull request #3204 from wallabag/better-export-page
Better public sharing page
2017-06-22 15:34:46 +02:00
Thomas Citharel
151f45db0e Don't load js for nothing in prod 2017-06-22 14:55:49 +02:00
Thomas Citharel
77255d6688 Add css on share public page 2017-06-22 12:15:24 +02:00
Jeremy Benoist
6b1b148d65 Add share.scss file
Still needs to include it in the twig template
2017-06-22 12:13:22 +02:00
Jeremy Benoist
789c46821d Fix linter issue on webpack config files 2017-06-22 12:13:22 +02:00
Sven Fischer
38dd2def20 add 🇮🇹 shared_by_wallabag string translated by @matteocoder 2017-06-22 12:13:22 +02:00
Sven Fischer
5642d1a150 adjust 🇩🇪 shared_by_wallabag string to include user info 2017-06-22 12:13:22 +02:00
Jeremy Benoist
77c5140bed Better export page
I’ve increase the width of the page 900px, 600px looks too small for me. Should we use something like 90% instead?
2017-06-22 12:13:22 +02:00
Nicolas Lœuillet
9416053bfc Merge pull request #3241 from wallabag/fix-qr-code-trans
Fix translations on QR code instructions
2017-06-22 10:26:41 +02:00
Nicolas Lœuillet
d0702f9fbd Merge pull request #3227 from wallabag/oauth-client-credentials
Add client_credentials oAuth2 auth method
2017-06-22 10:00:23 +02:00
Jérémy Benoist
1adab57426 Add 🇮🇹 translation 2017-06-22 09:12:57 +02:00
Mateusz Rumiński
8c3d7875b2 Update polish
add missing translation
2017-06-22 09:12:57 +02:00
Thomas Citharel
e2a038d653 Fix translations on QR code instructions 2017-06-22 09:12:57 +02:00
Jérémy Benoist
8c68acff2a Merge pull request #3207 from wallabag/tag-rss
Add RSS for tags
2017-06-21 14:51:46 +02:00
Thomas Citharel
bd40f1af88 Add all entries RSS feed and put links on tag page itself and baggy too
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-21 12:02:04 +02:00
Jeremy Benoist
ebf2d92327 Fix typo 2017-06-21 11:44:36 +02:00
Thomas Citharel
8c59809432 add rss icon
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-21 11:44:36 +02:00
Jeremy Benoist
11b8695663 Fix tests 2017-06-21 11:44:35 +02:00
Jeremy Benoist
03ce43d466 Fix getContainer in command 2017-06-21 11:44:35 +02:00
Jeremy Benoist
18c38dffc6 Add RSS tags feeds 2017-06-21 11:44:35 +02:00
Jeremy Benoist
25203e5081 User existing service instead of getDoctrine 2017-06-21 11:44:35 +02:00
Jérémy Benoist
80784b782b Merge pull request #2683 from wallabag/credentials-in-db
Store credentials in DB
2017-06-20 16:40:48 +02:00
Jeremy Benoist
f44dba22fc Get rid of masked value in listing 2017-06-20 16:03:39 +02:00
Thomas Citharel
bead8b42da Fix reviews
Encrypt username too
Redirect to list after saving credentials
Fix typos

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-20 16:03:39 +02:00
Jeremy Benoist
906424c1b6 Crypt site credential password 2017-06-20 16:03:35 +02:00
Jeremy Benoist
9de9f1e5ce Add a live test for restricted article
It is not aimed to test if we can get the full article (since we aren't using real login/password)
but mostly to test the full work (with authentication, etc.)

Do not clean fixtured to avoid SQLite to re-use id for entry tag relation 😓
2017-06-20 16:03:20 +02:00
Jeremy Benoist
fd7fde9515 Force sequence creation for postgresql 2017-06-20 16:03:20 +02:00
Jeremy Benoist
b8427f22f0 Add menu access to site credentials CRUD 2017-06-20 16:03:14 +02:00
Jeremy Benoist
5a9bc00726 Retrieve username/password from database
Inject the current user & the repo to retrieve username/password from the database
2017-06-20 16:03:13 +02:00
Jeremy Benoist
fc6d92c63d Update route & user verification 2017-06-20 16:03:13 +02:00
Jeremy Benoist
f92fcb53ca Add CRUD for site credentials 2017-06-20 16:03:08 +02:00
Jérémy Benoist
604cca1f42 Merge pull request #3215 from wallabag/fix-3192
Empty preview pictures and language return null
2017-06-20 06:43:59 +02:00
matteocoder
fbb39b61bd Merge pull request #1 from matteocoder/matteocoder-messages.it
revised messages.it
2017-06-17 13:42:50 +02:00
matteocoder
508f248676 revised messages.it 2017-06-17 13:42:28 +02:00
Thomas Citharel
7e271553fe Merge pull request #3229 from wallabag/fix-mobile-view
Fix mobile view and update asset deps
2017-06-15 09:56:39 +02:00
Thomas Citharel
f99ebec0f2 Fix mobile view and update asset deps
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-15 07:58:12 +02:00
Thomas Citharel
caa0b1765b Add client_credentials oAuth2 auth method
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-14 17:30:12 +02:00
Nicolas Lœuillet
f93a3109a5 Merge pull request #3220 from wallabag/remove-padding
Removed padding on entry view
2017-06-13 17:54:06 +02:00
Nicolas Lœuillet
6cc1d32454 Updated production files 2017-06-13 17:07:44 +02:00
Nicolas Lœuillet
dfd821dcfb Removed padding on entry view 2017-06-13 16:52:14 +02:00
Nicolas Lœuillet
4dc9fb705f Merge pull request #3213 from wallabag/fix-internal-settings-form
Fixed internal settings form
2017-06-13 10:24:47 +02:00
Thomas Citharel
41d45c6122 Fix empty language and preview pics 2017-06-12 16:46:33 +02:00
Nicolas Lœuillet
b662c65e57 Fixed internal settings form 2017-06-12 10:44:08 +02:00
Nicolas Lœuillet
977ac0a1d6 Merge pull request #3208 from wallabag/is-public
Add ability to filter public entries & use it in the API
2017-06-12 10:26:01 +02:00
Jeremy Benoist
d9da186fb8 CS 2017-06-10 16:08:24 +02:00
Jeremy Benoist
a9c6577f0c Few fixes 2017-06-10 15:37:25 +02:00
Jeremy Benoist
1112e54772 Add public filter/field in the API
Listing entries can now be filtered by “public”.
Creating or patching an entry can now set is to public or remove the public.
Entry response now include “is_public” boolean field
2017-06-10 15:31:57 +02:00
Jeremy Benoist
e8911f7c09 Add isPublic filter on entries 2017-06-10 15:00:52 +02:00
Jeremy Benoist
873f6b8e03 Merge remote-tracking branch 'origin/master' into 2.3 2017-06-10 14:41:30 +02:00
Jérémy Benoist
f6d45eca76 Merge pull request #3206 from wallabag/mruminski-patch-1
Update validators.pl.yml
2017-06-10 13:17:20 +02:00
Jérémy Benoist
de9445cd25 Merge pull request #3203 from wallabag/fix-tag-count-baggy
Fix tags count in tags list on baggy
2017-06-10 13:16:10 +02:00
Jérémy Benoist
a3477df5c9 Merge pull request #3202 from pVesian/master
Config label improvement #3199
2017-06-10 13:14:42 +02:00
Mateusz Rumiński
8da86b3f93 Update validators.pl.yml
add "quote_length_too_high" translation
2017-06-10 12:40:40 +02:00
Jérémy Benoist
679aaf0836 Merge pull request #3173 from wallabag/domain-name-param
remove craueconfig domain name setting and add a proper one in parame…
2017-06-10 11:36:03 +02:00
Jeremy Benoist
3fd6790893 Update translations 2017-06-10 11:29:56 +02:00
Jeremy Benoist
a9b984feee Fix tags count in tags list on baggy 2017-06-10 11:21:47 +02:00
Jérémy Benoist
a899399989 Merge pull request #3192 from wallabag/validate-content-fields
Validate language & preview picture fields
2017-06-09 13:51:26 +02:00
Pierre de Vésian
491371a051 Config label improvement #3199 2017-06-09 12:11:48 +02:00
Jeremy Benoist
1f7018e1fe Cleanup test
Looks like we didn't ALWAYS get a value for language from 20minutes.
Ahem.
2017-06-09 11:52:41 +02:00
Jeremy Benoist
80e49ba7b0 Convert - to _ in language
Mostly to increase language supports
2017-06-09 11:42:09 +02:00
Jeremy Benoist
42f3bb2c63 Use Locale instead of Language 2017-06-09 11:28:04 +02:00
Jérémy Benoist
5c762616c3 Merge pull request #3195 from wallabag/authentication-error
Log an error level message when user auth fail
2017-06-09 11:05:34 +02:00
Jeremy Benoist
1a94252831 Promote https 2017-06-09 10:07:27 +02:00
Jeremy Benoist
f81a34e379 Use a listener to catch auth failure 2017-06-09 09:45:43 +02:00
Jeremy Benoist
fa1c9d7cc7 CS 2017-06-08 22:52:26 +02:00
Jeremy Benoist
e9056dd96f Fix test
de_DE is not valid language.
Zataz doesn’t send a valid language in their content (they use `fr-FR`).
2017-06-08 22:51:30 +02:00
Jeremy Benoist
63f9f22fa3 Log an error level message when user auth fail
When a user login using the form we know log an error level information with information about the user:
- username used
- IP
- User agent

For example:

> Authentication failure for user "eza", from IP "127.0.0.1", with UA: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36".

It’ll allows server admin using fail2ban to configure it to block these people if they generate too much failure authentication.
2017-06-08 22:24:49 +02:00
Jeremy Benoist
be54dfe4e6 CS 2017-06-08 21:56:20 +02:00
Jeremy Benoist
0d349ea670 Validate language & preview picture fields
Instead of saving the value of each field right into the content without any validation, it seems better to validate them.
This might sounds obvious now we say that.
2017-06-08 21:51:46 +02:00
Jeremy Benoist
80f4d85ac9 Review 2017-06-08 19:15:33 +02:00
Jérémy Benoist
3f474025d8 Merge pull request #3187 from wallabag/api-client-credentials
Create (and return) a client after creating a new user using the API
2017-06-08 17:24:49 +02:00
Jeremy Benoist
a8d3fe50df Add ability to name the client 2017-06-08 14:25:44 +02:00
Nicolas Lœuillet
2da8f071cf Merge pull request #3189 from wallabag/add-discourse
Added link to community in issue template
2017-06-08 14:02:12 +02:00
Nicolas Lœuillet
b0f323c976 Added link to community in issue template 2017-06-08 13:34:14 +02:00
Jeremy Benoist
eb570e49c8 CS 2017-06-07 23:31:14 +02:00
Jeremy Benoist
0c00e52516 Create a client when creating a user using the api
While creating a new user using the API, we also create a new client for the current user.
So the app which just create the user can use its newly created client to configure the app.

That new client is only return after creating the user.
When calling the endpoint /api/user to get user information, the new client information won’t be return.
2017-06-07 23:23:28 +02:00
Nicolas Lœuillet
7bb3aa3177 Merge pull request #3093 from aaa2000/annotation-error-on-save
Displays an error with an annotation with a too long quote
2017-06-07 16:30:27 +02:00
Jérémy Benoist
c0d756f67d Merge pull request #3181 from wallabag/api-content-patch
Add ability to patch an entry with more fields
2017-06-07 15:40:59 +02:00
Jeremy Benoist
db0c48af36 Refactorize the way to save an Entry in the API 2017-06-07 15:07:55 +02:00
Jérémy Benoist
4e4a5b534f Merge pull request #3184 from wallabag/better-way-image-extension
Use an alternative way to detect images
2017-06-07 13:41:25 +02:00
Jérémy Benoist
a3f16a5685 Merge pull request #3179 from wallabag/show-user-command
Show user command
2017-06-07 09:40:56 +02:00
adev
c406cef5b6 Fix postgresql migration 2017-06-07 00:12:20 +02:00
Jeremy Benoist
c07ec4b682 Merge remote-tracking branch 'origin/master' into 2.3 2017-06-06 20:15:21 +02:00
Thomas Citharel
e48b238a3e fix tests 2017-06-06 16:18:25 +02:00
Thomas Citharel
d6c4c484c4 add migration 2017-06-06 16:04:51 +02:00
Thomas Citharel
be9d693e74 remove craueconfig domain name setting and add a proper one in parameters 2017-06-06 15:36:21 +02:00
Jérémy Benoist
6ed2627bb3 Merge pull request #3177 from wallabag/api-create-user-update
API user creation behing a toggle
2017-06-06 15:25:05 +02:00
Jérémy Benoist
9fe87bc2e2 Merge pull request #3165 from wallabag/it-translation-update
Update Italian translation
2017-06-06 11:44:18 +02:00
Jeremy Benoist
577c0b6dd8 Use an alternative way to detect image
When parsing content to retrieve images to save locally, we only check for the content-type of the image response.
In some case, that value is empty.
Now we’re also checking for the first few bytes of the content as an alternative to detect if it’s an image wallabag can handle.
We might get higher image supports using that alternative method.
2017-06-05 22:54:02 +02:00
Thomas Citharel
0d8ecb82a3 Fix review
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-04 17:57:40 +02:00
adev
2c3e148b00 Displays an error with an annotation with a too long quote
Fix #2762
2017-06-04 11:38:29 +02:00
Jérémy Benoist
438329be46 Merge pull request #3180 from wallabag/mruminski-patch-1
Update PL translation
2017-06-02 21:02:07 +02:00
Jeremy Benoist
645291e8fe Add ability to patch an entry with more fields
Like when we create an entry, we can now patch an entry with new fields:
- content
- language
- preview_picture
- published_at
- authors
2017-06-02 20:52:49 +02:00
Jeremy Benoist
a1e6187406 Return 201 on user creation 2017-06-02 20:03:25 +02:00
Mateusz Rumiński
d0f7b0cc60 Update PL transation
add missing translation
2017-06-02 19:35:25 +02:00
Thomas Citharel
d143fa243d Add show user command
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-02 16:53:03 +02:00
Jérémy Benoist
044079967b Add 🇮🇹 translation 2017-06-02 11:45:45 +02:00
Jeremy Benoist
bf7f0cb5a3 Use a dedicated file for wallabag config 2017-06-02 11:33:11 +02:00
Jeremy Benoist
1b9cd91782 Add translation 2017-06-02 11:32:38 +02:00
Jeremy Benoist
426bb453d2 API user creation behing a toggle
I've added a toggle feature (in internal settings) so that user api creation can be disabled while form registration still can be enabled.
Also, the /api/user endpoint shouldn't require authentication. Even if we check the authentication when sending a GET request, to retrieve current user information.

I've moved all the internal settings definition to config to avoid duplicated place to define them.
I don't know why we didn't did that earlier.
2017-06-02 11:32:38 +02:00
Jérémy Benoist
a687c8d915 Merge pull request #2708 from jcharaoui/import-disablecontentupdate
Import disableContentUpdate
2017-06-02 11:26:37 +02:00
Jérémy Benoist
d06a1ebdfb Update messages.it.yml 2017-06-02 09:17:45 +02:00
Nicolas Lœuillet
14b8a7c950 Merge pull request #3176 from wallabag/fix-image-download
Replace images with & in url
2017-06-02 09:12:11 +02:00
Jeremy Benoist
9bf7752f73 CS 2017-06-01 22:58:38 +02:00
Jeremy Benoist
fcad69a427 Replace images with &
Images with `&` in the path weren’t well replaced because they might be with `&amp;` in the html instead.

Replacing `&` with `&amp;` fix the problem.
2017-06-01 22:50:33 +02:00
Jeremy Benoist
f5924e9547 Fix option attributes 2017-06-01 15:44:36 +02:00
Nicolas Lœuillet
5901516805 Merge pull request #3171 from wallabag/drop-fucking-sqlite
Defined MySQL as the default rdbms for wallabag
2017-06-01 14:46:01 +02:00
Jeremy Benoist
701d3066fb We don't need that getter 2017-06-01 12:46:07 +02:00
Jeremy Benoist
ec97072152 No need to catch that Exception 2017-06-01 11:45:02 +02:00
Jeremy Benoist
6acadf8e98 Rewrote code & fix tests 2017-06-01 11:31:45 +02:00
Jérémy Benoist
5d03e2d1a5 Merge pull request #3172 from wallabag/more-scruti
More Scrutinizer issues fixed
2017-06-01 10:29:32 +02:00
Jeremy Benoist
843182c7cf CS 2017-06-01 09:52:09 +02:00
Jeremy Benoist
d5c2cc54b5 Fix tests 2017-06-01 09:49:15 +02:00
Jeremy Benoist
432a24f502 CS 2017-06-01 09:48:14 +02:00
Jerome Charaoui
704803e182 Replace Wallabag v1 error strings with v2 strings 2017-06-01 09:48:14 +02:00
Jerome Charaoui
d0e9b3d640 Add disableContentUpdate import option
This commit also decouples the "import" and "update" functions inside
ContentProxy. If a content array is available, it must be passed to the
new importEntry method.
2017-06-01 09:48:14 +02:00
Jerome Charaoui
1c5da417e4 Put default fetching error title in global config 2017-06-01 09:43:01 +02:00
Jerome Charaoui
7aba665e48 Avoid returning objects passed by reference.
Objects are always passed by reference, so it doesn't make sense to
return an object which is passed by reference as it will always be the
same object. This change makes the code a bit more readable.
2017-06-01 09:43:01 +02:00
Jeremy Benoist
3a6af6c580 fixup! Set the right variable type 2017-06-01 09:36:01 +02:00
Jeremy Benoist
10bf812a9e Both parameter wasn't used in the function, removing them 2017-06-01 09:30:38 +02:00
Jeremy Benoist
c3f7a2ca70 Set the right variable type 2017-06-01 09:30:20 +02:00
Jeremy Benoist
53da8ad844 Page parameter was never used in the function
It could have been used if we set the current page inside PreparePagerForEntries.
But we did that in each controller because we can have an OutOfRangeCurrentPageException
2017-06-01 09:29:18 +02:00
Nicolas Lœuillet
ec42e697ea Changed default database name 2017-06-01 09:17:05 +02:00
Jérémy Benoist
2a0eec07a5 Merge pull request #3137 from aaa2000/isolated-tests
Isolated tests
2017-06-01 07:58:17 +02:00
Nicolas Lœuillet
46825cfffb Fixed @tcitworld 's review 2017-05-31 22:50:18 +02:00
Nicolas Lœuillet
7d5e84fec1 Defined MySQL as the default rdbms for wallabag 2017-05-31 22:36:21 +02:00
Nicolas Lœuillet
2e05858e1a Updated 🇮🇹 translations
Thank you @matteocoder
2017-05-31 22:20:44 +02:00
Nicolas Lœuillet
757ec837be Merge pull request #3077 from wallabag/add-tags-list-view
Added tags on list view
2017-05-31 21:18:14 +02:00
Nicolas Lœuillet
84b041e87f Reduced border-radius for tags 2017-05-31 20:31:35 +02:00
Jérémy Benoist
ec8e7ffad4 Merge pull request #3106 from wallabag/api-content
Allow other fields to be send using API
2017-05-31 17:26:05 +02:00
adev
7ab5eb9508 Isolated tests
Use https://github.com/dmaicher/doctrine-test-bundle to have test isolation.
2017-05-31 16:03:54 +02:00
Thomas Citharel
91775f36fe Add some flex magic
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-31 14:34:46 +02:00
Jérémy Benoist
4368a27152 PR has been merged in graby 2017-05-31 14:00:15 +02:00
Jeremy Benoist
695af58857 Fix tests following rebase 2017-05-31 14:00:15 +02:00
Jeremy Benoist
38a04dee34 CS 2017-05-31 14:00:15 +02:00
Jeremy Benoist
f0378b4d7c Forced date can now be a timestamp too
Add adding more tests for forced content
2017-05-31 14:00:15 +02:00
Jeremy Benoist
9e349f08a6 Improve docs 2017-05-31 14:00:15 +02:00
Jeremy Benoist
0d6cfb884c Remove htmlawed and use graby instead
Instead of using htmlawed (which is already used in graby) use graby directly (which require some refacto on graby side).
Still needs some tests.
2017-05-31 14:00:15 +02:00
Jeremy Benoist
cf05a1ae34 Reduce imported entries
Down from 2.2 minutes to 1.39 minutes
2017-05-31 14:00:15 +02:00
Jeremy Benoist
74a75f7d43 Use graby ContentExtractor to clean html
It might be better to re-use some graby functionalities to clean html instead of building a new system.
2017-05-31 14:00:15 +02:00
Jeremy Benoist
fb436e8ca0 Add support for authors 2017-05-31 13:59:45 +02:00
Jeremy Benoist
e668a8124c Allow other fields to be send using API
Entry API can now have these new fields:
- content
- language
- preview_picture
- published_at

Re-use the ContentProxy to be able to do the same using the web UI (in the future).
htmLawed is used to clean stuff from content, I hope it’ll be enough to avoid security breach.

Lower content validation when we want to update an entry with content already defined. Before, language & content_type were required. If there weren’t provided, we re-fetched the content using graby. I think these fields aren’t required for an entry to be created. So I removed them.
Which means some import from the v1 export won’t be re-fetched since they provide content, url & title.

Also, remove liberation link from Readability import to avoid overlaping import (from wallabag v1, which had the same link)
2017-05-31 13:59:45 +02:00
Nicolas Lœuillet
812c980fa5 Fixed tags display on grid view 2017-05-31 13:26:29 +02:00
Nicolas Lœuillet
4423b88c5b Merge pull request #3168 from wallabag/instapaper-tags-import
Add support for tag in Instapaper import
2017-05-31 12:32:09 +02:00
Nicolas Lœuillet
d61fd8be4f Merge pull request #3138 from Kdecherf/2835-tags
Ignore ActionMarkAsRead when removing tag from entry
2017-05-31 11:48:42 +02:00
Nicolas Lœuillet
3f8578ded3 Merge pull request #3161 from wallabag/scrutinizer-2.3
Fix some Scrutinizer issues
2017-05-31 11:46:41 +02:00
Jeremy Benoist
31485bddb9 Ensure retrieved data are fresh 2017-05-31 11:11:02 +02:00
Jeremy Benoist
bad7df8c00 CS & improve tags assertions 2017-05-31 10:38:15 +02:00
Jeremy Benoist
7a8ed3cee1 Add support for tag in Instapaper import 2017-05-31 10:38:00 +02:00
Nicolas Lœuillet
7aa5607f29 Merge pull request #3143 from wallabag/fix-wllbg2-import
Fixed is_starred for wallabag v2 import
2017-05-31 09:08:34 +02:00
Nicolas Lœuillet
d716495f6c Merge pull request #3167 from wallabag/doc-github-template
Fix link in Github template
2017-05-31 09:06:21 +02:00
Jérémy Benoist
78de00e831 Fix link in Github template 2017-05-31 07:12:55 +02:00
Kevin Decherf
5dbf3f2326 TagController: ignore ActionMarkAsRead when removing tag from entry
Fixes #2835

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-05-31 00:36:46 +02:00
Jeremy Benoist
047fdc767a Add tests 2017-05-30 20:27:44 +02:00
Jérémy Benoist
2150576d86 Merge pull request #3065 from wallabag/api-creation-endpoint
Register through API
2017-05-30 15:26:11 +02:00
Jérémy Benoist
ff24cf9c1d Update 🇮🇹 translation 2017-05-30 14:06:38 +02:00
Jeremy Benoist
4ec53ab74c CS 2017-05-30 13:01:25 +02:00
Jeremy Benoist
26650fdbf8 Use a better way to set input for command
Actually use the correct to way handle that

http://symfony.com/doc/current/components/console/helpers/questionhelper.html#testing-a-command-that-expects-input
2017-05-30 12:47:28 +02:00
Jeremy Benoist
5fe65baee5 Fix some Scrutinizer issues 2017-05-30 11:39:15 +02:00
Jeremy Benoist
d181bd7285 Merge remote-tracking branch 'origin/master' into 2.3 2017-05-30 09:59:06 +02:00
Jeremy Benoist
fe6461e4aa Avoid side effect on other tests 2017-05-30 09:57:57 +02:00
Nicolas Lœuillet
21242a02a1 Added tags on list view 2017-05-30 09:51:49 +02:00
Jérémy Benoist
7a90ca6171 Merge pull request #3147 from wallabag/delete-confirm
Add some deletion confirmation to avoid mistake
2017-05-30 09:42:56 +02:00
Jérémy Benoist
7e8b90d1ed Merge pull request #3160 from wallabag/mruminski-patch-1
Update messages.pl.yml
2017-05-30 09:10:54 +02:00
Jeremy Benoist
d069bff4f6 Remove unknown validation_groups
The Profile validation_groups does not exist and then for validation to be skipped (like password length)
2017-05-30 08:04:11 +02:00
Jeremy Benoist
5709ecb368 Re-use NewUserType to validate registration
The only ugly things is how we handle error by generating the view and then parse the content to retrieve all errors…

Fix exposition fields in User entity
2017-05-30 07:56:01 +02:00
Mateusz Rumiński
6eb463c4ab Update messages.pl.yml
add missing translation
2017-05-29 23:47:00 +02:00
Sven Fischer
2740fc525e update 🇩🇪 messages.de.yml 2017-05-29 21:10:00 +02:00
Thomas Citharel
2251045901 WIP
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-29 10:16:23 +02:00
Thomas Citharel
b788add087 Merge pull request #3153 from wallabag/content-proxy-refactor
Move Tags assigner to a separate file
2017-05-28 21:50:23 +02:00
Thomas Citharel
de8d2a9005 CS
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-28 12:59:48 +02:00
Thomas Citharel
5d3deafd3e CS
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-28 01:16:01 +02:00
Thomas Citharel
6bc6fb1f60 Move Tags assigner to a separate file
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-27 22:08:14 +02:00
Jeremy Benoist
fa0f5ee12b Add some deletion confirmation to avoid mistake 2017-05-24 21:33:37 +02:00
Nicolas Lœuillet
4c707d087b Fixed is_starred for wallabag v2 import 2017-05-24 15:36:41 +02:00
Jérémy Benoist
35941d57ee Merge pull request #3145 from wallabag/fix-so
Fix SO tests
2017-05-24 14:33:58 +02:00
Jérémy Benoist
82a590fddd Merge pull request #3146 from DamienCassou/fix-doc-url
Fix documentation URL for "How can I help to fix that?"
2017-05-24 13:54:57 +02:00
Damien Cassou
ac1509a66b Fix documentation URL for "How can I help to fix that?" 2017-05-24 12:57:46 +02:00
Jeremy Benoist
216dee4d8a Fix SO tests
SO switched to http yesterday
2017-05-24 12:13:25 +02:00
Jeremy Benoist
e869ee7d7f Switch back to latest guzzle-site-authenticator 2017-05-24 07:29:46 +02:00
Jérémy Benoist
9d521dbfee Merge pull request #3133 from wallabag/testing-travis-failure
Let's play !
2017-05-19 13:58:37 +02:00
Jeremy Benoist
be085c3d18 Ensure download_images_enabled is disabled
Even if the tests fail, that config must stay disabled after the test.
Otherwise it might timeout on other test (because it'll try to save all other images)
2017-05-19 13:10:46 +02:00
Jeremy Benoist
1f155b29db Fold migrations & fixtures command on Travis 2017-05-19 13:10:44 +02:00
Jeremy Benoist
4ab0d25f65 Merge remote-tracking branch 'origin/master' into 2.3 2017-05-19 11:25:19 +02:00
Jérémy Benoist
f87e6547e8 Merge pull request #3130 from X-dark/master
unify Download/Export wording.
2017-05-19 10:07:01 +02:00
Cedric Girard
5f82fc23a7 modify key name as well 2017-05-18 17:17:21 +02:00
Cedric Girard
1dd76ac650 unify Download/Export wording.
This fixes #2967
2017-05-18 15:23:48 +02:00
Quent-in
21f78f4d4b Update of the oc version of CoreBundle
I hope I didn't break everything with the ' and ".
2017-05-18 10:44:15 +02:00
Jérémy Benoist
6830d92558 Merge pull request #3125 from wallabag/prepare-222
Prepare wallabag 2.2.3
2017-05-17 17:48:51 +02:00
Nicolas Lœuillet
c0e8e6037b Prepare wallabag 2.2.3 2017-05-17 17:21:14 +02:00
Thomas Citharel
e893e33e9b Merge pull request #3122 from wallabag/delete-doc
Removed embedded documentation
2017-05-17 11:57:28 +02:00
Nicolas Lœuillet
afc9875f28 Merge pull request #3117 from wallabag/fix-doc
Fixed documentation URL
2017-05-17 10:40:35 +02:00
Nicolas Lœuillet
6b94ee51b8 Fixed documentation URL 2017-05-17 09:03:04 +02:00
Nicolas Lœuillet
4e88a6a651 Merge pull request #3124 from wallabag/lock-guzzle-auth
Lock guzzle-site-authenticator to avoid errors
2017-05-17 09:02:22 +02:00
Jeremy Benoist
8581fcae90 Lock guzzle-site-authenticator to avoid error 2017-05-16 23:34:42 +02:00
Jérémy Benoist
092ed4a787 Merge pull request #3123 from X-dark/master
reorder contrib strings in about page
2017-05-16 14:50:25 +02:00
Cedric Girard
8544c7e4b6 reorder contrib strings in about page
this fixes #2891
2017-05-16 14:17:13 +02:00
Nicolas Lœuillet
322c270b65 Removed embedded documentation 2017-05-16 13:09:40 +02:00
Jérémy Benoist
d168fff7a9 Merge pull request #3120 from aaa2000/fix-delete-annotation-user
Fix delete annotation when username is defined
2017-05-15 11:42:05 +02:00
Jérémy Benoist
ef204e45b0 Merge pull request #3113 from wallabag/upgrade-craue
Upgraded CraueConfigBundle to 2.0
2017-05-15 09:05:08 +02:00
adev
60c522899b Fix delete annotation when username is defined
When an user set his name in "Config" > "User Information", he
can't delete or update an annotation

Fix #2382
2017-05-14 11:38:02 +02:00
Nicolas Lœuillet
3b792787d7 Upgraded CraueConfigBundle to 2.0 2017-05-12 16:39:47 +02:00
Nicolas Lœuillet
75045d6462 Merge pull request #3110 from wallabag/add-logger-matching-rules
Added logger when we match Tagging rules
2017-05-12 16:17:48 +02:00
Nicolas Lœuillet
a1146b6551 Added tests on logs records 2017-05-12 15:01:18 +02:00
Nicolas Lœuillet
3554364bed Fixed tests 2017-05-12 13:47:53 +02:00
Nicolas Lœuillet
0a033767db Added logger when we match Tagging rules 2017-05-12 13:13:19 +02:00
Nicolas Lœuillet
06568b15bb Merge pull request #3108 from wallabag/store-headers
Added headers field in Entry
2017-05-11 17:39:21 +02:00
Nicolas Lœuillet
1517d5772d Replaced json_array with array
And fixed failing test due to @j0k3r :trollface:
2017-05-11 14:59:53 +02:00
Nicolas Lœuillet
dda6a6addc Added headers field in Entry 2017-05-11 14:18:21 +02:00
Jérémy Benoist
7987816d1e Merge pull request #3104 from wallabag/migration-username-length
Added migration to change length for user fields
2017-05-10 11:24:59 +02:00
Jérémy Benoist
09edbff336 Merge pull request #3101 from wallabag/credentials-new-extrafields
Skip auth when no credentials are found
2017-05-10 10:58:19 +02:00
Nicolas Lœuillet
8c3158eba8 Added migration to change length for user fields 2017-05-10 10:46:32 +02:00
Jeremy Benoist
150d9ec1dc Handle empty configuration 2017-05-10 10:37:53 +02:00
Jérémy Benoist
147cae223b Update composer.json 2017-05-10 10:23:08 +02:00
Thomas Citharel
91ba9a5975 Merge pull request #3095 from aaa2000/api-error-on-fail-fetch-content
Create a new entry via API even when its content can't be retrieved
2017-05-10 09:38:55 +02:00
Jérémy Benoist
e538c85ba7 Merge pull request #3103 from wallabag/api-delete-tag-query
Retrieve tag / tags value from query or request
2017-05-10 09:32:27 +02:00
Jérémy Benoist
58f5a39ce6 Merge pull request #3102 from wallabag/cache-yarn
Cache yarn cache in Travis
2017-05-10 08:53:04 +02:00
adev
a9357a8311 Remove the created entry to avoid side effects on other tests 2017-05-09 23:19:24 +02:00
Jeremy Benoist
1594a79fc5 Retrieve tag / tags value from query or request
It allows to request to delete a tag using query string instead of body parameter (which seems to be the standard).
Instead of breaking the previous behavior, I used a generic way to retrieve parameter (which looks into request attributes, query parameters and request parameters)
2017-05-09 23:15:25 +02:00
Jeremy Benoist
94b232bbb8 Skip auth when no credentials are found
If we can’t find a credential for the current host, even if it required login, we won’t add them and website will be fetched without any login.
2017-05-09 22:53:42 +02:00
Jeremy Benoist
c44d13f9ea Cache yarn cache in Travis 2017-05-09 22:53:01 +02:00
Jérémy Benoist
0eb8220204 Merge pull request #2751 from bdunogier/2.2-guzzle_subscribers_improvement
Improved Guzzle subscribers extensibility
2017-05-09 17:10:03 +02:00
Nicolas Lœuillet
a2ae05a61c Merge pull request #3076 from wallabag/hotfix/2979
Disable negative numbers in filters
2017-05-09 13:56:44 +02:00
Jeremy Benoist
54c2d164a3 Merge remote-tracking branch 'origin/master' into 2.3 2017-05-09 13:55:31 +02:00
Jeremy Benoist
1b1647175d Add some tests 2017-05-09 12:12:23 +02:00
Thomas Citharel
b28c5430ef Merge pull request #3022 from wallabag/webpack
Adds Webpack support and remove Grunt
2017-05-09 11:43:48 +02:00
Jeremy Benoist
d047530dc0 CS 2017-05-09 11:17:09 +02:00
Thomas Citharel
efac66cb56 icon mail a bit better
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-09 11:04:02 +02:00
Jérémy Benoist
c829b06ed8 Merge pull request #3097 from wallabag/update-license
Update graby* licenses
2017-05-09 09:47:20 +02:00
Jérémy Benoist
9d7d549712 Update graby* licenses 2017-05-09 09:22:50 +02:00
Jérémy Benoist
832fbd94c0 Merge pull request #3096 from aaa2000/fix-api-entries-pagination-with-perpage
Fix API pagination is broken if perPage is custom value
2017-05-09 09:12:15 +02:00
adev
b60a666df2 Fix API pagination is broken if perPage is custom value
Fix #2720
2017-05-08 16:27:16 +02:00
adev
08f29ae7b6 Create a new entry via API even when its content can't be retrieved
Fix #2988
2017-05-08 14:57:25 +02:00
Thomas Citharel
ff5cdbdc95 fix 3-dots menu position
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-08 12:32:20 +02:00
Thomas Citharel
4c6ee89c9c Fix review again
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-07 17:13:08 +02:00
Aline
34806fab1b Fix reviews
Signed-off-by: Aline <chetta.aline@gmail.com>
2017-05-07 15:07:50 +02:00
Nicolas Lœuillet
f2beee5185 Merge pull request #3090 from aaa2000/translate-login-page-error
Translate error message in login page
2017-05-07 14:00:41 +02:00
adev
f3c300e485 Translate error message in login page
Fix #2933
2017-05-06 22:21:04 +02:00
Jérémy Benoist
43f81a62e9 Merge pull request #3088 from wallabag/execute-migrations-after-install
Added migrations execution after fresh install
2017-05-05 17:42:42 +02:00
Jérémy Benoist
ab742ee9c6 Merge pull request #2920 from wallabag/cleanduplicatescommand
Clean Duplicates Command
2017-05-05 17:42:18 +02:00
Nicolas Lœuillet
4eeb29ff78 Fixed test 2017-05-05 15:20:58 +02:00
Nicolas Lœuillet
7d2d1d6859 Added migrations execution after fresh install 2017-05-05 15:14:58 +02:00
Nicolas Lœuillet
89f108b45a Fixed @j0k3r review 2017-05-05 14:54:03 +02:00
Nicolas Lœuillet
d09fe4d233 Added test for deduplication 2017-05-05 14:33:36 +02:00
Nicolas Lœuillet
6980304968 Merge pull request #3053 from wallabag/api-bulk-add
Added API endpoint to handle a list of URL
2017-05-05 13:56:34 +02:00
Jeremy Benoist
72db15ca5d Little refacto and send 400 on reaching urls limit 2017-05-05 12:05:50 +02:00
Thomas Citharel
14f58edd80 fixed margin on sidebar menu 2017-05-05 09:19:56 +02:00
Jérémy Benoist
6603a9d649 Merge pull request #3082 from aaa2000/fix-form-errors-display
Fix display the form errors correctly
2017-05-05 07:01:28 +02:00
adev
ab9eb5cdb7 Fix display the form errors correctly
Use `property_path` form option to map underscored form fields
to object properties

@see https://github.com/symfony/symfony/issues/9162#issuecomment-25431148

Fix #3067
2017-05-05 00:12:16 +02:00
Bertrand Dunogier
662db41bae Changed parsing of login_extra_fields in guzzle auth 2017-05-04 21:45:06 +02:00
Bertrand Dunogier
5b914b0422 Improved Guzzle subscribers extensibility
Allows 3rd parties to register new guzzle subscribers by adding extra calls to the http_client_factory service.
2017-05-04 21:44:34 +02:00
Thomas Citharel
2003ffa97e Fix according to review 2017-05-04 17:44:42 +02:00
Nicolas Lœuillet
cebed9c01f Merge pull request #3080 from wallabag/use-username-to-import
Use username to import
2017-05-04 15:19:16 +02:00
Thomas Citharel
18e1da6277 rebase
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-04 14:56:52 +02:00
Thomas Citharel
4cea76b0cf Use npm script instead of direct webpack call
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-04 14:49:44 +02:00
Thomas Citharel
42a2139b8f fix travis 2017-05-04 14:49:44 +02:00
Thomas Citharel
17cc3aacb7 fix theme changes
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-04 14:49:44 +02:00
Thomas Citharel
e35f8439a7 add comment to config.yml to explain live reload feature 2017-05-04 14:49:44 +02:00
Thomas Citharel
8655913ebf disable default dev server 2017-05-04 14:49:44 +02:00
Thomas Citharel
64f81bc316 Adds Webpack support and removes the use for Grunt
Signed-off-by: Thomas Citharel <tcit@tcit.fr>

use scss

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

fix build, add babel, fix annotations

fixes (and improvements !) for baggy

add live reload & environments & eslint & theme fixes
2017-05-04 14:49:44 +02:00
Thomas Citharel
d1e5059ea0 Use username to import
Signed-off-by: Thomas Citharel <tcit@tcit.fr>

add docs

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

use username as default

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

rename user to username

typo

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-04 14:41:42 +02:00
Thomas Citharel
6b76ae3d1f Merge pull request #3060 from wallabag/search-users
Search & paginate users
2017-05-04 14:35:14 +02:00
Jérémy Benoist
3b4502e0e6 Merge pull request #3079 from wallabag/update-doc
Fixed old links in documentation
2017-05-04 07:07:20 +02:00
Nicolas Lœuillet
79d8f0d459 Updated documentation version 2017-05-03 15:58:36 +02:00
Nicolas Lœuillet
56f9a60f49 Fixed old links in documentation 2017-05-03 15:54:56 +02:00
Nicolas Lœuillet
9c09c253fe Merge pull request #3047 from wallabag/add-notmatches-operator
Added notmatches operator for tagging rule
2017-05-03 11:53:01 +02:00
Maxime Marinel
1267905d28 Disable negative numbers in filters 2017-05-03 11:08:56 +02:00
Nicolas Lœuillet
a162b1a99b Changed export test 2017-05-03 10:53:10 +02:00
Nicolas Lœuillet
dfa0822f19 Merge pull request #3075 from wallabag/disable-shortcuts-login
Disabled shortcuts on login/register page
2017-05-02 16:59:49 +02:00
Nicolas Lœuillet
0e6509c3d8 Merge pull request #3073 from wallabag/fix-sandwich
Fixed sandwich menu position in entry view (material theme)
2017-05-02 16:42:26 +02:00
Nicolas Lœuillet
a40029f9d6 Disabled shortcuts on login/register page 2017-05-02 16:21:06 +02:00
Nicolas Lœuillet
a7c8f54570 Merge pull request #3072 from wallabag/hotfix/3061
Small typo in documentation fix #3061
2017-05-02 15:46:45 +02:00
Nicolas Lœuillet
96e4398072 Fixed sandwich menu position in entry view (material theme) 2017-05-02 15:40:15 +02:00
Nicolas Lœuillet
b5b6877976 Merged list and search methods 2017-05-02 15:30:32 +02:00
Thomas Citharel
d01dc5a81e rename index to list
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-02 15:28:39 +02:00
Thomas Citharel
a2daa32d0c Fix tests
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-02 15:28:39 +02:00
Thomas Citharel
50cfd8108b Add pagination
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-02 15:28:39 +02:00
Thomas Citharel
c37515f880 Add filter to users management page
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-02 15:28:39 +02:00
Maxime Marinel
0f26c285d4 Small typo in documentation fix #3061 2017-05-02 11:51:23 +02:00
Jeremy Benoist
e1d64050ad Merge remote-tracking branch 'origin/master' into 2.3 2017-05-01 22:15:46 +02:00
Thomas Citharel
c613df0e25 Add docs for cli commands
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-01 13:30:00 +02:00
Thomas Citharel
3d57d625f8 Add basic tests
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-01 13:04:31 +02:00
Thomas Citharel
e2f3800ccb Add Clean Duplicates Command 2017-05-01 13:04:31 +02:00
Nicolas Lœuillet
efd351c98f Added limit 2017-05-01 09:26:12 +02:00
Jeremy Benoist
7fa844a349 Fix tests (for real this time) 2017-05-01 09:26:12 +02:00
Jeremy Benoist
719ba257d3 Fix tests 2017-05-01 09:26:12 +02:00
Nicolas Lœuillet
a7abcc7b7a Splitted the endpoint in two 2017-05-01 09:26:12 +02:00
Nicolas Lœuillet
1eca7831a6 Added API endpoint to handle a list of URL
By passing an array, you can add / delete URL in mass (bulk request)
2017-05-01 09:25:34 +02:00
Nicolas Lœuillet
3cbb0cc3ef Merge pull request #3055 from wallabag/api-bulk-add-tags
Added API endpoint to handle a list of URL and to add/delete tags
2017-05-01 09:04:41 +02:00
Jérémy Benoist
9579003045 Merge pull request #3066 from wallabag/ignore-tests-exported-files
Ignore tests exported files
2017-04-29 22:51:32 +02:00
Thomas Citharel
d49cdfe2ef Ignore tests exported files 2017-04-29 19:41:14 +02:00
Jérémy Benoist
8ee18fdabc Merge pull request #3064 from gileri/master
Correct create_application en string
2017-04-29 15:43:42 +02:00
Jeremy Benoist
dcbebc17aa Fix tests 2017-04-29 12:58:39 +02:00
Éric Gillet
ef88b37eb5 Correct create_application en string 2017-04-29 12:30:12 +02:00
Jérémy Benoist
c5e04b0109 Merge pull request #3057 from raf64flo/patch-1
Use up-to-date Firefox extension and add F-Droid link for Android app.
2017-04-26 09:10:28 +02:00
Raphaël Flores
e6ec001c6a Fix IT translation #3057 2017-04-25 16:52:02 +02:00
Raphaël Flores
283aca210a Fix typos. Fix #3057 2017-04-25 15:52:51 +02:00
Raphaël Flores
6f01c10c88 Fix documentation for DE/IT/FR language, even if not sure for ED/IT. Fix #3057. 2017-04-25 15:35:51 +02:00
Raphaël Flores
b40c479a40 Remove 'fr' from Firefox extension URL 2017-04-25 15:17:08 +02:00
Raphaël Flores
83bf04f09e Update Firefox extension and Android links
Use up-to-date Firefox extension and add F-Droid link for Android app.
2017-04-25 15:11:53 +02:00
Jérémy Benoist
138c352cd7 Merge pull request #3052 from shtrom/fix-relative-symlinks
Make symfony-assets-install use `relative` symlinks
2017-04-25 14:15:01 +02:00
Nicolas Lœuillet
80299ed282 Added endpoint to handle URL list to add/delete tags 2017-04-24 12:24:17 +02:00
Nicolas Lœuillet
d1fc590211 Added API endpoint to handle a list of URL and to add/delete tags 2017-04-24 11:12:41 +02:00
Olivier Mehani
f972af3f5b Make symfony-assets-install use relative symlinks
This facilitates packaging, when installing in a different work PREFIX
than the final install location.

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
2017-04-22 21:45:30 +10:00
Nicolas Lœuillet
b8acf672c0 Merge pull request #3048 from wallabag/remove-download-pictures
Cleaned craue_config_setting by removing useless download_pictures setting
2017-04-22 13:20:44 +02:00
Nicolas Lœuillet
a375fed7bf Fixed @j0k3r review 2017-04-22 13:14:34 +02:00
Nicolas Lœuillet
21d955f703 Cleaned craue_config_setting by removing useless download_pictures setting 2017-04-20 15:45:43 +02:00
Nicolas Lœuillet
fdd725f58c Added notmatches operator for tagging rule 2017-04-20 15:17:02 +02:00
Nicolas Lœuillet
64f1d8f77a Merge pull request #3024 from wallabag/store-date
Added publication date and author
2017-04-18 13:12:28 +02:00
Jérémy Benoist
c5ba478dc3 Merge pull request #3044 from wallabag/fos-user-2.0
Remove dev FOSUserBundle
2017-04-18 09:49:59 +02:00
Jeremy Benoist
177ef14c15 Remove dev FOSUserBundle 2017-04-18 08:08:26 +02:00
Jérémy Benoist
531828ca44 Merge pull request #3030 from wallabag/remove-isPublic-from-entry
Remove isPublic from Entry entity fix #2598
2017-04-14 14:56:26 +02:00
Nicolas Lœuillet
01736b5a2e Removed is_public in Entry edit form 2017-04-13 15:54:19 +02:00
Maxime
15e4aea678 Remove isPublic from Entry entity fix #2598 2017-04-13 13:12:19 +02:00
Nicolas Lœuillet
3e7a843aa9 Merge branch 'master' into 2.3 2017-04-13 13:07:06 +02:00
Nicolas Lœuillet
e9c80c99bd Added test for multiple authors 2017-04-10 17:58:27 +02:00
Nicolas Lœuillet
3aa655e44a Fixed migrations 2017-04-10 09:26:08 +02:00
Nicolas Lœuillet
7b0b3622ab Added author of article 2017-04-09 15:24:51 +02:00
Nicolas Lœuillet
5e9009ce86 Added publication date 2017-04-05 22:22:52 +02:00
Jérémy Benoist
656395fde6 Merge pull request #3023 from mart-e/epub-notice-at-the-end
Add export notice at the end of the epub
2017-04-05 10:20:19 +02:00
Martin Trigaux
1b70990b01 Add export notice at the end of the epub
The text "Produced by wallabag with PHPePub" is the first page of any epub.

On ebooks reader, it is common (e.g. kobo) to use the first page as the cover of
unread books, which makes it more difficult to differentiate the books.

Move the Notices chapter at the end of the book.
2017-04-05 09:24:48 +02:00
Nicolas Lœuillet
19122cf660 Merge pull request #3020 from wallabag/add-remove-archived-entries
Allow to remove all archived entries
2017-03-31 17:28:54 +02:00
Nicolas Lœuillet
13a592a128 Renamed methods 2017-03-31 17:03:08 +02:00
Nicolas Lœuillet
e682a70f88 Refactored code 2017-03-31 11:04:18 +02:00
Nicolas Lœuillet
9102851f59 Added delete button on Baggy theme 2017-03-31 10:53:23 +02:00
Nicolas Lœuillet
73f28afb19 Renamed countAllEntriesByUsername method 2017-03-31 10:46:47 +02:00
Thomas Citharel
6da1aebc94 Allow to remove all archived entries
Since we still support fucking SQLite, we need to retrieve all tags & annotations for archived entries before deleting them.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-03-31 10:46:05 +02:00
Jérémy Benoist
fa884b30ba Merge pull request #3021 from wallabag/rename-method
Rename method
2017-03-30 16:40:18 +02:00
Thomas Citharel
5633b32f0a Merge pull request #3014 from wallabag/change-default-value-listmode
Changed default value for list mode (grid instead of list)
2017-03-30 16:12:11 +02:00
Thomas Citharel
273b6f0658 Rename method from *username to *user
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-03-30 16:07:48 +02:00
Jérémy Benoist
548e608870 Merge pull request #3017 from Kdecherf/local-image-alpha
Save alpha channel when downloading PNG images
2017-03-30 14:45:24 +02:00
Kevin Decherf
7a3260ae9e Save alpha channel when downloading PNG images
Fixes #2805

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-03-29 21:58:29 +02:00
Nicolas Lœuillet
1680c95c27 Changed default value for list mode (grid instead of list) 2017-03-29 14:43:47 +02:00
Nicolas Lœuillet
6f296a789c Merge pull request #3000 from cloudron-io/master
Add Cloudron as installation method
2017-03-29 14:18:55 +02:00
Johannes Zellner
106e0160f2 Added 🇩🇪 translation for Cloudron 2017-03-29 14:16:04 +02:00
Nicolas Lœuillet
3ea184ffc0 Added 🇫🇷 and 🇮🇹 translations for Cloudron 2017-03-29 12:31:52 +02:00
Nicolas Lœuillet
f76bcf6705 Merge pull request #2999 from FrenchHope/master
Share articles to a scuttle / semantic scuttle instance
2017-03-28 15:19:42 +02:00
Nicolas Lœuillet
b5a5377af1 Added migration for Scuttle sharing 2017-03-28 14:20:14 +02:00
FrenchHope
fb9f100e8f Scuttle sharing 2017-03-28 14:20:14 +02:00
Jeremy Benoist
7d1d961267 Merge remote-tracking branch 'origin/master' into 2.3 2017-03-28 14:07:42 +02:00
Jérémy Benoist
6ae579e43f Merge pull request #2861 from wallabag/2.3-droping-5.5
Dropping PHP 5.5
2017-03-28 13:18:17 +02:00
Nicolas Lœuillet
de0ab52a47 Updated requirements in documentation 2017-03-28 11:45:40 +02:00
Nicolas Lœuillet
90f95027a8 Merge pull request #2985 from etiess/patch-2
Update paywall.rst (more details and clear cache)
2017-03-23 13:56:55 +01:00
Johannes Zellner
56f9adc431 Add Cloudron as installation method 2017-03-20 15:13:14 +01:00
Nicolas Lœuillet
7423ed4766 Merge pull request #2968 from chrido/master
remove language on html tag
2017-03-13 10:56:33 +01:00
Jérémy Benoist
3f5f303e7f Merge pull request #2971 from etiess/patch-3
Update paywall.rst (EN) with details + clear cache
2017-03-09 15:34:40 +01:00
Christoph Doblander
cee28dc6d4 remove language on html-tag 2017-03-06 21:34:50 +01:00
Nicolas Lœuillet
8c565e3b73 Merge pull request #2954 from wallabag/update-version
Changed wallabag version
2017-03-02 14:43:04 +01:00
Nicolas Lœuillet
8ef1df8157 Changed wallabag version 2017-03-02 14:42:16 +01:00
Nicolas Lœuillet
0fe64f1fdd Merge pull request #2916 from wallabag/update-changelog
Updated CHANGELOG with latest changes
2017-03-02 14:40:22 +01:00
Nicolas Lœuillet
bae1f9dfba Updated CHANGELOG with latest changes 2017-03-02 14:22:17 +01:00
Nicolas Lœuillet
6c79aaf432 Merge pull request #2950 from wallabag/fix-symlinks
Fixed symlinks issue during release creation
2017-03-02 14:16:51 +01:00
Nicolas Lœuillet
1d13376df6 Fixed symlinks issue during release creation 2017-03-01 14:17:07 +01:00
Nicolas Lœuillet
71460a8ba5 Merge pull request #2926 from qtheuret/master
Add activation of 'rewrite' mod of Apache
2017-03-01 13:32:46 +01:00
Nicolas Lœuillet
e1cc8fd799 Merge pull request #2919 from wallabag/api-exists-returns-id
Api exists returns
2017-02-28 21:12:30 +01:00
Nicolas Lœuillet
3529ce35e4 Added german and italian translation 2017-02-28 21:10:24 +01:00
Nicolas Lœuillet
29969f854c Merge pull request #2932 from wallabag/mruminski-patch-1
Update Polish translation
2017-02-25 08:28:31 +01:00
Mateusz Rumiński
78bce602cb Update Polish translation
add missing translation
2017-02-24 18:31:35 +01:00
Jeremy Benoist
85b4b6e0cd Merge pull request #2931 from wallabag/php-7.1
Use wallabag/tcpdf
2017-02-24 16:23:06 +01:00
Jeremy Benoist
5a73f94590 Use wallabag/tcpdf
It should restore the PHP 7.1 compatibility
2017-02-24 15:05:45 +01:00
Thomas Citharel
ca9a83ee51 return id of article instead of true if entry exists 2017-02-24 11:31:31 +01:00
Quentin THEURET
0a82d6e23c Activate 'rewrite' mod of Apache 2017-02-23 16:10:14 +01:00
Quentin THEURET
a737f4b58e Ajout du mod 'rewrite' de Apache 2017-02-23 16:09:06 +01:00
etiess
5301d664d9 Update paywall.rst (EN) with details + clear cache 2017-02-23 08:54:33 +01:00
etiess
e316d4bd34 Update paywall.rst (more details and clear cache) 2017-02-22 11:49:45 +01:00
Jeremy Benoist
227a009da5 Merge pull request #2917 from ngosang/feature/es_translation_2
Update Spanish translation
2017-02-20 13:55:24 +01:00
ngosang
ac47889928 Update Spanish translation 2017-02-20 12:21:02 +01:00
Nicolas Lœuillet
6914fdd8d8 Merge pull request #2915 from wallabag/import-drop-msg-user-null
Import: we now skip messages when user is null
2017-02-20 09:45:12 +01:00
Nicolas Lœuillet
b45b6b6707 Import: we now skip messages when user is null 2017-02-20 09:16:02 +01:00
Nicolas Lœuillet
48be826ea9 Merge pull request #2905 from nicofrand/patch-1
Alert that 2FA must be authorized in app/config/parameters.yml
2017-02-20 08:27:26 +01:00
Nicolas Lœuillet
b17cb92e9b Merge pull request #2913 from wallabag/add-wllbgit-readme
Added wallabag.it link in README
2017-02-20 08:05:58 +01:00
Nicolas Frandeboeuf
38fe541997 Alert that 2FA must be authorized in app/config/parameters.yml 2017-02-20 08:04:44 +01:00
Jeremy Benoist
bba94d7458 Merge pull request #2832 from Kdecherf/search-domain
Search by term: extend to entries url
2017-02-19 21:52:35 +01:00
Nicolas Lœuillet
b678d0f55c Added wallabag.it link in README 2017-02-18 15:04:57 +01:00
Nicolas Lœuillet
2b8f274b8a Merge pull request #2911 from wallabag/jlnostr-patch-1
Remove word repetition from german translation
2017-02-17 22:16:48 +01:00
Julian Oster
5d858d21de Remove word repetition from german translation
see https://github.com/wallabag/wallabag/pull/2882#discussion_r101806434
2017-02-17 21:52:16 +01:00
Nicolas Lœuillet
628f9d31de Merge pull request #2908 from wallabag/move-it-documentatin
Moved 🇮🇹 documentation into it folder
2017-02-17 13:54:48 +01:00
Nicolas Lœuillet
9d8975f6b6 Moved 🇮🇹 documentation into it folder 2017-02-17 13:12:09 +01:00
Nicolas Lœuillet
2edc539581 Merge pull request #2830 from Kdecherf/striptags-title
Fix rendering of entry title in Twig views
2017-02-17 09:28:56 +01:00
Nicolas Lœuillet
2ac8e2c5b5 Merge pull request #2882 from wallabag/add-translations-doc-mobile-apps
Doc: translated mobile apps configuration in french
2017-02-17 09:28:21 +01:00
Kevin Decherf
eac09b48b0 Search by term: extend to entries url
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-02-16 21:47:52 +01:00
Julian Oster
9dd68dae77 Some changes to 🇩🇪 translation 2017-02-16 21:41:19 +01:00
Kevin Decherf
aedd385e10 views: cosmetic in share links href
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-02-16 21:36:34 +01:00
Jeremy Benoist
6c1c433903 Merge pull request #2892 from ngosang/feature/es_translation
Update Spanish translation
2017-02-16 09:12:40 +01:00
Sven Fischer
8b42e75f68 add 🇩🇪 doc user/configuring_mobile 2017-02-15 17:13:14 +01:00
ngosang
82749439ac Update Spanish translation 2017-02-15 15:41:06 +01:00
Nicolas Lœuillet
a92718dba2 Merge pull request #2875 from kgaut/patch-3
Doc - information about Apache 2.4
2017-02-14 22:14:51 +01:00
Nicolas Lœuillet
2414eb12c6 Merge pull request #2785 from matteocoder/patch-2
first_article.rst already inside articles.rst
2017-02-14 22:05:53 +01:00
Nicolas Lœuillet
f3c7e055f2 Merge pull request #2784 from matteocoder/patch-1
Doc: share.rst already integrated inside articles.rst
2017-02-14 21:37:27 +01:00
matteocoder
e04d656f5a first_article.rst already inside articles.rst
The file is a duplicate of a section already present in articles.rst
2017-02-14 20:57:22 +01:00
matteocoder
d60c38edf9 share.rst already integrated inside articles.rst
The share.rst file is just a duplicate of a section already present in another file.
2017-02-14 20:56:27 +01:00
Nicolas Lœuillet
7d1c19c021 Doc: translated mobile apps configuration in french 2017-02-14 20:45:08 +01:00
Nicolas Lœuillet
f17b89fadc Merge pull request #2878 from matteocoder/wallabag-docs-ita
Italian documentation added
2017-02-14 18:33:43 +01:00
Nicolas Lœuillet
eef47c0ead Merge pull request #2879 from matteocoder/matteocoder-patch-1
Fixed typo in "first_steps"
2017-02-14 17:16:14 +01:00
matteocoder
5601b4536c Italian documentation added
There are some missing links in various articles. Please let me know how I can fix this :)
2017-02-14 16:36:40 +01:00
Nicolas Lœuillet
6d1e97f564 Merge pull request #2860 from wallabag/docs-update-3rd-party-apps
docs 3rd party tools: update java wrapper, add cmd tool to add article
2017-02-14 15:40:29 +01:00
Sven Fischer
c772c473a1 docs: add 3rd party app wallabako for Kobo readers 2017-02-14 15:39:12 +01:00
Kevin Gautreau
0ae5297699 Doc - informations about Apache 2.4 2017-02-14 15:29:33 +01:00
Nicolas Lœuillet
5e4b9b2321 Merge pull request #2874 from kgaut/patch-2
Add informations about Apache 2.4
2017-02-14 15:11:08 +01:00
Kevin Gautreau
947ccd075c Add informations about Apache 2.4 2017-02-14 09:24:56 +01:00
Thomas Citharel
4a953a250c Merge pull request #2869 from wallabag/log-restricted-access
Log restricted access value
2017-02-13 14:55:55 +01:00
Jeremy Benoist
7bf6b555f5 Log restricted access value
It might help to figure out if we have enabled it or not
2017-02-13 14:20:03 +01:00
Jeremy Benoist
4cb9e0aad1 Dropping PHP 5.5 2017-02-11 12:02:35 +01:00
Sven Fischer
8148675cb7 docs 3rd party tools: update java wrapper, add cmd tool to add article 2017-02-11 00:43:04 +01:00
Jeremy Benoist
abba55cdd6 Merge pull request #2846 from wallabag/mruminski-patch-1
fix misspells in polish translation
2017-02-06 17:29:31 +01:00
Mateusz Rumiński
41ed68d5b0 fix misspells in polish translation 2017-02-06 15:38:33 +01:00
Jeremy Benoist
99cc170b0e Merge pull request #2842 from K-Phoen/update-rulerz
Update RulerZ
2017-02-06 09:20:28 +01:00
Jeremy Benoist
10caff9875 Merge pull request #2841 from Kdecherf/active-menu-search
Show active list in the left menu during search
2017-02-05 21:08:39 +01:00
Kévin Gomez
177c5510ff Update RulerZ 2017-02-05 18:02:09 +01:00
Kevin Decherf
7d9a67de14 Show active list in the left menu during search
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-02-05 15:19:52 +01:00
Jeremy Benoist
20da238413 Merge pull request #2788 from Zettt/master
Documentation on how to configure mobile apps to work with wallabag.it
2017-02-05 12:49:43 +01:00
Andreas Zeitler
664621955d Added configuration documentation for mobile apps 2017-02-05 12:48:30 +01:00
Jeremy Benoist
15a4d52833 Merge pull request #2839 from foxmask/master
scripts/update.sh: 18: scripts/update.sh: composer.phar: not found
2017-02-05 12:34:20 +01:00
Jeremy Benoist
5397d820fe Merge pull request #2838 from wallabag/Quent-in-patch-1
Update Oc version
2017-02-04 21:54:43 +01:00
Jeremy Benoist
6837c3989a Merge pull request #2840 from wallabag/fix-frameworkbundle
Restored correct version for framework-extra-bundle
2017-02-04 21:53:26 +01:00
Nicolas Lœuillet
7db1bdf1e4 Restored correct version for framework-extra-bundle
The bundle was fixed in latest version.
2017-02-04 18:26:16 +01:00
FoxMaSk
205c6f0c66 scripts/update.sh: 18: scripts/update.sh: composer.phar: not found
when composer.phar is not globally installed, we should add "./" in front of "composer.phar" to run it from the current folder.
2017-02-04 17:02:25 +01:00
Quent-in
289ce94bd8 Update Oc version
I'll be ready for next train
2017-02-04 15:21:13 +01:00
Nicolas Lœuillet
5b9cf67529 Merge pull request #2818 from Kdecherf/fix-search-bar
Fix nav-panel-search height
2017-02-03 09:04:33 +01:00
Kevin Decherf
1bb7bdc8b3 Fix rendering of entry title in Twig views
This commit provides some improvements on the rendering of entry title
on entries list and entry views and refactors filter calls:
- Remove escape filter from apparent title, striptags is enough
- Move raw filter to the end of apparent title as it's ignored if not
  placed as the last filter
- Replace raw filter with e('html_attr') for title used in attributes,
  fixing possible issue and/or glitch
- Add striptags to entry.title used for link sharing to respect the
  apparent title

Fixes #2802

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-02-02 21:54:15 +01:00
Nicolas Lœuillet
8138fd390b Added minified CSS files 2017-02-02 21:48:59 +01:00
Kevin Decherf
3cc0cc0ae7 Fix nav-panel-search height
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-02-02 21:48:59 +01:00
Jeremy Benoist
8a098044bf Merge pull request #2831 from wallabag/Quent-in-patch-1
Update of CraueConfigBundle in Occitan
2017-02-02 17:11:40 +01:00
Quent-in
20fa5ca02a Update of CraueConfigBundle in Occitan 2017-02-02 16:29:28 +01:00
Nicolas Lœuillet
c7d05059ca Merge pull request #2824 from wallabag/simplify-strings
Renamed Developer section to API client management
2017-02-02 15:35:22 +01:00
Nicolas Lœuillet
d3ef28c092 Freezed sensio/framework-extra-bundle version 2017-02-02 14:39:17 +01:00
Jeremy Benoist
f217cf48d9 Merge pull request #2826 from wallabag/jlnostr-patch-1
Translate missing strings for de-DE.
2017-02-02 09:13:21 +01:00
Jeremy Benoist
ab5c68facc Merge pull request #2829 from wallabag/mruminski-patch-1
Update polish strings
2017-02-02 09:12:52 +01:00
Mateusz Rumiński
51ca217d2e Update polish strings
update missing polish strings
2017-02-01 22:29:03 +01:00
Julian Oster
f41b085c76 Translate missing strings for de-DE. 2017-02-01 22:06:04 +01:00
Julian Oster
74ba949d7e Update german strings. 2017-02-01 21:29:59 +01:00
Nicolas Lœuillet
013f426d10 Renamed Developer section to API client management 2017-02-01 13:23:13 +01:00
Nicolas Lœuillet
d3a8322a64 Merge pull request #2816 from wallabag/add-details-update
Added details about upgrade from 2.1.x or 2.2.0
2017-01-31 14:09:51 +01:00
Nicolas Lœuillet
1a6e0725d3 Added details about upgrade from 2.1.x or 2.2.0 2017-01-31 12:53:22 +01:00
Nicolas Lœuillet
713f35bafd Merge pull request #2812 from wallabag/prepare-221
Prepare wallabag 2.2.1 🚀
2017-01-31 11:31:45 +01:00
Nicolas Lœuillet
4021c928be Prepare wallabag 2.2.1 🚀 2017-01-31 11:06:35 +01:00
Nicolas Lœuillet
38c73f9691 Merge pull request #2809 from wallabag/fix-22-migrations
Fixed duplicate entry for share_public in craue_setting_table
2017-01-31 11:03:58 +01:00
Nicolas Lœuillet
a5cd696b22 Added check in migration about uuid field 2017-01-30 21:21:49 +01:00
Nicolas Lœuillet
7a340375c3 Fixed duplicate entry for share_public in craue_setting_table 2017-01-30 16:22:03 +01:00
Nicolas Lœuillet
ec67907420 Merge pull request #2790 from wallabag/prepare-220
Prepare wallabag 2.2.0 🚀
2017-01-27 19:03:13 +01:00
Nicolas Lœuillet
c833d576a9 Prepare wallabag 2.2.0 🚀 2017-01-27 17:28:58 +01:00
Nicolas Lœuillet
f0c5154d68 Merge pull request #2789 from wallabag/add-index-starred-archived
Added indexes on is_archived and is_starred
2017-01-27 14:46:50 +01:00
Nicolas Lœuillet
01e760691b Fixed check on index 2017-01-27 14:11:21 +01:00
Nicolas Lœuillet
b564d350b0 Added indexes on is_archived and is_starred 2017-01-27 11:44:04 +01:00
Jeremy Benoist
6fb06904ec Merge pull request #2416 from wallabag/2.2
wallabag 2.2.0
2017-01-27 09:34:32 +01:00
Jeremy Benoist
78295b99dd Merge remote-tracking branch 'origin/master' into 2.2 2017-01-26 13:32:07 +01:00
Nicolas Lœuillet
463cb376e3 Merge pull request #2646 from wallabag/explain-migrations-in-doc
Added explanations about migrations
2017-01-26 13:15:06 +01:00
Jeremy Benoist
012b2d453e Merge pull request #2787 from wallabag/lock-rulerz
Lock kphoen/rulerz to avoid breaking changes
2017-01-26 11:33:42 +01:00
Jeremy Benoist
363e2a9ce9 Lock kphoen/rulerz to avoid breaking changes 2017-01-26 11:01:25 +01:00
Jeremy Benoist
73eb2b4ed5 Merge pull request #2750 from wallabag/rename-uuid
Added migration to rename uuid to uid
2017-01-25 13:57:26 +01:00
Nicolas Lœuillet
6dfd1a6c78 Added migration for SQLite 2017-01-25 12:59:04 +01:00
Nicolas Lœuillet
5d916d03af Moved queries in a separate file 2017-01-25 12:34:20 +01:00
Thomas Citharel
b8805fad03 Merge pull request #2774 from wallabag/cli-export
add cli export
2017-01-24 21:07:49 +01:00
Thomas Citharel
3b0380f049 Fix phpcs and tests 2017-01-24 20:42:02 +01:00
matteocoder
605f82d9c4 Fixed typo in "first_steps"
Changed "Pimi passi" to "Primi passi
2017-01-24 08:22:18 -05:00
Nicolas Lœuillet
c8cd1660af Fixed update script 2017-01-23 14:43:00 +01:00
Nicolas Lœuillet
4acbeb9371 Added hardcoded SQL for migration to 2.2 2017-01-23 14:16:00 +01:00
Nicolas Lœuillet
b87f171233 Added information about latest migrations 2017-01-23 12:42:58 +01:00
Julian Oster
500ae20c94 Add translation for 🇩🇪 2017-01-23 12:42:58 +01:00
Nicolas Lœuillet
80aee45fa8 Added french translation 2017-01-23 12:42:58 +01:00
Nicolas Lœuillet
c8ef0583af Added explanations about migrations 2017-01-23 12:42:58 +01:00
Thomas Citharel
a607b7a9c0 add filepath test
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-01-22 13:19:46 +01:00
Thomas Citharel
8303b037fb add cli export
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-01-22 12:51:14 +01:00
Thomas Citharel
afaee1cc0a Merge pull request #2763 from janLo/sort-tags
Sort list of available tags
2017-01-18 15:15:19 +01:00
Nicolas Lœuillet
05fa529bcf Merge pull request #2759 from wallabag/prepare-216
Prepare wallabag 2.1.6 🚀
2017-01-18 10:24:24 +01:00
Jan Losinski
32755d5091 Order tags by slug
This adds an orderBy clause to findAllTags(). This makes the list of
tags more useful, as the tags appear in alphanumerical order instead of
somehow random.

Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
2017-01-17 19:22:20 +01:00
Nicolas Lœuillet
1ba542ce04 Prepare wallabag 2.1.6 🚀 2017-01-17 13:59:39 +01:00
Nicolas Lœuillet
9123cb3053 Merge pull request #2758 from wallabag/fix-public-sharing
Fixed possible JS injection via the title edition
2017-01-17 11:59:14 +01:00
Nicolas Lœuillet
3d9950792c Fixed possible JS injection via the title edition 2017-01-17 10:09:04 +01:00
Nicolas Lœuillet
5ed503ab28 Added migration to rename uuid to uid 2017-01-14 13:46:20 +01:00
Nicolas Lœuillet
b4d81c91de Merge pull request #2742 from wallabag/fix-og-image-false
Avoid false preview image
2017-01-10 21:25:27 +01:00
Jeremy Benoist
1ff2e71c1c Use latest bdunogier/guzzle-site-authenticator 2017-01-10 18:50:55 +01:00
Jeremy Benoist
72e634b06c Fix registration.submit test 2017-01-10 18:50:45 +01:00
Jeremy Benoist
3d71d40349 Avoid false preview image
If the website doesn't provide an og_image, the value will be false and so it'll be saved like that in the database.
We prefer to leave it as null instead of false.
2017-01-10 17:42:36 +01:00
Jeremy Benoist
e4ccd3effe Update deps 2017-01-10 17:35:17 +01:00
Jeremy Benoist
a4180d0b8e Merge pull request #2733 from wallabag/fix-no-matching-response
Fixed API error No matching accepted Response format could be determined
2017-01-08 10:22:31 +01:00
Thomas Citharel
96e2827605 Merge pull request #2736 from lex111/patch-1
Update copyright year
2017-01-04 22:43:58 +01:00
Alexey Py
de84b135e2 Update copyright year in COPYING.md 2017-01-05 00:06:09 +03:00
Alexey Py
c20d9e311f Update copyright year 2017-01-04 23:57:33 +03:00
Nicolas Lœuillet
cace43dd7b Merge pull request #2735 from wallabag/remove-small-readingtime
Removed the small element on reading time
2016-12-30 15:45:19 +01:00
Nicolas Lœuillet
144f2039e4 Merge pull request #2729 from Simounet/fix/double-overlay-right-sidenav
Fix double overlay on expanded right sidenav
2016-12-30 15:01:39 +01:00
Nicolas Lœuillet
4da856ef11 Merge pull request #2728 from Simounet/fix/side-nav-scrolling
Fix right side-nav scrolling on low height window
2016-12-30 14:57:39 +01:00
Nicolas Lœuillet
70d99765c7 Removed the small element on reading time 2016-12-30 14:17:18 +01:00
Simounet
ccb9e79a35 Fix double overlay on expanded right sidenav 2016-12-30 14:00:19 +01:00
Simounet
bb2934d476 Fix action's icons position 2016-12-30 13:54:13 +01:00
Simounet
8e2419a5cf Fix right side-nav scrolling on low height window 2016-12-30 13:50:59 +01:00
Nicolas Lœuillet
339b1e689d Merge pull request #2725 from lapineige/master
Share to Shaarli - Include tags
2016-12-30 13:50:44 +01:00
Nicolas Lœuillet
0bacc9e175 Fixed API error 'No matching accepted Response format could be determined' 2016-12-30 13:23:02 +01:00
Nicolas Lœuillet
510b02573f Merge pull request #2732 from Simounet/fix/firefox-addon-url
Firefox add-on URL updated
2016-12-30 13:18:22 +01:00
Simounet
db769f6061 Firefox add-on URL updated 2016-12-30 12:01:38 +01:00
Nicolas Lœuillet
5f4667e3e8 Merge pull request #2730 from Simounet/feature/all-actions-on-mobile
Access to search, filters, export on mobile
2016-12-30 11:10:47 +01:00
Nicolas Lœuillet
af54b2c959 Merge pull request #2731 from llune/patch-2
Minor typo fix
2016-12-30 08:55:15 +01:00
llune
9ad7475c74 Minor typo fix 2016-12-30 02:20:58 +01:00
Simounet
22d0c929e3 Access to search, filters, export on mobile 2016-12-29 19:19:51 +01:00
Nicolas Lœuillet
8527238846 Merge pull request #2702 from wallabag/add-index-uuid
Added index on entry.uuid
2016-12-29 10:54:07 +01:00
Nicolas Lœuillet
7239082a5e Renamed uuid to uid 2016-12-29 10:09:44 +01:00
Thomas Citharel
90f6ee4dbe Merge pull request #2724 from Simounet/fix/reading-time
Fix entry reading time
2016-12-28 18:11:01 +01:00
lapineige
d5d4708fe3 Share tags to Shaarli - Material theme 2016-12-28 12:27:09 +01:00
lapineige
0a0aa70098 Share tags to Shaarli - Baggy theme 2016-12-28 12:27:00 +01:00
Nicolas Lœuillet
92ba3b5c0d Merge pull request #2723 from wallabag/fix-export-tag-space
Fixed export by tags with a tag which contains space
2016-12-28 09:10:14 +01:00
Simounet
6ed615ac74 Fix entry reading time 2016-12-27 22:37:42 +01:00
Nicolas Lœuillet
c8de7ab94c Fixed export by tags with a tag which contains space 2016-12-27 21:26:53 +01:00
Nicolas Lœuillet
89cd670abf Changed uuid type in database 2016-12-25 10:51:25 +01:00
Nicolas Lœuillet
8137515171 Fixed index on entry.uuid and changed uuid field type 2016-12-25 10:51:25 +01:00
Nicolas Lœuillet
af131cb513 Added index on table creation 2016-12-23 10:26:33 +01:00
Nicolas Lœuillet
74b7c0985d Added index on entry.uuid
Useful for entry sharing
2016-12-23 10:26:33 +01:00
Nicolas Lœuillet
7719346328 Merge pull request #2696 from wallabag/run-migration
Run migration on each test
2016-12-23 09:31:41 +01:00
Jeremy Benoist
a72f3dc308 Fix bad migration for PostreSQL
Queries weren’t executed for PostgreSQL, bad syntax.
2016-12-23 09:00:13 +01:00
Jeremy Benoist
cd77a7e7ef Merge pull request #2714 from Simounet/fix/entry-card-shadow
Fix the box shadow on the card entry
2016-12-20 14:52:50 +01:00
Simounet
78d6c3090a Fix the box shadow on the card entry 2016-12-20 13:04:51 +01:00
Jeremy Benoist
3ef75cc4e3 Be consistent between migration & schema definition 2016-12-19 14:24:19 +01:00
Jeremy Benoist
6514f0ed37 fixup! Run migration in test, ready for MySQL 2016-12-19 10:35:25 +01:00
Jeremy Benoist
d44016b072 Use actual database name
We can't retrieve the environment within the migration.
And when we ran migration on Travis, database name isn't `database_name` but `test_database_name`.
Retrieve the database name from the connection is more accurate
2016-12-19 10:35:25 +01:00
Jeremy Benoist
3ad4061dba pocket_consumer_key can be null 2016-12-19 10:35:24 +01:00
Jeremy Benoist
d9efa42f66 fixup! Manually import file for PostgreSQL 2016-12-19 10:35:24 +01:00
Jeremy Benoist
bd8db77f5f Remove comment
"The string "--" is not permitted within comments."
2016-12-19 10:35:24 +01:00
Jeremy Benoist
5354485885 Add orignal DB schema 2016-12-19 10:35:24 +01:00
Jeremy Benoist
81915ad8df And of course it doesn't work for SQLite 2016-12-19 10:35:24 +01:00
Jeremy Benoist
cafb105681 Manually import file for PostgreSQL 2016-12-19 10:35:24 +01:00
Jeremy Benoist
a48b5d5a5a Run migration in test, ready for MySQL 2016-12-19 10:35:24 +01:00
Jeremy Benoist
68cb89a516 Merge pull request #2616 from mathieui/doc-https-links
Change documentation links to HTTPS
2016-12-19 10:29:18 +01:00
Jeremy Benoist
77e342f75d Merge pull request #2682 from wallabag/migration-config
Ensure craue_config_setting migration are ok
2016-12-18 20:32:35 +01:00
Nicolas Lœuillet
bea8d75417 Replaced quotes for Postgres 2016-12-18 13:47:25 +01:00
Nicolas Lœuillet
57e629e154 Merge pull request #2690 from wallabag/improve-rmq-config
Added QoS for RabbitMQ
2016-12-16 08:20:50 +01:00
Nicolas Lœuillet
be8033bf12 Merge pull request #2701 from wallabag/disable-outputWalkers
Removed outputWalkers for pagination
2016-12-16 07:43:01 +01:00
Jeremy Benoist
31fec5f363 Ensure craue_config_setting migration are ok
We now can run the migration every time, new line from `craue_config_setting` are properly checked.
2016-12-15 22:25:10 +01:00
Nicolas Lœuillet
881b0578e7 Moved RabbitMQ QoS to parameters 2016-12-15 22:23:28 +01:00
Nicolas Lœuillet
99712e5d85 Added QoS for RabbitMQ 2016-12-15 22:23:28 +01:00
Nicolas Lœuillet
5a5da36955 Removed outputWalkers for RSS and API 2016-12-15 22:22:57 +01:00
Nicolas Lœuillet
9deac0c597 Removed outputWalkers for pagination
Due to overload, we disabled output walkers (see https://github.com/whiteoctober/Pagerfanta/issues/115
2016-12-15 22:22:56 +01:00
Nicolas Lœuillet
24becc9717 Merge pull request #2667 from wallabag/upgrade-symfony-32
Upgrade to Symfony 3.2
2016-12-15 22:18:45 +01:00
Nicolas Lœuillet
6ad8aabb83 Fixed search bug 2016-12-15 21:38:16 +01:00
Jeremy Benoist
21e7ccef3d Fix tests & deprecation notice 2016-12-15 21:38:16 +01:00
Jeremy Benoist
202a66ce02 Use simple-phpunit instead of phpunit
To avoid problem with the Yaml constant
http://symfony.com/blog/how-to-solve-phpunit-issues-in-symfony-3-2-applications
2016-12-13 09:33:06 +01:00
Jeremy Benoist
15cc183850 Merge pull request #2699 from wallabag/remove-usertable-query
Removed user join in query builder
2016-12-13 09:08:34 +01:00
Nicolas Lœuillet
375c9e2d3e Merge pull request #2697 from wallabag/fix-list-mode
Add default value for list_mode
2016-12-12 22:54:43 +01:00
Nicolas Lœuillet
45c159b798 Removed user join in query builder 2016-12-12 22:51:29 +01:00
Jeremy Benoist
24879db1f7 Add default value for list_mode 2016-12-12 17:41:03 +01:00
Nicolas Lœuillet
2c1eed8051 Merge pull request #2691 from wallabag/moved-total-import-notif
Moved total messages from import
2016-12-08 19:02:30 +01:00
Nicolas Lœuillet
be2c55de4c Moved total messages from import 2016-12-08 16:46:17 +01:00
Thomas Citharel
edb9feb472 Merge pull request #2689 from wallabag/change-chmod
Replaced chmod for download pictures feature
2016-12-08 15:19:33 +01:00
Nicolas Lœuillet
e044d27f82 Replaced chmod for download pictures feature 2016-12-08 13:04:15 +01:00
Nicolas Lœuillet
75ae3c8d82 Merge pull request #2688 from wallabag/fix-browsers-import
Fixed imports with is_starred and is_archived
2016-12-08 09:07:09 +01:00
Nicolas Lœuillet
bb98fede2b Fixed imports with is_starred and is_archived 2016-12-07 16:01:50 +01:00
Jeremy Benoist
2d4b167038 Merge pull request #2686 from wallabag/fix-redis-import
Casted maxIterations for Redis import
2016-12-06 21:04:08 +01:00
Nicolas Lœuillet
558d5199b9 Merge pull request #2680 from wallabag/taggingrule-255
Limit rule to 255
2016-12-06 21:00:24 +01:00
Nicolas Lœuillet
7dc48ef820 Casted maxIterations for Redis import
Simpleue\Worker wants an integer, we gave it a string
2016-12-06 11:44:40 +01:00
Nicolas Lœuillet
4a1f963531 Merge pull request #2679 from jcharaoui/fix-2658
Fix content from imported entried being discarded when URL goes bad
2016-12-04 19:30:11 +01:00
Jeremy Benoist
106bdbcd0a Add some comments 2016-12-04 11:27:49 +01:00
Jerome Charaoui
a2c1b94e82 Revert switch to KernelTestCase for ContentProxyTest
Define the error string manually inside the test class instead of
fetching it from app config.
2016-12-03 09:50:36 -05:00
Jeremy Benoist
5aa0294cca Limit rule to 255
To avoid database error
2016-12-03 11:10:39 +01:00
Jerome Charaoui
cd82ace70a Add missing CoreKernelTestCase class 2016-12-03 00:26:57 -05:00
Jerome Charaoui
dba1e0b188 Fix WallabagV1Controller test
Account for URL redirection in refreshed entry.
2016-12-03 00:14:06 -05:00
Jerome Charaoui
fc2b7bda53 Fix ContentProxy tests 2016-12-03 00:14:06 -05:00
Jerome Charaoui
3cd6da0b74 Allow fetching content on all import types
For better consistency, allow all types of imported entries to update,
which was already the case for Firefox and Chrome.
2016-12-03 00:12:20 -05:00
Jerome Charaoui
e858018fdd Prevent undefined index when import fetching fails 2016-12-02 22:45:04 -05:00
Jerome Charaoui
36e6ef52a1 Imported entries which fail to fetch get standard error body 2016-12-02 22:42:36 -05:00
Jerome Charaoui
29dca43236 Retain imported content if fetching fails, fixes #2658 2016-12-02 22:41:35 -05:00
Nicolas Lœuillet
1093e979ff Merge pull request #2677 from wallabag/add-wallabag_user.de.yml
add translations/wallabag_user.de.yml (fixes #2673)
2016-12-01 19:08:12 +01:00
Strubbl
10d85dbae3 Update wallabag_user.de.yml
Wallabag->wallabag
2016-12-01 18:23:41 +01:00
Sven Fischer
87958ce645 add translations/wallabag_user.de.yml (fixes #2673) 2016-12-01 18:03:36 +01:00
Nicolas Lœuillet
81c657fc5b Merge pull request #2676 from wallabag/update-addons
Updated addons links
2016-12-01 14:39:48 +01:00
Nicolas Lœuillet
8d064ba5a4 Updated addons links 2016-12-01 13:48:34 +01:00
Nicolas Lœuillet
075e1d75e2 Merge pull request #2674 from wallabag/fix-404img-2FA
Fixed 404 for wallabag logo in 2FA
2016-12-01 13:35:55 +01:00
Nicolas Lœuillet
68da51d2a3 Fixed 404 for wallabag logo in 2FA 2016-12-01 10:51:04 +01:00
Jeremy Benoist
4bd42110c6 Merge pull request #2672 from wallabag/fix-typo
Fixed typo in asynchronous documentation
2016-12-01 07:38:19 +01:00
Nicolas Lœuillet
b46e63fc0a Fixed typo in asynchronous documentation 2016-11-30 22:02:08 +01:00
Nicolas Lœuillet
f3a1b896b3 Merge pull request #2670 from wallabag/add-floating-button
Added floating button on entry view for mobile
2016-11-30 16:55:44 +01:00
Nicolas Lœuillet
6787afbe0d Added floating button on entry view for mobile 2016-11-30 16:08:02 +01:00
Jeremy Benoist
9abac9651f Merge pull request #2650 from wallabag/add-hascolumn
Added hasColumn() in migration to check column existence
2016-11-30 14:17:40 +01:00
Nicolas Lœuillet
067ae472cc Named index 2016-11-30 12:29:55 +01:00
Nicolas Lœuillet
65a8c6e135 Code review 2016-11-30 11:27:07 +01:00
Nicolas Lœuillet
d68e045d86 Upgrade to Symfony 3.2 2016-11-30 11:08:38 +01:00
Nicolas Lœuillet
ad51d77146 Merge pull request #2662 from wallabag/add-list-view
Add list view
2016-11-28 16:47:41 +01:00
Nicolas Lœuillet
9aa991281d Renamed view_mode by list_mode and hide excerpt 2016-11-28 16:10:21 +01:00
Nicolas Lœuillet
d79b3adbed Fixed typo 2016-11-28 14:28:35 +01:00
Nicolas Lœuillet
597755b8c7 Cleaned old migrations 2016-11-28 14:28:35 +01:00
Nicolas Lœuillet
84c6a48df4 Added dropColumn for SQLite and some enhancements 2016-11-28 14:28:35 +01:00
Nicolas Lœuillet
a4d55a9161 Replaced abortIf with skipIf 2016-11-28 14:28:35 +01:00
Nicolas Lœuillet
18d7bc3a35 Added checks on migrations 2016-11-28 14:28:35 +01:00
Nicolas Lœuillet
986cb53645 Removed my hasColumn and used the existing one in Doctrine 2016-11-28 14:28:35 +01:00
Nicolas Lœuillet
73f7eabb6e Added hasColumn() in migration to check column existence 2016-11-28 14:28:35 +01:00
Nicolas Lœuillet
56a7ce17f3 Hide article text on mobile with list mode 2016-11-28 14:27:58 +01:00
Nicolas Lœuillet
8f3ff39ca3 Added test for list view 2016-11-28 14:27:58 +01:00
Nicolas Lœuillet
9f01d0fde0 Added list view 2016-11-28 14:27:58 +01:00
Nicolas Lœuillet
34ea7be622 Merge pull request #2663 from wallabag/remove-fosuser-attributes
Removed FOSUser attributes removed in alpha4
2016-11-28 14:27:31 +01:00
Nicolas Lœuillet
07326af5e2 Added migration to remove useless fields 2016-11-28 13:25:18 +01:00
Nicolas Lœuillet
cda0662311 Removed FOSUser attributes removed in alpha4
See https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/Upgrade.md\#200-alpha3-to-200-alpha4
2016-11-28 12:44:17 +01:00
Nicolas Lœuillet
6bb0866cf5 Merge pull request #2659 from akovalyov/bugfix/non-latin-characters-in-reading-time-calculation
Fix incorrect reading time calculation for entries in non-latin languages.
2016-11-28 09:23:04 +01:00
Andrew Kovalyov
5b6888b13f Fix incorrect reading time calculation for entries in languages with
non-latin chars subset.
2016-11-28 01:15:06 +02:00
Jeremy Benoist
5b644798a0 Merge pull request #2654 from Kdecherf/domain-filter
Enforce lowercase on domain name filter
2016-11-27 18:35:38 +01:00
Kevin Decherf
00fc2b44f4 Enforce lowercase on domain name filter
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-26 19:52:50 +01:00
Nicolas Lœuillet
ebe50a85fb Merge pull request #2622 from Kdecherf/ui-changes
Material UI Changes
2016-11-25 17:11:07 +01:00
Nicolas Lœuillet
60abe8c274 Minified CSS 2016-11-25 16:45:03 +01:00
Kevin Decherf
56026217c5 Material: update size of text in article
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:49:45 +01:00
Kevin Decherf
819c8f5bd4 Material: render blockquote in italic and strong in bold in article
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:39:53 +01:00
Kevin Decherf
fdaa044314 Material: update style of pre in article
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:39:53 +01:00
Kevin Decherf
59cfd63c23 Material: update style of ul in article
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:39:53 +01:00
Kevin Decherf
858430c0d0 Material: update style of article links
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:39:53 +01:00
Kevin Decherf
5ea90fa8b9 Material: increase max width of article on large screens
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:39:49 +01:00
Kevin Decherf
7470a2f36a Material: prevent bold in title, update title font size
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:37:42 +01:00
Kevin Decherf
5b69e03eb4 Material: change color of background, article content and titles
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-25 13:37:42 +01:00
Nicolas Lœuillet
b5e0bbeb85 Merge pull request #2642 from wallabag/fix-logout-shortcut
Fixed logout shortcut
2016-11-23 15:14:05 +01:00
Nicolas Lœuillet
66e9dde0dc Fixed logout shortcut 2016-11-23 14:40:00 +01:00
Jeremy Benoist
f4a9833490 Merge pull request #2620 from wallabag/fix-password-layout
Fix password layout
2016-11-23 09:53:18 +01:00
Jeremy Benoist
fcbf253b6b Remove empty line 2016-11-23 09:20:00 +01:00
Nicolas Lœuillet
75a4b3b23f Merge pull request #2640 from wallabag/fix-openoriginal
Fixed entry shortcuts available in list view
2016-11-23 09:06:45 +01:00
Nicolas Lœuillet
0df2a4b021 Fixed entry shortcuts available in list view 2016-11-22 21:31:21 +01:00
Jeremy Benoist
be2725db40 Add migration for new FOSUser version 2016-11-22 21:25:05 +01:00
Jeremy Benoist
ae741f998e Fix MonologBundle deprecation
The Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\DebugHandlerPass class is deprecated since version 2.12 and will be removed in 3.0. Use AddDebugLogProcessorPass in FrameworkBundle instead.
2016-11-22 21:25:05 +01:00
Jeremy Benoist
5066c3e066 Re-use FOSUser master branch 2016-11-22 21:25:05 +01:00
Jeremy Benoist
4da598c5df Fix Travis 2016-11-22 21:23:58 +01:00
Jeremy Benoist
d7acde5cc3 Use the correct template
When resetting the password, the overriden template we used wasn’t well spelled.

And since we are using a locked version of FOSUser (on a custom commit), the translation of `resetting.check_email` is wrong in any language but english.
2016-11-22 21:23:58 +01:00
Jeremy Benoist
9624b3adfa These files aren’t used anymore
Translation were moved to the global one
2016-11-22 21:23:58 +01:00
Jeremy Benoist
7c6b7a40d1 Merge pull request #2637 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-11-22 20:02:00 +01:00
Mateusz Rumiński
24d4b243a7 Update messages.pl.yml
translate shortcuts section to polish
2016-11-22 19:24:38 +01:00
Jeremy Benoist
176e0ea3ca Merge pull request #2317 from wallabag/restricted-access
Added authentication for restricted access articles
2016-11-22 19:12:53 +01:00
Nicolas Lœuillet
d51093a7d9 Added documentation and missing translations 2016-11-22 17:32:24 +01:00
Nicolas Lœuillet
d64bf7953b Added internal setting to enable/disable articles with paywall 2016-11-22 14:56:53 +01:00
Nicolas Lœuillet
40f3ea57fb Cleared CookieJar to avoid websites who use cookies for analytics 2016-11-22 14:25:51 +01:00
Thomas Citharel
1d5dd2c241 Merge pull request #2612 from wallabag/add-shortcuts-help
Added help about shortcuts
2016-11-22 14:10:12 +01:00
Bertrand Dunogier
7aab0ecf2f Added authentication for restricted access articles
Fix #438. Thank you so much @bdunogier
2016-11-22 14:01:46 +01:00
Nicolas Lœuillet
893ccad31f Translations for shortcuts help 2016-11-22 13:33:06 +01:00
Nicolas Lœuillet
c526f9e474 Added help about shortcuts 2016-11-22 13:07:42 +01:00
Jeremy Benoist
bb28368f69 Merge pull request #2635 from wallabag/304-reload
Return 304 when content isn't reloaded using the API
2016-11-22 11:27:55 +01:00
Jeremy Benoist
5cd0857e3c Return 304 when content isn't reloaded using the API
Previously it was a 400 but this is more related to a real error.
Using the API user should only know the content got reloaded or not.
If reloaded: 200 otherwise: 304.
2016-11-22 10:45:19 +01:00
Thomas Citharel
944b8d6175 Merge pull request #2613 from wallabag/fix-overlap
Fix card action overlap
2016-11-22 10:27:14 +01:00
Nicolas Lœuillet
ba838dae5a Merge pull request #2614 from wallabag/api-reload
Add ability to reload entry from API
2016-11-22 09:39:43 +01:00
Nicolas Lœuillet
c72c6f43f2 Merge pull request #2632 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-11-21 20:17:33 +01:00
Mateusz Rumiński
4bf5172585 Update messages.pl.yml
missing polish translation added
2016-11-21 18:18:52 +01:00
Jeremy Benoist
1f00547836 Merge pull request #2630 from ThibaudDauce/fix-black-headings
Add white-text class to card-title too
2016-11-21 17:06:55 +01:00
Thibaud Dauce
4f2755a61d Add white-text class to card-title too 2016-11-21 15:37:47 +01:00
Jeremy Benoist
eb2d613c3e Merge remote-tracking branch 'origin/master' into 2.2 2016-11-21 15:15:30 +01:00
Jeremy Benoist
625bb56181 Merge pull request #2624 from Rurik19/master
Fix #2056 update config.yml
2016-11-21 13:14:31 +01:00
Nicolas Lœuillet
83fed2648b Merge pull request #2625 from wallabag/prepare-215
Prepare wallabag 2.1.5
2016-11-21 09:49:34 +01:00
Nicolas Lœuillet
98253436e9 Prepare wallabag 2.1.5 🚀 2016-11-21 09:20:27 +01:00
Jeremy Benoist
e839f87a1c Merge pull request #2623 from wallabag/composer-php-5.5
Force composer to run as PHP 5.5.9
2016-11-21 09:01:35 +01:00
Jeremy Benoist
f32ff37534 Lock down PHPUnit for PHP 5.5
Since Composer defined lowest version is now PHP 5.5.9.
PHPUnit 5.0 require PHP 5.6.
2016-11-21 07:46:46 +01:00
Yuriy Evdokimov
05cdd393d8 wrong spaces 2016-11-21 11:29:09 +05:00
Yuriy Evdokimov
5e7fdfc8dd Fix #2056 update config.yml
Resolves refresh token lifetime issue
2016-11-21 11:13:40 +05:00
Jeremy Benoist
c396a50509 Force composer to run as PHP 5.5.9 2016-11-20 23:07:38 +01:00
Jeremy Benoist
a38d50e1e8 Merge pull request #2621 from wallabag/redis-password
Add ability to use Redis with password
2016-11-20 22:27:05 +01:00
Julian Oster
59c42a4aad Add german translation 2016-11-20 20:43:05 +01:00
Jeremy Benoist
c1683778ab Add ability to use Redis with password 2016-11-20 20:43:04 +01:00
Jeremy Benoist
56da73969a Return an explicit error if reload fail 2016-11-20 16:25:13 +01:00
Jeremy Benoist
70584b42aa Fixing tests 2016-11-20 15:15:13 +01:00
mathieui
7c05d59153 Change documentation links to HTTPS
Even though all the websites used in the commands redirect http to
https, a man in the middle can happen with the initial request,
leading to arbitrary code execution.
2016-11-20 14:51:14 +01:00
Jeremy Benoist
0a6f4568b5 Add ability to reload entry from API 2016-11-20 13:08:41 +01:00
Jeremy Benoist
5ae8788583 Merge pull request #2609 from wallabag/rss-paging
RSS paging
2016-11-20 10:17:37 +01:00
Jeremy Benoist
77e2898ad4 Fix card action overlap
On smaller resolution
2016-11-20 10:14:19 +01:00
Jeremy Benoist
16eb124e4a Add documentation about RSS paging 2016-11-20 09:50:52 +01:00
Jeremy Benoist
edd2472faa Fix tests 2016-11-20 09:39:26 +01:00
Jeremy Benoist
8670250a26 Add RSS pagination
Following https://tools.ietf.org/html/rfc5005#page-4
2016-11-20 09:39:26 +01:00
Jeremy Benoist
3c969d3990 Add missing translations 2016-11-20 09:39:25 +01:00
Nicolas Lœuillet
6f85bed294 Merge pull request #2543 from wallabag/search-engine
Added a simple search engine
2016-11-19 20:42:27 +01:00
Nicolas Lœuillet
995c204428 Added shortcut 2016-11-19 20:05:16 +01:00
Nicolas Lœuillet
32f455c131 Added tests 2016-11-19 20:05:16 +01:00
Nicolas Lœuillet
49b042dfdf Added translations and currentRoute parameter 2016-11-19 19:17:30 +01:00
Nicolas Lœuillet
398de40517 Added search engine in baggy theme 2016-11-19 19:17:30 +01:00
Nicolas Lœuillet
ee122a7528 Added a simple search engine
Fix #18
2016-11-19 19:17:30 +01:00
Jeremy Benoist
27dce581ca Messed up DE import translation 2016-11-19 15:39:02 +01:00
Jeremy Benoist
68003139e1 Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts:
#	.editorconfig
#	docs/de/index.rst
#	docs/de/user/import.rst
#	docs/en/index.rst
#	docs/en/user/configuration.rst
#	docs/en/user/import.rst
#	docs/fr/index.rst
#	docs/fr/user/import.rst
#	src/Wallabag/CoreBundle/Command/InstallCommand.php
#	src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
#	src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
#	web/bundles/wallabagcore/themes/baggy/css/style.min.css
#	web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
#	web/bundles/wallabagcore/themes/material/css/style.min.css
#	web/bundles/wallabagcore/themes/material/js/material.min.js
2016-11-19 15:30:49 +01:00
Jeremy Benoist
cb1a6590c0 Merge pull request #2608 from wallabag/change-dev-version
Change version to 2.2.0-dev
2016-11-19 14:56:47 +01:00
Nicolas Lœuillet
8fdadee3a5 Change version to 2.2.0-dev 2016-11-19 14:28:25 +01:00
Nicolas Lœuillet
00b1dc0eb0 Merge pull request #2607 from wallabag/update-changelog
Updated changelog for 2.1.4
2016-11-19 14:03:18 +01:00
Nicolas Lœuillet
442dcb8ec1 Updated changelog for 2.1.4 2016-11-19 14:02:32 +01:00
Jeremy Benoist
bbd4ae7b56 Merge pull request #2600 from wallabag/install-assets
Install assets for shortcuts
2016-11-19 12:23:16 +01:00
Nicolas Lœuillet
4c27f14fa9 Merge pull request #2604 from wallabag/postgresql-version
wallabag can’t work on PostgreSQL <= 9.1
2016-11-19 12:00:18 +01:00
Nicolas Lœuillet
eabcd880ca Merge pull request #2605 from wallabag/update-release-process
Add .travis.yml change to RELEASE_PROCESS
2016-11-19 11:57:26 +01:00
Nicolas Lœuillet
8add306204 Merge pull request #2601 from wallabag/store-http-status
Added http_status in Entry entity
2016-11-19 11:53:41 +01:00
Jeremy Benoist
45277ad2bd Add .travis.yml change to RELEASE_PROCESS 2016-11-19 11:43:47 +01:00
Jeremy Benoist
a2261fbd70 Merge pull request #2603 from wallabag/fix-composer-no-dev
Fix clear-cache problem using —no-dev
2016-11-19 11:33:35 +01:00
Jeremy Benoist
cffcce0c92 Wallabag can’t work on PostgreSQL <= 9.1 2016-11-19 11:32:56 +01:00
Jeremy Benoist
01a47da128 Fix clear-cache problem using —no-dev
Related to :

> PHP Fatal error:  Class 'FOS\RestBundle\Serializer\JMSSerializerAdapter' not found in /Users/j0k/Sites/github/wallabag/var/cache/prod/appProdProjectContainer.php on line 9139
2016-11-19 10:45:21 +01:00
Nicolas Lœuillet
d215273c65 Check if status code is OK 2016-11-18 23:05:02 +01:00
Nicolas Lœuillet
e10e6ab34e Replace http status with a string
I don't want to have 0 if we don't fetch status code, I think it's better to have an empty string, mainly for filters
2016-11-18 15:55:16 +01:00
Nicolas Lœuillet
10b3509757 Added http_status in Entry entity 2016-11-18 15:09:21 +01:00
Jeremy Benoist
74216c7c74 Install assets for shortcuts 2016-11-18 14:12:26 +01:00
Nicolas Lœuillet
8853914ba4 Merge pull request #2596 from wallabag/prepare-214
Prepare wallabag 2.1.4 🚀
2016-11-18 10:24:55 +01:00
Nicolas Lœuillet
5d2971cadd Prepare wallabag 2.1.4 🚀 2016-11-18 10:00:29 +01:00
Nicolas Lœuillet
19d401b15c Merge pull request #2550 from wallabag/reorder-documentation
Reordered documentation
2016-11-18 09:28:20 +01:00
Jeremy Benoist
b060fbdfe7 Merge pull request #2593 from wallabag/test-clarify
Put log in the most common failure tests
2016-11-18 09:21:27 +01:00
Julian Oster
50540682ff Undo translation of 'in english'. 2016-11-18 09:08:16 +01:00
Jeremy Benoist
c15d5a3af8 Merge pull request #2592 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-11-17 20:03:40 +01:00
Jeremy Benoist
5cc367b83a Fix tests 2016-11-17 19:58:10 +01:00
Jeremy Benoist
d8a35aba49 Put log in the most common failure tests
So we’ll quickly be able to see what kind of test is failing when viewing Travis
2016-11-17 19:30:50 +01:00
Julian Oster
2bc5b74c73 Reordered documentation for German. 2016-11-17 19:22:21 +01:00
Julian Oster
887303889b Update translation of link to german translation. 2016-11-17 19:22:19 +01:00
Nicolas Lœuillet
bb624c0269 Reordered 🇫🇷 documentation 2016-11-17 19:22:16 +01:00
Nicolas Lœuillet
2e389b0b90 Reordered documentation 2016-11-17 19:22:15 +01:00
Mateusz Rumiński
52e01d3483 Update messages.pl.yml
translate action_mark_as_read section to polish
2016-11-17 18:52:42 +01:00
Nicolas Lœuillet
9e0a49e6ac Merge pull request #2578 from wallabag/questionmark-icon
Added help on config screen
2016-11-17 09:53:14 +01:00
Jeremy Benoist
66336f6571 Merge pull request #2547 from wallabag/add-option-markasread
Added a configuration to define the redirection after archiving an entry
2016-11-17 09:40:46 +01:00
Nicolas Lœuillet
c894d76e57 Added tooltips for baggy theme 2016-11-17 09:22:39 +01:00
Nicolas Lœuillet
540a9bc4a2 Added help on config screen 2016-11-17 09:22:39 +01:00
Jeremy Benoist
9e2440fe15 Fix migration 2016-11-17 08:05:15 +01:00
Jeremy Benoist
e6b133c60c CS 2016-11-16 23:10:01 +01:00
Jeremy Benoist
00bf45b6f2 Update unit test for Redirect 2016-11-16 23:07:34 +01:00
Nicolas Lœuillet
54fd55fda1 Tried to fix tests 2016-11-16 23:07:34 +01:00
Nicolas Lœuillet
65cd8a4a9a Added tests 2016-11-16 23:07:34 +01:00
Nicolas Lœuillet
f052f1fd57 Added constants for redirection values 2016-11-16 23:07:34 +01:00
Strubbl
287204cda7 Update messages.en.yml 2016-11-16 23:07:34 +01:00
Strubbl
f0ba37fbd5 Update messages.de.yml 2016-11-16 23:07:34 +01:00
Strubbl
5d52cc411b update German configuration.rst 2016-11-16 23:07:34 +01:00
Nicolas Lœuillet
a42f38d9fb Added a configuration to define the redirection after archiving an entry
Fix #496
2016-11-16 23:07:34 +01:00
Nicolas Lœuillet
e042a5d78f Merge pull request #2495 from wallabag/add-shortcuts
Added shortcuts
2016-11-16 09:35:59 +01:00
Nicolas Lœuillet
94f2057ffe Added CSS class on links 2016-11-16 09:17:12 +01:00
Thomas Citharel
10a1ffae53 Fix keyboard navigation on quickstart view
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-15 22:23:50 +01:00
Thomas Citharel
c930992348 fix next/prev page 2016-11-15 21:55:16 +01:00
Thomas Citharel
5637a26e9a Bring navigation (with right, left and enter) on material entries page. Supports going to next and previous page !
Also better indentation for js files (changed editorconfig for them).

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-15 21:55:10 +01:00
Nicolas Lœuillet
16ef7607f4 Reorganized JS folders for shortcuts 2016-11-15 21:54:50 +01:00
Thomas Citharel
af61cb80eb es6 imports
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-15 21:54:41 +01:00
Nicolas Lœuillet
f9cded7dd2 Added new shortcuts 2016-11-15 21:54:34 +01:00
Nicolas Lœuillet
49c5d0ad6e Changed FOSJSRouting format in config 2016-11-15 21:54:20 +01:00
Nicolas Lœuillet
3cc78f0679 Added shortcuts 2016-11-15 21:54:20 +01:00
Jeremy Benoist
d213219ec7 Merge pull request #2570 from wallabag/add-creation-date
Added creation date on entries view
2016-11-15 09:23:44 +01:00
Jeremy Benoist
decf651bbd Merge pull request #2587 from wallabag/user-agents
User-agents have moved to site-config
2016-11-15 09:23:26 +01:00
Jeremy Benoist
66fe2a3dc4 User-agents have moved to site-config
Since graby@1.5.0, user-agent can be defined in site-config, which the now recommended way
2016-11-14 14:29:13 +01:00
Nicolas Lœuillet
a8c6f29f3e Hide creation date in mobile view 2016-11-14 14:28:42 +01:00
Jeremy Benoist
64d080586d Merge pull request #2584 from blankoworld/master
fix #2582 - Documentation, Nginx config: disable all other PHP file from symphony
2016-11-14 14:00:24 +01:00
Nicolas Lœuillet
80302e5aaa Changed display for material theme 2016-11-14 13:58:41 +01:00
Nicolas Lœuillet
1c282b1da0 Added creation date on entries view 2016-11-14 13:57:31 +01:00
Olivier DOSSMANN
ccad5d7629 fix #2582 - Nginx config: disable all other PHP file from symphony
Regarding
https://www.nginx.com/resources/wiki/start/topics/recipes/symfony/ we
need to limit access to config.php and make_dev.php files from Nginx.
That's why we return 404 error page for these files.
2016-11-14 11:58:26 +01:00
Jeremy Benoist
d3511bbde9 Merge pull request #2577 from wallabag/add-tooltip-material
Added tooltips in header bar
2016-11-14 10:08:26 +01:00
Thomas Citharel
d37081e50b Merge pull request #2562 from wallabag/image-bigger
Bigger image preview in case of only image content
2016-11-14 10:01:12 +01:00
Nicolas Lœuillet
cf9ee2fbd0 Added tooltips in header bar 2016-11-12 11:57:55 +01:00
Nicolas Lœuillet
8315507384 Merge pull request #2571 from wallabag/change-language-without-logout
Changed behavior when we change language
2016-11-11 18:27:04 +01:00
Nicolas Lœuillet
ece4718f63 Changed behavior when we change language
No need to disconnect to apply the language substitution
2016-11-10 20:54:20 +01:00
Nicolas Lœuillet
644b340178 Merge pull request #2566 from wallabag/add-unmarkit
Added unmark.it sharing
2016-11-09 18:19:08 +01:00
Nicolas Lœuillet
8a9604aafe Added unmark.it sharing
Fix #668
2016-11-09 18:18:49 +01:00
Nicolas Lœuillet
5cf9604004 Merge pull request #2565 from wallabag/remove-support-website
Removed support website on about page
2016-11-09 14:24:32 +01:00
Nicolas Lœuillet
1781ca3763 Removed support website on about page 2016-11-09 13:59:55 +01:00
Nicolas Lœuillet
33a66b1973 Merge pull request #2563 from wallabag/pr-template
Improve PR template
2016-11-09 09:03:10 +01:00
Nicolas Lœuillet
1e8c7fa5f9 Merge pull request #2564 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-11-09 09:02:33 +01:00
Mateusz Rumiński
a9740448cf Update messages.pl.yml
translate Pinboard importer section to polish
2016-11-08 23:11:03 +01:00
Jeremy Benoist
c396ee2c63 Improve PR template 2016-11-08 22:53:30 +01:00
Jeremy Benoist
8d7b4f0eff Display a bigger image in case of image content
If the content is only an image, we can display a bigger preview image because we won’t have text to display.

Also, split different card view to avoid too much complexity in the entries.html.twig
2016-11-08 22:17:46 +01:00
Jeremy Benoist
e9490a3443 Add grunt watch task 2016-11-08 22:16:01 +01:00
Jeremy Benoist
7005b425e0 Remove the left margin of tag
In the entries list, the first tag below the link isn’t stick to the left. Now it is.
2016-11-08 22:15:37 +01:00
Thomas Citharel
a0fb3b1b7a Merge pull request #2561 from wallabag/Rurik19-patch-2259
fix #2559
2016-11-08 18:38:37 +01:00
Yuriy Evdokimov
d99a7c2206 fix #2559 2016-11-08 22:14:32 +05:00
Nicolas Lœuillet
89e167a45a Merge pull request #2553 from wallabag/add-tagform-mobile
Added new tag form in mobile view for Material theme
2016-11-08 15:42:05 +01:00
Nicolas Lœuillet
df30af69d2 Added new tag form in mobile view for Material theme
Fix #2376
2016-11-08 14:24:00 +01:00
Jeremy Benoist
41c2178685 Merge pull request #2548 from wallabag/pinboard
Add Pinboard import
2016-11-08 14:19:40 +01:00
Strubbl
82f9a52078 docs: update german import.rst 2016-11-07 21:00:57 +01:00
Nicolas Lœuillet
40f3ab5311 Merge pull request #2555 from dkrmr/fix_update_script
Reorder variable assignation in update.sh script, fix #2554
2016-11-07 11:14:05 +01:00
Nicolas Lœuillet
a4de2351a0 Merge pull request #2556 from wallabag/replace-tokenstorage
Replaced TokenStorage with TokenStorageInterface
2016-11-07 11:13:50 +01:00
Nicolas Lœuillet
94766a8962 PHP CS 2016-11-07 10:41:11 +01:00
Nicolas Lœuillet
2fe2e411a7 Replaced TokenStorage with TokenStorageInterface 2016-11-07 10:34:49 +01:00
Darius Kramer
7d173a28c7 Reorder variable assignation in update.sh script, fix #2554 2016-11-07 09:55:03 +01:00
Jeremy Benoist
94060509b8 Use more explicit check 2016-11-07 08:36:52 +01:00
Jeremy Benoist
06283bef72 Merge pull request #2552 from wallabag/reading-time-round
Round readingtime to avoid crazy number
2016-11-06 23:32:39 +01:00
Jeremy Benoist
2e4efb5965 Add english doc into german one 2016-11-06 23:27:55 +01:00
Strubbl
56e6216485 Update messages.en.yml
Instapaper->Pinboard
2016-11-06 22:29:49 +01:00
Strubbl
e8e72daaa6 Update messages.de.yml 2016-11-06 22:29:08 +01:00
Jeremy Benoist
01ad4d6a89 Merge pull request #2551 from wallabag/remove-maintenance-bundle
Removed Maintenance bundle
2016-11-06 21:47:16 +01:00
Jeremy Benoist
d61b24e459 Round readingtime to avoid crazy number
Like `8.666666666667 min`
2016-11-06 21:41:32 +01:00
Jeremy Benoist
31151d70f2 Add doc 2016-11-06 21:23:38 +01:00
Nicolas Lœuillet
db3838545c Removed Maintenance bundle 2016-11-06 15:34:08 +01:00
Jeremy Benoist
e92fbdc852 Fix tests 2016-11-06 09:58:07 +01:00
Nicolas Lœuillet
24692715de Merge pull request #2546 from wallabag/update-parameters-doc
Updated default parameters.yml file in documentation
2016-11-06 09:52:09 +01:00
Nicolas Lœuillet
0c256e2e70 Updated default parameters.yml file in documentation 2016-11-06 09:11:12 +01:00
Nicolas Lœuillet
16037570bf Merge pull request #2545 from wallabag/update-doc
Update the upgrade documentation
2016-11-05 14:16:21 +01:00
Nicolas Lœuillet
bc12f08bda Update the upgrade documentation 2016-11-05 14:15:09 +01:00
Jeremy Benoist
9ab024b4f5 Add Pinboard import 2016-11-04 22:44:31 +01:00
Jeremy Benoist
b5571b52cc Merge pull request #2541 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-11-04 21:49:42 +01:00
Thomas Citharel
cbdbd9d683 Merge pull request #2540 from wallabag/Quent-in-patch-1
Update of the OC version
2016-11-04 19:29:27 +01:00
Mateusz Rumiński
ff7f551f5a Update messages.pl.yml
missing polish translation added
2016-11-04 19:26:06 +01:00
Quent-in
eaa0bf00a6 Update of the OC version 2016-11-04 18:13:11 +01:00
Nicolas Lœuillet
4ec9f5c334 Merge pull request #2536 from wallabag/prepare-213
Prepare wallabag 2.1.3 🚀
2016-11-04 13:32:47 +01:00
Nicolas Lœuillet
505e8acd46 Update CHANGELOG
Usage of github-changes from @lalitkapoor
2016-11-04 13:32:30 +01:00
Jeremy Benoist
4775fed6a7 Merge pull request #2535 from wallabag/default-sort-2.2
Use created_at as default sort
2016-11-04 09:38:03 +01:00
Nicolas Lœuillet
a3f7d8a870 Prepare wallabag 2.1.3 🚀 2016-11-04 09:10:15 +01:00
Nicolas Lœuillet
2db9142bfc Merge pull request #2460 from wallabag/ui-changes
UI Changes
2016-11-04 08:49:52 +01:00
Nicolas Lœuillet
f53f542fa5 Merge pull request #2534 from wallabag/default-sort
Use created_at as default sort
2016-11-04 08:48:42 +01:00
Jeremy Benoist
7e9c1d65b1 Add index into Table definition 2016-11-04 08:02:02 +01:00
Jeremy Benoist
1e7b04d4ea Use created_at as default sort
With index (following https://github.com/wallabag/wallabag/pull/2534)
2016-11-04 07:56:04 +01:00
Jeremy Benoist
ce11952447 Use created_at as default sort
Imported content use the real creation date. If we sort by id, it'll
display contents in reverse order.
2016-11-04 07:34:38 +01:00
Jeremy Benoist
001cc7168a Cleanup 2016-11-03 18:01:25 +01:00
Jeremy Benoist
864c1dd23a Fix rest controller merge 2016-11-03 17:29:16 +01:00
Jeremy Benoist
5a619812ca Merge remote-tracking branch 'origin/master' into 2.2 2016-11-03 16:41:29 +01:00
Jeremy Benoist
da41365579 Merge pull request #2180 from wallabag/download-pictures
Download pictures
2016-11-03 16:22:07 +01:00
Jeremy Benoist
ca08d02f2f Add warning message for import + download images
When import isn't async and downloading images is enabled, we warn the user that import can fail.
Also, added missing translations
2016-11-03 15:59:20 +01:00
Nicolas Lœuillet
816c0940d1 Merge pull request #2523 from wallabag/qrcode-android-app
Added QRCode and link to configure android application
2016-11-03 14:55:24 +01:00
Thomas Citharel
32508ef07a avoid eslint warning by disabling line
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 14:23:09 +01:00
Thomas Citharel
d56d416d9b Deal with more resolution issues
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 12:49:57 +01:00
Thomas Citharel
3221b2e413 Fix resolution issues and 'title' issues
Also, modify editorconfig for css files.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 11:28:40 +01:00
Nicolas Lœuillet
84795d015b Merge pull request #2530 from wallabag/add-doc-failed-load-external-entity
Added documentation about failed to load external entity error
2016-11-02 20:07:10 +01:00
Jeremy Benoist
a49159e9eb Update faq.rst 2016-11-02 18:08:25 +01:00
Strubbl
b1057c6a5e update German faq.rst 2016-11-02 17:16:57 +01:00
Strubbl
cce77ebc2d update German faq.rst 2016-11-02 17:15:32 +01:00
Nicolas Lœuillet
4b5e95c0e5 Added more info about Doctrine / PHP bug 2016-11-02 17:02:48 +01:00
Nicolas Lœuillet
585fd2a4ad Added documentation about failed to load external entity error
Fix #2529
2016-11-02 16:58:20 +01:00
Jeremy Benoist
3be554c78f Merge pull request #2519 from Jibec/master
Translation update - French
2016-11-02 07:48:10 +01:00
Jeremy Benoist
e46fdf3096 CS 2016-11-02 07:26:14 +01:00
Jeremy Benoist
9c15470691 wallabag is full lowercase 2016-11-02 07:15:24 +01:00
Jeremy Benoist
1f66d79e6b Add more importer to wallabag:import command
All importer available expect Pocket which require an oAuth login.
2016-11-02 07:10:57 +01:00
Jeremy Benoist
7816eb622d Add entry.saved event to import & rest 2016-11-02 07:10:23 +01:00
Jeremy Benoist
be4f6bb4f3 Merge pull request #2528 from Kdecherf/slashdot-cookie
Force user-agent for .slashdot.org
2016-11-01 22:29:43 +01:00
Kevin Decherf
22ef6f96e2 Force user-agent for .slashdot.org
Slashdot replaces actual content with a form regarding cookies when
requests originate from France. By forcing the user-agent, the warning
seems to go away.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-01 19:51:45 +01:00
Jeremy Benoist
e0597476d1 Use custom event instead of Doctrine ones
This give us ability to use Entry ID to determine where to store images and it’s then more easy to remove them when we remove the entry.
2016-11-01 14:49:02 +01:00
Nicolas Lœuillet
db1d962f7b Merge pull request #2524 from lologhi/instapaper-cli-import
Add Instapaper to CLI import
2016-11-01 14:26:57 +01:00
Laurent
995d909d0f Add Instapaper to CLI import 2016-11-01 18:33:32 +08:00
Jean-Baptiste
303b3c61a7 Translation - French - tiny typo 2016-10-31 20:16:36 +01:00
Jean-Baptiste
31dd328df4 Translation - French - tiny escape correction 2016-10-31 20:12:29 +01:00
Jean-Baptiste
337b47c216 Translation - French - tiny escape correction 2016-10-31 20:01:07 +01:00
Nicolas Lœuillet
68e0efffb8 Fixed review 2016-10-31 17:20:27 +01:00
Nicolas Lœuillet
3b81212674 Added translations and baggy part 2016-10-31 16:48:34 +01:00
Nicolas Lœuillet
e61ee56031 Added QRCode and link to configure android application 2016-10-31 16:18:52 +01:00
Jeremy Benoist
aedd6ca0fd Add translations & migration 2016-10-31 13:29:33 +01:00
Nicolas Lœuillet
e52ee565f7 Merge pull request #2521 from foxmask/master
fix path for  the install scripts
2016-10-31 09:56:07 +01:00
Nicolas Lœuillet
7d9abd1ab5 Merge pull request #2520 from wallabag/config
Inject parameter instead of service
2016-10-31 09:39:53 +01:00
FoxMaSk
99692e8c33 fix path for in install scripts 2016-10-30 22:46:09 +01:00
FoxMaSk
038469e73f fix path for in install scripts 2016-10-30 22:38:38 +01:00
Jeremy Benoist
d1495dd0a4 Ability to enable/disable downloading images
This will speed up the test suite because it won’t download everything when we add new entry…
Add a custom test with downloading image enabled
2016-10-30 21:30:45 +01:00
Jeremy Benoist
e1632cea0e Fix tests 2016-10-30 20:43:37 +01:00
Jeremy Benoist
4b3c983ab8 Inject parameter instead of service
We are injecting CraueConfig service when we only need to retrieve one or two values from it.
Instead I discovered we can directly inject a value from a service in the service definition!
2016-10-30 20:27:41 +01:00
Jeremy Benoist
309e13c11b Move settings before Entry
Because we need wallabag_url to be defined when we’ll insert entries
2016-10-30 20:12:34 +01:00
Jeremy Benoist
41ada277f0 Add instance url to the downloaded images 2016-10-30 19:50:00 +01:00
Thomas Citharel
f74061f1e1 Merge pull request #2518 from wallabag/docs-dev-3rd-party-by-strubbl
docs: fix link to wallabag-stats project
2016-10-30 12:27:25 +01:00
Jean-Baptiste
2087e499b4 Translation update - French 2016-10-30 12:11:24 +01:00
Jean-Baptiste
f6aff9a7a8 Translation update - French 2016-10-30 12:10:59 +01:00
Jean-Baptiste
431d038aa7 Translation update - French 2016-10-30 12:10:14 +01:00
Jean-Baptiste
a0eddc598e Translation update - French 2016-10-30 12:09:08 +01:00
Sven Fischer
90ec78f05a docs: fix link to wallabag-stats project 2016-10-30 12:01:24 +01:00
Jeremy Benoist
48656e0eaa Fixing tests 2016-10-30 11:27:09 +01:00
Jeremy Benoist
7f55941856 Use doctrine event to download images 2016-10-30 10:48:29 +01:00
Jeremy Benoist
45fd7e09d7 Cleanup 2016-10-30 09:58:53 +01:00
Jeremy Benoist
535bfcbe80 Move related event things in Event folder 2016-10-30 09:58:39 +01:00
Nicolas Lœuillet
2a2ceceaa4 Merge pull request #2514 from wallabag/docs-dev-3rd-party-by-strubbl
docs: update 3rd party projects by Strubbl
2016-10-30 07:04:11 +01:00
Sven Fischer
a40b2b7ee4 docs: update 3rd party projects by Strubbl 2016-10-29 19:59:05 +02:00
Jeremy Benoist
156bf62758 CS 2016-10-29 16:25:45 +02:00
Thomas Citharel
94654765cc Working 2016-10-29 16:25:45 +02:00
Thomas Citharel
419214d722 Download pictures successfully
Needs to rewrite them properly (get base url)
2016-10-29 16:25:45 +02:00
Thomas Citharel
4dface6670 first draft (from v1) 2016-10-29 16:25:45 +02:00
Jeremy Benoist
ca9858537e Merge pull request #2513 from wallabag/update-capistrano-config
Updated Capistrano configuration
2016-10-29 15:36:58 +02:00
Nicolas Lœuillet
c4b3933bae Updated Capistrano configuration 2016-10-29 14:39:07 +02:00
Nicolas Lœuillet
67b270d996 Merge pull request #2506 from wallabag/fix-export-with-tags
Fixed entries export filtered with a tag
2016-10-29 14:27:46 +02:00
Nicolas Lœuillet
794ac861cb Added test for export by filtering with tag 2016-10-29 14:03:55 +02:00
Nicolas Lœuillet
920d88599a Fixed entries export filtered with a tag
Fix #2505
2016-10-29 13:43:11 +02:00
Jeremy Benoist
5feef9f7a4 Merge pull request #2499 from wallabag/add-relation-client-user
Added relation between API Client and User
2016-10-29 13:20:55 +02:00
Jeremy Benoist
267087d969 Merge pull request #2509 from wallabag/explode-api-controller
Exploded WallabagRestController into many controllers
2016-10-29 13:20:01 +02:00
Nicolas Lœuillet
bc4564a709 Removed useless route 2016-10-28 15:24:58 +02:00
Nicolas Lœuillet
900c844861 Exploded WallabagRestController into many controllers
Fix #2503
2016-10-28 14:46:30 +02:00
Nicolas Lœuillet
f08ec5f88a Remove backquote in query 2016-10-28 11:14:14 +02:00
Nicolas Lœuillet
f24ea59ea4 Fixed migration and added tests 2016-10-28 10:55:39 +02:00
Nicolas Lœuillet
eca4d030bf Merge pull request #2508 from wallabag/fix-redis-rabbit-doc
Added the whole path to parameters.yml file
2016-10-27 16:53:57 +02:00
Nicolas Lœuillet
37da178696 Added the whole path to parameters.yml file 2016-10-27 14:46:21 +02:00
Nicolas Lœuillet
069d39dfaf Merge pull request #2507 from wallabag/add-check-makefile
Added require.sh to check if composer is installed
2016-10-27 13:55:17 +02:00
Nicolas Lœuillet
c4d9a8d6d0 Usage of composer.phar if it's found 2016-10-27 10:09:43 +02:00
Nicolas Lœuillet
9998c72533 Added require.sh to check if composer is installed 2016-10-27 09:53:09 +02:00
Jeremy Benoist
f3b637fbfe Merge pull request #2500 from wallabag/add-check-composer
Added a check in Makefile to see if composer is installed
2016-10-27 07:30:50 +02:00
Nicolas Lœuillet
a5d6a7d8b5 Merge pull request #2504 from wallabag/change-page-title-filter-tags
Added tag label in the page title
2016-10-26 16:09:37 +02:00
Nicolas Lœuillet
73e8df9e44 Renamed variable for page title 2016-10-26 15:49:44 +02:00
Nicolas Lœuillet
7a5043f187 Added tag label in the page title
Fix #2472
2016-10-26 13:53:23 +02:00
Jeremy Benoist
c68720d40e Merge pull request #2473 from pmichelazzo/master
Portuguese (Brazilian) translation
2016-10-25 11:41:24 +02:00
Paulino Michelazzo
e8eec07ae6 Translated missed line 147 2016-10-25 07:25:08 -02:00
Nicolas Lœuillet
c5ad143e75 Added a check in Makefile to see if composer is installed
Fix #2498
2016-10-24 22:28:44 +02:00
Nicolas Lœuillet
23406ca3f1 Added relation between API Client and User
Fix #2062
2016-10-24 21:56:28 +02:00
Nicolas Lœuillet
e1d4ed2d81 Merge pull request #2493 from bmillemathias/add_link_content_fetch_problem
Add relevant links to fetch content error page
2016-10-24 21:44:22 +02:00
Nicolas Lœuillet
d36e5e20a5 Removed the email part 2016-10-24 21:01:13 +02:00
Nicolas Lœuillet
8e58be9fb6 Merge pull request #2496 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-10-24 20:19:53 +02:00
Mateusz Rumiński
cd99bfae68 Update messages.pl.yml
translate reset section to polish
2016-10-24 19:49:33 +02:00
Jeremy Benoist
64a8781e45 Merge remote-tracking branch 'origin/master' into 2.2 2016-10-24 12:03:17 +02:00
Jeremy Benoist
9313ea9d44 Merge pull request #2401 from wallabag/reset-account
Reset account
2016-10-24 11:57:51 +02:00
Jeremy Benoist
f623516e10 SQLite should use utf8, not utf8mb4 2016-10-24 10:10:38 +02:00
Nicolas Lœuillet
a1c1841828 Merge pull request #1890 from wallabag/v2-api-annotation-switched
bring annotations to API
2016-10-24 10:06:12 +02:00
Baptiste Mille-Mathias
d1b075509d Add relevant links to fetch content error pages.
We link to the troubleshooting guide and give the mail link.
2016-10-23 15:34:52 +02:00
Jeremy Benoist
5ce1528953 Fix migrations 2016-10-23 12:35:57 +02:00
Jeremy Benoist
c64b4941d5 Merge pull request #2486 from wallabag/translate-backup-doc
Added 🇫🇷 documentation for wallabag backup
2016-10-22 22:23:15 +02:00
Julian Oster
2ca1cc0c18 Translate backup.rst to German 2016-10-22 21:11:20 +02:00
Nicolas Lœuillet
67aa755fb5 Added 🇫🇷 documentation for wallabag backup 2016-10-22 14:16:17 +02:00
Jeremy Benoist
88d5d94dcb Lowercase wallabag 2016-10-22 14:05:59 +02:00
Jeremy Benoist
5751b41491 Add migration for MySQL utf8mb4 2016-10-22 14:01:58 +02:00
Nicolas Lœuillet
f69636c4db Merge pull request #2484 from bmillemathias/fix_2479
Document what to backup in Wallabag
2016-10-22 13:55:46 +02:00
Jeremy Benoist
fc79f1ffa8 Add verification check for MySQL version
Must now be >= 5.5.4
2016-10-22 13:41:03 +02:00
Jeremy Benoist
f7f6bfb7e9 Merge pull request #2485 from bmillemathias/fix_android_documentation
Fix missing words in Android application documentation
2016-10-22 13:31:14 +02:00
Jeremy Benoist
1e7807e703 Merge pull request #2456 from wallabag/use-new-pdf
use new tcpdf library version
2016-10-22 13:29:58 +02:00
Baptiste Mille-Mathias
89abc0b61b Add missing words in the documentation 2016-10-22 13:21:53 +02:00
Jeremy Benoist
b0de88f75d Use statements & update translation 2016-10-22 13:13:07 +02:00
Jeremy Benoist
8c61fd12b1 CS 2016-10-22 13:13:07 +02:00
Jeremy Benoist
ca8b49f46e Add baggy reset part 2016-10-22 13:13:07 +02:00
Jeremy Benoist
f71e55ac88 Avoid orphan tags 2016-10-22 13:13:07 +02:00
Jeremy Benoist
2f82e7f8e1 Cleanup subscriber / listener definition 2016-10-22 13:13:07 +02:00
Jeremy Benoist
191564b7f7 Add custom doctrine subscriber for SQLite
Since SQLite doesn’t handle cascade remove by default, we need to handle it manually.

Also some refacto
2016-10-22 13:13:07 +02:00
Jeremy Benoist
98efffc2a6 Fix emoji insertion in MySQL
Switch to utf8mb4 instead of utf8 because f*** MySQL
See https://github.com/doctrine/dbal/pull/851
2016-10-22 13:13:07 +02:00
Jeremy Benoist
206bade58a Add ability to reset some datas
- annotations
- tags
- entries
2016-10-22 13:13:06 +02:00
Jeremy Benoist
817724a7b8 Re-add bottom pagination
Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template
2016-10-22 13:09:16 +02:00
Thomas Citharel
ab61dbc073 remove padding on small widths
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-10-22 13:08:12 +02:00
Thomas Citharel
34aa06a9b9 WIP
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-10-22 13:08:04 +02:00
Thomas Citharel
af2ff7c6da use new tcpdf library version 2016-10-22 12:52:23 +02:00
Jeremy Benoist
aa4741091f Add test on /api/annotations
Fix controller forward in WallabagRestController.
Update PHPDoc so it is sorted the same way as others one
Duplicate all annotations test to use both api & normal way
Also, make annotation tests independent to each other
2016-10-22 12:09:20 +02:00
Jeremy Benoist
3199ec4702 CS 2016-10-22 09:17:01 +02:00
Baptiste Mille-Mathias
fc75009de7 Document what to backup in Wallabag
Fixes issue #2479
2016-10-22 09:14:07 +02:00
Nicolas Lœuillet
d9b7768dca Added a missing namespace 2016-10-22 09:06:07 +02:00
Nicolas Lœuillet
e5edb6e127 PHP CS 2016-10-22 09:06:07 +02:00
Thomas Citharel
0c271b9eb0 fix cs and phpdoc 2016-10-22 09:06:07 +02:00
Thomas Citharel
b1e92f8c14 cs 2016-10-22 09:06:07 +02:00
Thomas Citharel
1eea248bb0 move code 2016-10-22 09:06:07 +02:00
Thomas Citharel
c7935f32d2 cs 2016-10-22 09:06:07 +02:00
Thomas Citharel
351eb8d97e bring annotations to API 2016-10-22 09:06:07 +02:00
Nicolas Lœuillet
e8331dd9e7 Merge pull request #2453 from wallabag/fix-api-export
Fix API export
2016-10-21 15:22:11 +02:00
Nicolas Lœuillet
f99ddbc6f8 Merge pull request #2481 from wallabag/some-fixes
Some fixes
2016-10-21 15:15:41 +02:00
Nicolas Lœuillet
49dee2d2de Merge pull request #2482 from wallabag/avoid-bad-refresh
If reload content failed, don’t update it
2016-10-21 15:12:29 +02:00
Jeremy Benoist
b64d8f2c9f Update Twitter cards description 2016-10-21 10:51:20 +02:00
Jeremy Benoist
2cbf0d05d4 Update translation for piwik_host 2016-10-21 10:45:39 +02:00
Jeremy Benoist
645dc7594b Fix missing translations 2016-10-21 07:52:55 +02:00
Jeremy Benoist
818cbe1fee Fix Portuguese translation 2016-10-21 07:18:41 +02:00
Paulino Michelazzo
8e53bf3aa1 Update translation 2016-10-21 00:12:53 +02:00
Jeremy Benoist
f6798f69c3 This test doesn’t require an internet connection 2016-10-20 23:26:16 +02:00
Jeremy Benoist
9095497191 Fix test 2016-10-20 23:03:37 +02:00
Jeremy Benoist
2297d60f10 If reload content failed, don’t update it
In case user wants a fresh version of the current one and the website isn’t available, don’t erase it with a boring message saying wallabag wasn’t able to refresh the content.
2016-10-20 22:49:46 +02:00
Jeremy Benoist
5453500458 Requeue depending on producer
Browser import can requeue message from `parseEntry` but we should take care of the way import are handled (depending on the producer)
2016-10-20 21:17:45 +02:00
Jeremy Benoist
1e3d74a9cf Avoid RabbitMQ consumer to loop
When the `parseEntry` returns null it means the entry already exists in the database. Sending `false` as return, will requeue the message which will then loop forever.
2016-10-20 21:17:03 +02:00
Jeremy Benoist
576d285ddf Translate date
I use a kind of hacky way to convert the user locale (defined with 2 letters, like `fr`) into a local with 5 letters (like `fr_FR`). I guess it should work on most of the case..
2016-10-20 21:16:01 +02:00
Jeremy Benoist
166e8cc6a9 Fix french translation 2016-10-20 21:14:46 +02:00
Jeremy Benoist
1cad9416c9 Update Portuguese translations 2016-10-20 21:11:10 +02:00
Jeremy Benoist
b669224762 Validate ALL translations files 2016-10-20 21:11:09 +02:00
Paulino Michelazzo
a42cc6ff89 Update validators.pt.yml file
Some missed strings translated.
2016-10-20 08:57:24 +02:00
Paulino Michelazzo
5d6cffedb1 Update Portuguese (Brazilian) translation
Adding the config.yml on the package.
2016-10-19 19:25:48 +02:00
Paulino Michelazzo
99731f0bb1 Merge remote-tracking branch 'wallabag/master' 2016-10-18 22:48:23 +02:00
Paulino Michelazzo
3a3c6b866b Portuguese (Brazilian) translation
This the Portuguese (Brazilian) for the Wallaby v2.
2016-10-18 20:51:31 +02:00
Jeremy Benoist
7180aaed45 Merge pull request #2467 from wallabag/version-213dev
Update wallabag version for master branch
2016-10-17 11:57:52 +02:00
Nicolas Lœuillet
f31361a6d9 Update wallabag version for master branch 2016-10-17 11:56:29 +02:00
Nicolas Lœuillet
fd461c25aa Merge pull request #2466 from wallabag/fix-update-doc
Removed MD5 hash in documentation
2016-10-17 11:40:03 +02:00
Nicolas Lœuillet
39c3dd30d2 Removed MD5 hash in documentation 2016-10-17 11:38:11 +02:00
Nicolas Lœuillet
1172622a07 Merge pull request #2452 from wallabag/prepare-212
Prepare wallabag 2.1.2 🚀
2016-10-17 11:04:20 +02:00
Nicolas Lœuillet
d4e9ce5807 Change release title in changelog 2016-10-17 10:27:07 +02:00
Nicolas Lœuillet
fd54f236f4 Update release process 2016-10-17 10:23:34 +02:00
Nicolas Lœuillet
545748bad1 Update changelog 2016-10-17 10:22:51 +02:00
Nicolas Lœuillet
ef22711605 Prepare wallabag 2.1.2 🚀 2016-10-17 09:43:13 +02:00
Nicolas Lœuillet
72ec79a5d6 Merge pull request #2464 from wallabag/fix-settings-translation
Fixed hardcoded title for internal settings
2016-10-17 09:23:15 +02:00
Nicolas Lœuillet
5e469b91d9 Fixed hardcoded title for internal settings
Fix #2458
2016-10-17 09:14:05 +02:00
Jeremy Benoist
692f9388cb Merge pull request #2455 from wallabag/fix-material-config-tabs
Fix tabs on material
2016-10-16 21:06:23 +02:00
Jeremy Benoist
3fb409ffc6 Merge pull request #2454 from wallabag/fix-baggy-small-width
Fix baggy display on small screens
2016-10-16 21:05:30 +02:00
Thomas Citharel
97512ec4bc Merge pull request #2459 from wallabag/improve-german-translation
German: improve existing and add missing translation
2016-10-16 12:06:42 +02:00
Thomas Citharel
dda6398a40 Merge pull request #2457 from wallabag/link-german-docu
add link to German documentation in about page
2016-10-16 10:54:19 +02:00
Sven Fischer
5bd7acd50d German: improve existing and add missing translation 2016-10-16 10:45:51 +02:00
Sven Fischer
f69ab83a5a add link to German documentation in about page 2016-10-16 09:23:58 +02:00
Thomas Citharel
d9a30ef301 Fix tabs on material
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-10-15 19:26:38 +02:00
Thomas Citharel
d32e1c424a Fix baggy on small screens 2016-10-15 19:04:53 +02:00
Jeremy Benoist
5960aa1ffc CS 2016-10-15 18:00:08 +02:00
Jeremy Benoist
f1c3f68e90 ApiDoc & Route annotation were conflicted
The generated error was “Unable to guess how to get a Doctrine instance from the request information.”.

I haven’t checked deeper in Doctrine (I know it was coming from the DoctrineParamConverter).

Anyway, I check for FosRest possiblity to add extra format without allowing them for every route (like it was done in the first place).

I finally found a way but it then seems all request goes to the FormatListener of FosRest so I needed to add a custom rules to match all request to be sure we don’t get  a 406 error from FosRest.

Should be ok now …
2016-10-15 16:46:42 +02:00
Thomas Citharel
05c009bb85 Merge pull request #2451 from wallabag/add-dev-make
Bring make dev
2016-10-15 15:40:20 +02:00
Thomas Citharel
8ecfdd7f8a Merge pull request #2450 from wallabag/new-improvement-view
View improvements
2016-10-15 15:38:49 +02:00
Thomas Citharel
08f5a5b6bd fix stylelint 2016-10-15 15:25:46 +02:00
Thomas Citharel
f48a6f3a54 Bring make dev 2016-10-15 15:16:35 +02:00
Alexandr Danilov
38dc91be8e Improved side menu, reduced the font size on small screens, fixed a form to add links on small screens 2016-10-15 14:49:07 +02:00
Thomas Citharel
76f2123def Merge pull request #2412 from wallabag/fix-postgres-migration
Fix PostgreSQL migrations
2016-10-15 14:42:46 +02:00
Nicolas Lœuillet
7131f94274 Merge pull request #2446 from wallabag/fix-taggingrules-doc
Added information about tagging rules in documentation
2016-10-15 11:47:12 +02:00
Sven Fischer
f878902e6a docs/de/user/configuration.rst: German fix for tagging rules docu 2016-10-14 23:48:50 +02:00
Sven Fischer
2752053f99 docs/de/user/configuration.rst: German fix for tagging rules docu 2016-10-14 23:47:37 +02:00
Nicolas Lœuillet
7b9b9ca7f8 Merge pull request #2447 from wallabag/fix-fr-de-doc-homepage
Fixed french and german doc homepages
2016-10-14 15:45:13 +02:00
Nicolas Lœuillet
68b8e75f94 Fixed french and german doc homepages 2016-10-14 14:55:45 +02:00
Nicolas Lœuillet
8edb250caa Added information about tagging rules in documentation
Fix #2060
2016-10-14 14:45:32 +02:00
Nicolas Lœuillet
311285f585 Merge pull request #2444 from Kaligule/master
Mention example instance in docs
2016-10-14 09:57:34 +02:00
Kaligule
7880838943 Merge pull request #1 from Kaligule/Documentation
Mention example instance
2016-10-14 09:15:14 +02:00
Kaligule
eb7d1b4b30 Mention example instance
Namely http://v2.wallabag.org/api/doc, so api methods can be looked up without installing wallabag first.
2016-10-14 09:09:28 +02:00
Nicolas Lœuillet
bf8e088033 Merge pull request #2435 from wallabag/french-upgrade-doc
Added french documentation for upgrade
2016-10-13 16:56:37 +02:00
Nicolas Lœuillet
83634bab22 Added missing space 2016-10-13 16:56:03 +02:00
Nicolas Lœuillet
8b28151e14 Merge pull request #2434 from wallabag/parameters-doc
Added french documentation for parameters.yml
2016-10-13 16:53:13 +02:00
Nicolas Lœuillet
e65c27587b Merge pull request #2439 from zertrin/minor-fix-docs-1
Minor fixes in the english documentation
2016-10-13 16:52:25 +02:00
zertrin
a25377cb4c Minor fixes in the english documentation 2016-10-13 11:07:24 +02:00
Sven Fischer
17064d3c54 update German user/upgrade-2.1.x-2.1.y.rst 2016-10-12 20:45:28 +02:00
Sven Fischer
f68e351018 update German user/upgrade-2.0.x-2.1.1 2016-10-12 20:41:15 +02:00
Sven Fischer
75a1506c27 translate to German: user/parameters 2016-10-12 20:33:55 +02:00
Jeremy Benoist
6147736868 Merge pull request #2438 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-10-12 20:01:13 +02:00
Mateusz Rumiński
fa100dd1e0 Update messages.pl.yml
translate delete section to polish
2016-10-12 19:32:30 +02:00
Jeremy Benoist
b1b561da51 Merge pull request #2372 from pmartin/api-get-entry-as-epub
API: ability to export entry in all available format (epub, pdf, etc...)
2016-10-12 14:06:33 +02:00
Nicolas Lœuillet
b09cafbb3f Added french documentation for upgrade 2016-10-12 13:37:50 +02:00
Nicolas Lœuillet
18470d7c6a Added french documentation for parameters.yml 2016-10-12 13:19:45 +02:00
Nicolas Lœuillet
da8ecdfa17 Merge pull request #2432 from wallabag/issue-site-config
Update ISSUE_TEMPLATE.md
2016-10-12 12:04:08 +02:00
Jeremy Benoist
7ffa48a11c Update ISSUE_TEMPLATE.md 2016-10-12 11:22:11 +02:00
Jeremy Benoist
e4cf672ccf Merge remote-tracking branch 'origin/master' into 2.2 2016-10-11 21:01:30 +02:00
Nicolas Lœuillet
dbe94e73a9 Merge pull request #2429 from wallabag/lock-fos-user
Lock deps for FOSUser
2016-10-11 19:32:22 +02:00
Jeremy Benoist
a0a4ce3135 Lock deps for FOSUser
We’ll wait until the final release will be out and other related project will be update to support it.
Meanwhile we can safely lock to a previous version.
2016-10-11 18:59:08 +02:00
Jeremy Benoist
e57df5611f Merge pull request #2409 from wallabag/Quent-in-patch-1
Occitan version update
2016-10-11 18:18:29 +02:00
Nicolas Lœuillet
9bed0ea236 Merge pull request #2422 from wallabag/typo-doc
Fixed display for note in installation page
2016-10-11 15:03:46 +02:00
Nicolas Lœuillet
c8976118d4 Merge pull request #2426 from wallabag/fix-doc
Fix links on english documentation homepage
2016-10-11 15:00:59 +02:00
Nicolas Lœuillet
7e72b371ba Fix links on english documentation homepage 2016-10-11 14:59:32 +02:00
Quent-in
a9e4d6dad2 Update messages.oc.yml
I thought I had translated the Docker installation line, apparently not!
Thanks Nicolas for the other changes!
2016-10-10 20:01:25 +02:00
Nicolas Lœuillet
7dacf35845 Merge pull request #2420 from wallabag/redis-tests
Avoid error when Redis isn't here in tests
2016-10-10 19:02:05 +02:00
Nicolas Lœuillet
36ef9e2730 Fixed display for note in installation page 2016-10-10 18:51:20 +02:00
Jeremy Benoist
bccf7a70bc Merge pull request #2403 from wallabag/cleanup-install-process-in-doc
Cleaned up documentation for installation process
2016-10-10 16:58:15 +02:00
Jeremy Benoist
e40bed3607 Avoid error when Redis isn't here in tests 2016-10-10 16:34:57 +02:00
Nicolas Lœuillet
c99d90455b Merge pull request #2419 from wallabag/fix-twitter-cards
Fixed Twitter Cards by adding a description tag
2016-10-10 16:09:52 +02:00
Nicolas Lœuillet
a2f42d8eaa Fixed Twitter Cards by adding a description tag 2016-10-10 16:05:06 +02:00
Nicolas Lœuillet
fa4c39b37c Added steps about Redis/RabbitMQ activation 2016-10-10 15:38:49 +02:00
Nicolas Lœuillet
c15f083896 Fixed links on import page 2016-10-10 15:38:42 +02:00
Nicolas Lœuillet
0ff674a952 Merge pull request #2418 from wallabag/add-twitter-cards
Added support of Twitter Cards for public articles
2016-10-10 15:20:06 +02:00
Nicolas Lœuillet
020c723e28 Added support of Twitter Cards for public articles 2016-10-10 14:33:34 +02:00
Jeremy Benoist
035513b025 Use table for parameters.yml 2016-10-10 13:42:50 +02:00
Nicolas Lœuillet
3e761063e2 Merge pull request #2417 from wallabag/version-dev
Define a dev version for the master
2016-10-10 13:03:34 +02:00
Nicolas Lœuillet
ed11d7f731 Added page about parameters.yml 2016-10-10 13:01:14 +02:00
Jeremy Benoist
6b1317a627 Add -dev version
Following https://github.com/wallabag/wallabag/pull/2417
2016-10-10 11:39:42 +02:00
Nicolas Lœuillet
eb54d338e8 Typos in upgrade doc 2016-10-10 11:35:32 +02:00
Jeremy Benoist
fb8835cc8f Define a dev version for the master
This is to be sure that user testing wallabag from the master will have the version defined as dev.
2016-10-10 11:31:57 +02:00
Nicolas Lœuillet
7c1ce28342 Update upgrade documentation 2016-10-10 11:21:20 +02:00
Nicolas Lœuillet
7c1225347d Update documentation 2016-10-10 10:20:32 +02:00
Nicolas Lœuillet
c26d1285ba Fixed review 2016-10-10 10:05:50 +02:00
Nicolas Lœuillet
84e3c36e02 Added documentation about testsuite
Fix #2415
2016-10-10 09:15:53 +02:00
Jeremy Benoist
edc8bc0b2f Update RELEASE_PROCESS.md 2016-10-10 09:12:24 +02:00
Jeremy Benoist
3175e33012 Update README.md 2016-10-10 09:11:26 +02:00
Nicolas Lœuillet
2a5ff7f554 Merge pull request #2411 from wallabag/fix-entities
Fix entities definition
2016-10-10 08:02:25 +02:00
Jeremy Benoist
8eeefc658c Merge pull request #2414 from szafranek/bugfix-bookmarklet
Remove automatic closing of the window from bookmarklet
2016-10-10 07:11:01 +02:00
Jeremy Benoist
e93c9dc4ab Merge pull request #2413 from wallabag/sub-command-verbose
When a sub command fail, display error message
2016-10-10 07:09:45 +02:00
Krzysztof Szafranek
d8a9209cfc Remove automatic closing of the window from bookmarklet 2016-10-09 22:40:55 +02:00
Jeremy Benoist
39a19bdf47 When a sub command fail, display error message
We often got issue with message “The command "doctrine:database:create" terminated with an error code: 1.”.

Using the `BufferedOutput` we can store the output and only display it if an error occurs.
2016-10-09 22:39:43 +02:00
Nicolas Lœuillet
02edf0707f Changed the default command when we launch make 2016-10-09 22:01:24 +02:00
Nicolas Lœuillet
4e7863c6aa Created scripts folder to store update/install/release process 2016-10-09 21:50:15 +02:00
Jeremy Benoist
4c79c51f99 Fix PostgreSQL migrations 2016-10-09 21:35:04 +02:00
Nicolas Lœuillet
47508f004f Merge pull request #2410 from wallabag/tag-optim
Optimize tag list display
2016-10-09 21:27:47 +02:00
Nicolas Lœuillet
418626e836 Merge pull request #2177 from wallabag/delete-account
Delete user
2016-10-09 21:21:03 +02:00
Nicolas Lœuillet
26490a8794 Update Makefile 2016-10-09 21:15:57 +02:00
Nicolas Lœuillet
46aeaab8ff Update Makefile 2016-10-09 21:06:26 +02:00
Jeremy Benoist
8dc4cd0f25 Fix entities definition
As per Doctrine said in the debug tool bar:

- The field Wallabag\ApiBundle\Entity\Client#refreshTokens is on the inverse side of a bi-directional relationship, but the specified mappedBy association on the target-entity Wallabag\ApiBundle\Entity\RefreshToken#client does not contain the required 'inversedBy="refreshTokens"' attribute.

- The field Wallabag\ApiBundle\Entity\Client#accessTokens is on the inverse side of a bi-directional relationship, but the specified mappedBy association on the target-entity Wallabag\ApiBundle\Entity\AccessToken#client does not contain the required 'inversedBy="accessTokens"' attribute.
2016-10-09 20:51:37 +02:00
Nicolas Lœuillet
d8507addbb First draft for Makefile 2016-10-09 20:21:02 +02:00
Jeremy Benoist
e084778030 CS 2016-10-09 19:35:27 +02:00
Jeremy Benoist
28bb48905a Optimize the way tag list is rendered
Instead of retrieve all informations about entries of a tag to just count them, we’ll count them before with a fastest query.

Also change the layout of the tag list in material design
2016-10-09 18:55:22 +02:00
Jeremy Benoist
b4fcd60e7f Avoid tag duplication when tagging all articles
Mostly when the tag doesn’t yet exist.
It was created each time it matche the rule… glups.
2016-10-09 18:55:21 +02:00
Jeremy Benoist
4d318f3755 Add more log to tag:all 2016-10-09 18:55:21 +02:00
Quent-in
dd248e4561 Occitan version update
If you need to write dates in full letter you might be interessed in https://github.com/fightbulc/moment.php
It comes with lots of languages ;)
Q: where are the "previous" and "next" bouton text? Can't find them to translate them.
2016-10-09 18:24:42 +02:00
Jeremy Benoist
e39aec3e38 Merge pull request #2406 from szafranek/bugfix-number-of-annotations
Show number of annotations instead of nbAnnotations placeholder
2016-10-09 14:11:20 +02:00
Nicolas Lœuillet
d451bcb3d0 Merge pull request #2405 from szafranek/cleanup-fix-invalid-html
Fix few invalid HTML tags
2016-10-09 07:46:09 +02:00
Krzysztof Szafranek
90c766b96b Show number of annotations instead of nbAnnotations placeholder
When there was more than one annotation, a placeholder was displayed in both themes, instead of actual number.
2016-10-09 04:59:04 +02:00
Krzysztof Szafranek
c5e4293efd Fix few invalid HTML tags 2016-10-09 03:37:21 +02:00
Jeremy Benoist
9810f30821 Remove unnecessary user serialization 2016-10-08 21:16:40 +02:00
Jeremy Benoist
7ac3e575f1 CS 2016-10-08 20:35:16 +02:00
Jeremy Benoist
a730cae384 Bonus: display driver in install command 2016-10-08 20:33:21 +02:00
Strubbl
5112b3556b update German installation.rst 2016-10-08 20:28:18 +02:00
Jeremy Benoist
3f60446756 Fix PostgreSQL query
PostgreSQL doesn’t like when we compare interger and boolean :)
2016-10-08 20:26:06 +02:00
Strubbl
5334381509 update German installation.rst 2016-10-08 20:25:48 +02:00
Jeremy Benoist
876d77a67d Better display and description
Confirmation message isn’t required since it is written in the delete description
2016-10-08 20:25:42 +02:00
Jeremy Benoist
eed812afd0 Logout user before deleting it
And add a smal description
2016-10-08 19:39:12 +02:00
Nicolas Lœuillet
7c256ffabe Chmoded install.sh 2016-10-08 15:14:45 +02:00
Nicolas Lœuillet
7eff4736a1 Cleaned up documentation for installation process 2016-10-08 15:10:56 +02:00
Jeremy Benoist
32d103f702 Merge pull request #2402 from wallabag/remove-1x-changelog
Removed 1.x stuff in CHANGELOG
2016-10-08 14:07:35 +02:00
Jeremy Benoist
c3396c65ef Fix some tests 2016-10-08 14:07:13 +02:00
Nicolas Lœuillet
951ad27fe4 Removed 1.x stuff in CHANGELOG 2016-10-08 14:05:07 +02:00
Nicolas Lœuillet
93a95c09bf Merge pull request #2351 from wallabag/fix-api-client-deletion
Changed relation between API client and refresh token
2016-10-08 13:31:54 +02:00
Nicolas Lœuillet
4ad6f5878a Merge pull request #2393 from wallabag/api-urls-exist
Ability to check multiple urls in API
2016-10-08 13:31:31 +02:00
Nicolas Lœuillet
e07c25a1ad Merge pull request #2397 from wallabag/api-orphan-tags
Ensure orphan tag are remove in API
2016-10-08 13:31:08 +02:00
Nicolas Lœuillet
b840268711 Added a test to check if entries are also deleted 2016-10-08 13:27:18 +02:00
Nicolas Lœuillet
71254701b7 Changed tests 2016-10-08 13:27:18 +02:00
Nicolas Lœuillet
821bb87685 Added tests 2016-10-08 13:27:18 +02:00
Nicolas Lœuillet
bb0c78f4a6 Added check if there is only one user
Added translations and documentation
2016-10-08 13:27:18 +02:00
Thomas Citharel
abb5291cd5 CS 2016-10-08 13:27:17 +02:00
Thomas Citharel
e4b46f77ef work 2016-10-08 13:27:17 +02:00
Jeremy Benoist
3f3a60879e Add entry export in API
Export isn't available for json & xml because user can use the default
entry endpoint instead.
2016-10-08 12:59:19 +02:00
Pascal MARTIN
24de866534 API: getEntry can return EPUB 2016-10-08 12:05:41 +02:00
Pascal MARTIN
3d4b0b3064 Routing: epub format is allowed for API 2016-10-08 12:05:40 +02:00
Jeremy Benoist
d9b0673dbb Merge pull request #2399 from wallabag/use-locale-for-config
Use default locale for user config
2016-10-08 10:34:08 +02:00
Jeremy Benoist
af4ce9e069 Merge pull request #2400 from wallabag/doc-env-prod
Set env to prod in documentation
2016-10-08 10:33:52 +02:00
Jeremy Benoist
ba69216853 Set env to prod in documentation 2016-10-08 09:39:07 +02:00
Jeremy Benoist
dd32c89ed6 Use default locale for user config
When creating a user, we set the language config “en” by default. We should use the defined locale (from `parameters.yml`) instead
2016-10-08 09:33:55 +02:00
Jeremy Benoist
ee32248f43 Ensure access_token are removed
When we remove the client, we should ensure that access_token are also removed.

To ensure that, I created a test that generated an access_token. So when we remove the client, this association should be cascaded and shouldn’t generate an error.

Also I moved some Api related stuff to the ApiBundle (like the developer controler and ClientType form)
2016-10-08 00:05:41 +02:00
Jeremy Benoist
ac8cf632bb Ensure orphan tag are remove in API
When the association between a tag and an entry is removed, if the tag doesn’t have other entries, we can remove it.

Also add more tests for that part and ensure TagControllerTest is isolated from the rest of the test suite (finally!)
2016-10-07 23:31:53 +02:00
Nicolas Lœuillet
3049afe190 Merge pull request #2396 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-10-07 22:20:51 +02:00
Nicolas Lœuillet
f271dd4b76 Merge pull request #2395 from wallabag/socket-connection
Add ability to use socket
2016-10-07 22:20:37 +02:00
Mateusz Rumiński
aa8a58b5a0 Update messages.pl.yml
translated shared_by_wallabag to polish
2016-10-07 21:32:27 +02:00
Jeremy Benoist
6d204f5382 Add ability to use socket
For Redis & MySQL
2016-10-07 21:00:13 +02:00
Jeremy Benoist
f0abc22d09 Ability to check multiple urls in API 2016-10-07 20:37:01 +02:00
Nicolas Lœuillet
233a1081ea Merge pull request #2386 from wallabag/update-changelog
Changed Changelog by using github-changelog-generator from @skywinder
2016-10-07 17:35:57 +02:00
Nicolas Lœuillet
20bf78b935 Merge pull request #2389 from wallabag/add-info-publich-articles
Added default picture if preview picture is null
2016-10-07 16:35:32 +02:00
Nicolas Lœuillet
499ba4cb2f Merge pull request #2388 from wallabag/fix-2factor-user-admin
Fixed two-factor checkbox display in user admin panel
2016-10-07 16:35:01 +02:00
Jeremy Benoist
aa88d2494b Merge pull request #2385 from wallabag/add-doc-about-siteconfig
Added documentation about siteconfig fix
2016-10-07 16:02:03 +02:00
Nicolas Lœuillet
3b1bf6343d Update release process 2016-10-07 15:30:25 +02:00
Nicolas Lœuillet
4e5d219663 Fixed review 2016-10-07 15:27:05 +02:00
Nicolas Lœuillet
d5c45d5288 Added default picture if preview picture is null 2016-10-07 15:21:31 +02:00
Nicolas Lœuillet
fba816c43b Added link to fivefilters website 2016-10-07 15:14:15 +02:00
Nicolas Lœuillet
5e7786f3c4 Fixed two-factor checkbox display in user admin panel
Fix #2380
2016-10-07 14:56:26 +02:00
Nicolas Lœuillet
9cfea18a5d Fixed review 2016-10-07 14:40:32 +02:00
Nicolas Lœuillet
e17373b659 Changed Changelog by using github-changelog-generator from @skywinder 2016-10-07 14:34:44 +02:00
Nicolas Lœuillet
c8d2dcdafe Merge pull request #2383 from wallabag/add-info-publich-articles
Added OpenGraph support for public articles
2016-10-07 14:30:46 +02:00
Nicolas Lœuillet
baf0ffa7df Added documentation about siteconfig fix
Found in #2358, thank you @j0k3r
2016-10-07 14:17:13 +02:00
Nicolas Lœuillet
21d82c3c5d Added test for OpenGraph 2016-10-07 14:06:12 +02:00
Jeremy Benoist
bf71a734f6 Merge pull request #2332 from wallabag/tags-export
Fix relations export for Entry
2016-10-07 13:55:55 +02:00
Nicolas Lœuillet
d0d196ffb3 Fixed review 2016-10-07 09:22:40 +02:00
Nicolas Lœuillet
f0d52417fb Added OpenGraph support for public articles
Fix #2289
2016-10-07 09:05:18 +02:00
Jeremy Benoist
74e1f7433a Fix tag test 2016-10-07 07:43:48 +02:00
Jeremy Benoist
6c8806cadc Fix bad translation key
`entry_reload_failed` instead of `entry_reloaded_failed`
2016-10-07 07:43:48 +02:00
Jeremy Benoist
b0458874c8 Fix relations export for Entry
Tags & Annotations weren’t really well exported.
This is now fixed (+ tests)
2016-10-07 07:43:19 +02:00
Thomas Citharel
9d127b3b93 Merge pull request #2377 from wallabag/fix-exists-api
Fix exists API call
2016-10-05 19:52:06 +02:00
Jeremy Benoist
0b174d69d7 Fix typo & add test 2016-10-05 19:30:56 +02:00
Jeremy Benoist
046f33e21b Merge pull request #2374 from wallabag/clickable-tags
Clickable tags
2016-10-05 16:16:21 +02:00
Thomas Citharel
145d69fe5d Merge pull request #2375 from wallabag/upgrade-nodejs
try to reduce assets build npm connection failing by updating nodejs
2016-10-05 15:38:19 +02:00
Thomas Citharel
5d39243068 Fix exists API call
Boo
2016-10-05 15:28:36 +02:00
Thomas Citharel
3c00779dc3 try to reduce assets build npm connection failing by updating nodejs 2016-10-05 15:05:42 +02:00
Thomas Citharel
15f1352ef8 better tags on material 2016-10-05 14:06:55 +02:00
Nicolas Lœuillet
2fb9caeb2d Merge pull request #2363 from wallabag/clean-composer
Remove mouf/nodejs-installer from composer
2016-10-04 22:22:19 +02:00
Jeremy Benoist
1b1cb553be Remove mouf/nodejs-installer from composer 2016-10-04 21:44:58 +02:00
Thomas Citharel
645c0d5bce better tags on baggy 2016-10-04 20:11:10 +02:00
Nicolas Lœuillet
837247dea4 Update md5 hash for package 2016-10-04 17:43:28 +02:00
Nicolas Lœuillet
c36f5adce2 Merge pull request #2349 from wallabag/prepare-211
Prepare wallabag 2.1.1
2016-10-04 17:13:57 +02:00
Nicolas Lœuillet
933c6f3155 Update CHANGELOG.md 2016-10-04 17:13:16 +02:00
Jeremy Benoist
8ebb214ec4 Typo 2016-10-04 17:12:45 +02:00
Jeremy Benoist
954b6a36a3 Update CHANGELOG 2016-10-04 17:11:26 +02:00
Nicolas Lœuillet
5958597ba6 Prepare wallabag 2.1.1 2016-10-04 17:08:34 +02:00
Thomas Citharel
57386125ab Merge pull request #2353 from wallabag/assets-fix
Basically, fix everything
2016-10-04 16:26:50 +02:00
Thomas Citharel
c10adc1f76 typo and build on test 2016-10-04 15:59:56 +02:00
Thomas Citharel
6cb364a2c1 use airbnb base rules and update eslint 2016-10-04 15:30:05 +02:00
Thomas Citharel
f733d8aaa3 Fix icon position 2016-10-04 15:12:48 +02:00
Nicolas Lœuillet
3e85e91159 Fixed calendar icon position with baggy theme 2016-10-04 15:00:47 +02:00
Nicolas Lœuillet
0c7f1ba796 Fixed icon position in share menu 2016-10-04 14:58:06 +02:00
Thomas Citharel
46d78f87d9 fix icons 2016-10-04 14:48:22 +02:00
Nicolas Lœuillet
f2ab290f0f Merge pull request #2359 from wallabag/user-config
Create config even if user is disabled
2016-10-04 13:35:13 +02:00
Thomas Citharel
9f7d154e34 Add eslint & stylelint tests (fix a few things) and move dependencies to dev 2016-10-04 12:14:28 +02:00
Jeremy Benoist
9a6ac0b47a 👋 HHVM 2016-10-04 11:20:58 +02:00
Jeremy Benoist
755ff9e835 Create config even if user is disabled
When a user register itself AND the wallabag instance is configured to send a confirmation email, the user is disabled when the listener (which create the config) receive the event.
There were a check (don't know why) if the user is enabled we create the config. But the user is disabled when confirmation email is actived.
2016-10-04 10:42:46 +02:00
Jeremy Benoist
f440e28281 Update doc
Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis)
2016-10-04 10:31:03 +02:00
Jeremy Benoist
ca8f9bdc15 Fix font & Travis
Grunt now copy fonts instead of symlink (node_modules won't exist for the end user)
2016-10-04 10:10:40 +02:00
Nicolas Lœuillet
f0b2d57154 Merge pull request #2354 from Zayon/master
Add php-bcmath extension to requirements
2016-10-04 08:41:17 +02:00
Jeremy Benoist
9f3a1cd20c shaarli instead of Diaspora 2016-10-04 07:26:18 +02:00
Jeremy Benoist
10f51f429d Update .travis.yml 2016-10-04 07:25:05 +02:00
Thomas Citharel
96a99d4375 Fix grunt path 2016-10-04 01:00:14 +02:00
Zayon
f7265b4b9d Add php-bcmath extension to requirements
Fix issue #2342
2016-10-03 23:29:21 +02:00
Thomas Citharel
5759c9aac1 remove install scripts and tweak travis 2016-10-03 23:21:02 +02:00
Thomas Citharel
a494c33ef7 Basically, fix everything
* Remove install.sh
* Assets are now provided
* Icons font issues are fixed
2016-10-03 23:08:26 +02:00
Nicolas Lœuillet
b0da721a52 Changed relation between API client and refresh token
Fix #2350
2016-10-03 21:39:01 +02:00
Jeremy Benoist
a3cc0dd0bf Add missing env in install.sh
Fix https://github.com/wallabag/wallabag/issues/2345
2016-10-03 18:13:40 +02:00
Thomas Citharel
aafb3321b7 Merge pull request #2341 from mruminski/master
Update messages.pl.yml
2016-10-03 16:44:19 +02:00
Thomas Citharel
b054bc27e6 Merge pull request #2340 from wallabag/improve-ger-transl
small improvement for german translation
2016-10-03 16:23:16 +02:00
Sven Fischer
1c634fe437 improve German translation 2016-10-03 15:52:27 +02:00
Thomas Citharel
24add95e9e Merge pull request #2338 from wallabag/install-2.1
Fix for 2.1 installation
2016-10-03 15:33:08 +02:00
Mateusz Rumiński
0113e2af1f Update messages.pl.yml
add missing and update existing translation
2016-10-03 15:05:21 +02:00
Jeremy Benoist
88d8125a5f Ensure cache is clear before upgrading
If we changed some namespace / classes, we need to refresh the cache before anything else.
2016-10-03 14:44:16 +02:00
Jeremy Benoist
4ac780eb21 Use install_dev.sh for Travis
Add `--no-dev` to `composer install` for prod env
2016-10-03 14:35:42 +02:00
Jeremy Benoist
8fdb5e5766 Re-add wallabag:install 2016-10-03 14:21:49 +02:00
Nicolas Lœuillet
9d3603147b Update md5 hash for wallabag 2.1.0 2016-10-03 11:16:35 +02:00
Jeremy Benoist
8c3c69fb9c Merge pull request #2334 from wallabag/prepare-21
Prepare wallabag 2.1.0 🚀
2016-10-03 10:42:14 +02:00
Nicolas Lœuillet
83c26bdf26 Merge pull request #2335 from wallabag/fix-quickstart-css
Fixed CSS for quickstart links
2016-10-03 10:29:41 +02:00
Nicolas Lœuillet
0f70abd695 Fixed CSS for quickstart links 2016-10-03 10:27:01 +02:00
Jeremy Benoist
7d002c333d Merge pull request #2333 from wallabag/translation-german-for-2.1
for 2.1, translate all strings to German, which haven't been translated yet
2016-10-03 09:25:51 +02:00
Nicolas Lœuillet
12f7fd004a Prepare wallabag 2.1.0 🚀 2016-10-03 09:16:57 +02:00
Nicolas Lœuillet
ab809de184 Merge pull request #2314 from wallabag/assets
Assets work
2016-10-03 09:09:45 +02:00
Jeremy Benoist
c30af946e7 Update messages.de.yml 2016-10-03 09:08:42 +02:00
Nicolas Lœuillet
553f863c3c Fixed typos 2016-10-03 09:05:40 +02:00
Julian Oster
beee26f6d5 Better translation for the weird sentence 2016-10-02 22:50:27 +02:00
Julian Oster
a878581410 Improve the german translation a bit
Just some little mistakes, good work so far :)
2016-10-02 22:32:23 +02:00
Sven Fischer
df9c080f8c translate all strings to German, which haven't been translated yet 2016-10-02 21:41:21 +02:00
Thomas Citharel
dfbbf0e18a Merge pull request #2331 from wallabag/api-links
Fix parameters in API _links
2016-10-02 17:48:16 +02:00
Jeremy Benoist
77557d289b Merge remote-tracking branch 'origin/master' into 2.1 2016-10-02 17:37:41 +02:00
Jeremy Benoist
c3f8b428dd Fix parameters in API _links
We forgot to pass them to the factory
2016-10-02 15:41:08 +02:00
Jeremy Benoist
1dc3bee6b9 Merge pull request #2327 from wallabag/user-management
Add users management UI
2016-10-02 15:00:02 +02:00
Jeremy Benoist
c21f2924f3 Merge pull request #2330 from pmichelazzo/master
Remove error message when creating ePub versions
2016-10-02 14:56:18 +02:00
Jeremy Benoist
ccc7faec09 Disabled delete button for the logged user
To avoid some bad things to happen…
2016-10-02 13:29:57 +02:00
Nicolas Lœuillet
18b8dc0e99 Merge pull request #2325 from wallabag/api-entries-exists
Add an exists endpoint in API
2016-10-02 13:17:23 +02:00
Paulino Michelazzo
ffcd91ec6c Remove error message when creating ePub versions
Trying to create a ePub version, the first page shows a message of a
“missing >”. This change solve this problem (and, for sure, in any
download version that’s use HTML).
2016-10-02 13:16:12 +02:00
Nicolas Lœuillet
92395680b6 Merge pull request #2328 from wallabag/avoid-duplicate-url
Avoid duplicate url with accents
2016-10-02 13:14:16 +02:00
Jeremy Benoist
eb4142e0af Remove NewUser test from Config 2016-10-02 11:09:28 +02:00
Jeremy Benoist
03141f9b95 Cleanup & add link on baggy menu 2016-10-02 11:08:53 +02:00
Jeremy Benoist
152fcccd44 Add users management UI
- remove the “add a user” from the config page
- add a CRUD on user
- fix some missing translations (+ bad indentation)
2016-10-02 11:08:53 +02:00
Jeremy Benoist
52c1fc7449 Merge pull request #2326 from wallabag/update-quickstart
Changed quickstart layout
2016-10-02 11:06:03 +02:00
Jeremy Benoist
6e5e27ab07 Merge pull request #2324 from wallabag/edit-tagging-rule
Add ability to edit a tagging rule
2016-10-02 11:05:10 +02:00
Jeremy Benoist
bfb3ae01da Merge pull request #2323 from wallabag/footer-stats
Add simple stats in footer
2016-10-02 11:04:49 +02:00
Jeremy Benoist
ae394b4078 Merge pull request #2329 from wallabag/Quent-in-patch-1
Occitan version update
2016-10-02 11:04:10 +02:00
Jeremy Benoist
a4df48916d Fix OC typos
+ remove extra sentence
2016-10-02 09:57:48 +02:00
Jeremy Benoist
24ad330be6 Update test 2016-10-02 01:47:10 +02:00
Jeremy Benoist
3583cadf6f CS 2016-10-02 01:43:50 +02:00
Jeremy Benoist
d6d3fb6e4c Remove additional entry
After the test is done, cleanup what we’ve done
2016-10-02 01:42:21 +02:00
Quent-in
1bcfeb0f4a Occitan version update
to be ready for the future of Wallabag :)
2016-10-01 18:23:37 +02:00
Nicolas Lœuillet
0d61b6015f Fixed french translation 2016-10-01 18:15:59 +02:00
Jeremy Benoist
2455472e26 CS 2016-10-01 18:05:25 +02:00
Jeremy Benoist
19ca0b2f35 Avoid duplicate url with accents 2016-10-01 18:00:11 +02:00
Nicolas Lœuillet
7d72cce4c7 Changed translations 2016-10-01 17:29:04 +02:00
Jeremy Benoist
55551e332c Add test when url doesn’t exist 2016-10-01 17:26:36 +02:00
Jeremy Benoist
8799bde00d Introduce validateRuleAction 2016-10-01 17:24:24 +02:00
Jeremy Benoist
6273fefd5d Add an exists endpoint in API
It should allow third party to check if an url was already saved by a user
2016-10-01 17:15:28 +02:00
Nicolas Lœuillet
a44d2613c7 Changed quickstart layout 2016-10-01 17:13:53 +02:00
Jeremy Benoist
bf3dc999e7 Add ability to edit a tagging rule 2016-10-01 16:52:05 +02:00
Nicolas Lœuillet
c4bf7af96f Merge pull request #2322 from wallabag/v2-404
Customize errors templates
2016-10-01 16:35:48 +02:00
Jeremy Benoist
1264029cd4 Add simple stats in footer 2016-10-01 16:03:50 +02:00
Nicolas Lœuillet
db5541e7a1 Merge pull request #2320 from wallabag/user-config
Create user config in one place.
2016-10-01 15:51:37 +02:00
Jeremy Benoist
40e219622a Customize errors templates
All error goes to the same template which only display the error message and the status code.
2016-10-01 14:58:48 +02:00
Jeremy Benoist
fb7354c4a4 Fix bad template name
When a user register, the template displayed saying it should now check its email was misspelled.
Resulting in displaying the default one (with margin issue).
2016-09-30 21:02:44 +02:00
Jeremy Benoist
ca17abce2d Create user config in one place
Using a listener, user config is now created when a user:

- is created from the command line
- register (with or without email confirmation)
- is created from the config panel
2016-09-30 21:01:36 +02:00
Jeremy Benoist
114c55c0a6 Merge remote-tracking branch 'origin/master' into 2.1 2016-09-30 13:27:19 +02:00
Jeremy Benoist
00d3f2a383 Merge pull request #2319 from pmartin/docker-php-gd-extension
Docker : install PHP 'gd' extension
2016-09-30 13:25:23 +02:00
Pascal MARTIN
ecdefb11f7 Add PHP 'gd' extension to docker
The gd extension is required to export entries as EPUB.
2016-09-30 12:29:37 +02:00
Pascal MARTIN
56f0150e2a Fix doc: 'bin/console' instead of 'app/console' 2016-09-30 12:29:22 +02:00
Nicolas Lœuillet
555ed552ca Merge pull request #2318 from wallabag/refactor-templates
Removed duplicated templates files
2016-09-30 10:21:33 +02:00
Nicolas Lœuillet
2ff9991a1d Removed duplicated templates files 2016-09-30 09:38:08 +02:00
Thomas Citharel
49f25d6ee8 remove bower dependency from npm 2016-09-29 13:17:19 +02:00
Nicolas Lœuillet
fb479be3a0 Merge pull request #2315 from wallabag/fixes-about-upgrade
Fixes about upgrade
2016-09-29 11:35:47 +02:00
Nicolas Lœuillet
2d8af6fc7f Added french documentation about Redis and RabbitMQ 2016-09-29 11:01:15 +02:00
Sven Fischer
c59e628afe Added links to async config in german doc 2016-09-29 10:43:53 +02:00
Sven Fischer
00283a3b0a add German redis.rst 2016-09-29 10:41:07 +02:00
Sven Fischer
080cb52fac add German rabbitmq.rst 2016-09-29 10:36:19 +02:00
Thomas Citharel
b4118f66ff remove bower 2016-09-29 09:20:37 +02:00
Thomas Citharel
0471e905b8 fonts & ligatures 2016-09-29 09:18:46 +02:00
Jeremy Benoist
37b63c170d Merge pull request #2316 from mruminski/2.1
Update messages.pl.yml
2016-09-29 07:20:23 +02:00
Mateusz Rumiński
02384d22ef Update messages.pl.yml
add missing translation for Instapaper importer
2016-09-29 01:04:06 +02:00
Thomas Citharel
8f234d0156 remove autocomplete and bring fonts through npm 2016-09-28 18:59:15 +02:00
Nicolas Lœuillet
ff5be9720b Added links to async config in french doc 2016-09-28 16:37:36 +02:00
Nicolas Lœuillet
cb0096df41 Added links to async config in english doc 2016-09-28 16:37:02 +02:00
Thomas Citharel
fc487c4eb1 Remove .idea stuff 2016-09-28 15:42:09 +02:00
Julian Oster
34e4c12604 Little improvements to the german translation 2016-09-28 13:52:06 +02:00
Strubbl
ff1f55c2a0 update German upgrade-2.0.x-2.1.y.rst 2016-09-28 12:26:29 +02:00
Nicolas Lœuillet
9866d39431 Fixed review 2016-09-28 11:59:35 +02:00
Nicolas Lœuillet
eef8aeec8f Reordered upgrade documentation 2016-09-28 11:13:20 +02:00
Thomas Citharel
c146f6940a Assets work
* ES6 all the things !

* ESLint checks everything

* CSS fixes (use stylelint)

* Fix #2231
2016-09-28 10:30:18 +02:00
Nicolas Lœuillet
084fb0d303 Some fixes about upgrade from 2.0.x -> 2.1.0 2016-09-28 10:04:36 +02:00
Jeremy Benoist
92fa168344 Merge pull request #2313 from wallabag/fix-long-loading
Remove CSS class who caused long loading on Firefox
2016-09-27 21:58:06 +02:00
Nicolas Lœuillet
1ed965beb9 Remove CSS class who caused long loading on Firefox
Fix #2302 #2281
2016-09-27 20:52:30 +02:00
Jeremy Benoist
a9e92b6609 Add Instapaper translations 2016-09-27 20:27:08 +02:00
Jeremy Benoist
a7dda1f2bf Add Instapaper docs 2016-09-27 20:27:08 +02:00
Jeremy Benoist
c7ea9b41f3 Add controller test for Instapaper 2016-09-27 20:27:08 +02:00
Jeremy Benoist
ff1a5362f7 Add Instapaper import
Also update ImportController with latest import (chrome, firefox & instapaper).
2016-09-27 20:27:08 +02:00
Jeremy Benoist
55345331c4 Merge pull request #2309 from mruminski/2.1
Update messages.pl.yml
2016-09-27 08:00:58 +02:00
Mateusz Rumiński
20762cd1ab Update messages.pl.yml
add missing translation for Firefox and Chrome imports
2016-09-27 00:58:44 +02:00
Jeremy Benoist
d6de23a100 Merge pull request #2192 from wallabag/import-browser-bookmarks
Import Firefox & Chrome bookmarks into wallabag
2016-09-26 14:47:02 +02:00
Nicolas Lœuillet
fefef9d41b Added tags for Firefox import 2016-09-26 13:40:10 +02:00
Jeremy Benoist
990adfb34c Move prepareEntry to dedicated place
Yeah first try was ugly, now each part are in the dedicated place.
Also, the date is hardly truncated to 10 chars because Firefox date are 16 chars long and Chrome are 17 chars long. So instead of divised them by a huge number, I prefer to truncate them.
2016-09-26 07:30:02 +02:00
Jeremy Benoist
12d93e6896 Update Firefox file
With real data, the previous looks more than a Chrome converted file.
Also, fix date conversion (hope so).
2016-09-25 22:24:07 +02:00
Thomas Citharel
7e98ad9626 Merge pull request #2308 from wallabag/tags-duplicate
Fix duplicate tags on import
2016-09-25 16:11:06 +02:00
Jeremy Benoist
27acc6ddb8 Fix bad date format in Browser import 2016-09-25 15:32:02 +02:00
Jeremy Benoist
f0fd82d039 Fix bad parameter for tests 2016-09-25 14:21:12 +02:00
Nicolas Lœuillet
bd206a84d8 Fixed tests by removing clear() 2016-09-25 12:29:19 +02:00
Thomas Citharel
64b1229b2d fix tests 2016-09-25 12:29:19 +02:00
Thomas Citharel
2c61db30b7 cs & fixes 2016-09-25 12:29:19 +02:00
Thomas Citharel
59201088b4 bring chrome and firefox as separate imports 2016-09-25 12:29:18 +02:00
Nicolas Lœuillet
f7c55b3812 Added tests for Chrome bookmarks import 2016-09-25 12:29:18 +02:00
Nicolas Lœuillet
06d13ddfbc Indentation and renamed fixtures file 2016-09-25 12:28:55 +02:00
Nicolas Lœuillet
efe659ab84 Add Chrome path for Mac OS 2016-09-25 12:28:55 +02:00
Thomas Citharel
ae669126e7 Import Firefox & Chrome bookmarks into wallabag 2016-09-25 12:28:54 +02:00
Jeremy Benoist
289875836a Fix tag count for PostgreSQL 2016-09-25 12:23:44 +02:00
Jeremy Benoist
82fc3290d4 CS 2016-09-25 12:03:49 +02:00
Jeremy Benoist
401135852c Use scheduled entity insertions to avoid tag duplicate
Using `getScheduledEntityInsertions()` we can retrieve not yet flushed but already persisted entities and then avoid tags duplication on import.
2016-09-25 12:03:49 +02:00
Jeremy Benoist
faa86e06ba Fix tags count in menu
Move enable cache for Tag in the Entity because function `find*` should return result and not a Query
2016-09-25 12:03:49 +02:00
Thomas Citharel
9d7dd6b0d2 Merge pull request #2306 from wallabag/redis-rabbit-check
Some checks about Redis & RabbitMQ
2016-09-25 11:36:59 +02:00
Jeremy Benoist
0e0102b6fc Avoid failing test for user who didn’t install Redis 2016-09-24 19:57:59 +02:00
Jeremy Benoist
13a522dfbd Display a message when async import won’t work
Mostly if Redis or RabbitMQ isn’t installed / launched.
I guess it’ll avoid some issues.
2016-09-24 19:56:15 +02:00
Jeremy Benoist
e10f3b1e91 Disable deprecation that fail test 2016-09-24 19:55:23 +02:00
Jeremy Benoist
637aa17e6b Merge pull request #2301 from wallabag/fix-rss-feeds
fix feeds not syncing on android app
2016-09-22 07:51:05 +02:00
Thomas Citharel
389d55f86b fix feeds not syncing on android app 2016-09-21 19:51:19 +02:00
Nicolas Lœuillet
32e95760f5 Merge pull request #2239 from wallabag/documentation-2.1
Update documentation with new features for 2.1
2016-09-20 14:29:16 +02:00
Thomas Citharel
5074e7d4fa Merge pull request #2299 from mruminski/2.1
polish version
2016-09-20 08:33:27 +02:00
Mateusz Rumiński
b6fc1f2007 Update CraueConfigBundle.pl.yml
fix misspell
2016-09-19 23:16:37 +02:00
Mateusz Rumiński
1223c0811d Update CraueConfigBundle.pl.yml
add missing translation
2016-09-19 23:02:50 +02:00
Mateusz Rumiński
a94108f574 Update messages.pl.yml
add missing translation
2016-09-19 22:53:02 +02:00
Mateusz Rumiński
267b9d62dc Update wallabag_user.pl.yml
add missing "
2016-09-19 22:37:03 +02:00
Mateusz Rumiński
a00bed8b59 polish version
create wallabag_user.pl.yml file
2016-09-19 20:42:55 +02:00
Nicolas Lœuillet
e406a94ab6 Fixed version in documentation 2016-09-19 15:23:04 +02:00
Nicolas Lœuillet
ce0a32229a Fix wallabag version in documentation 2016-09-19 15:22:05 +02:00
Nicolas Lœuillet
8fed8d1bac Add documentation about article sharing 2016-09-19 15:20:46 +02:00
Jeremy Benoist
05d2d62f12 Update generated files from Symfony 2016-09-19 11:35:35 +02:00
Jeremy Benoist
d7b4b2c72c Merge remote-tracking branch 'origin/master' into 2.1 2016-09-19 11:23:07 +02:00
Jeremy Benoist
f9feca5c64 Merge pull request #2297 from morhelluin/epub-export-special-chars
Fix issue #2296: epub export with special chars in the title.
2016-09-19 11:18:17 +02:00
Jeremy Benoist
da18a4682f Merge pull request #1941 from wallabag/v2-asynchronous-jobs
Use asynchronous jobs for imports
2016-09-19 07:15:40 +02:00
Étienne Gilli
45d94a98f7 Fix issue #2296: epub export with + in the title. 2016-09-18 14:43:54 +02:00
Jeremy Benoist
59b97fae99 Avoid losing entry when fetching fail
Instead of just say “Failed to save entry” we’ll save the entry at all cost and try to fetch content. If fetching content failed, the entry will still be saved at least, but without content.
2016-09-17 07:40:56 +02:00
Jeremy Benoist
fbb319f064 Missing some migrations
and CS
2016-09-16 22:58:33 +02:00
Jeremy Benoist
ebe0787e09 Moved Pocket token to user config 2016-09-16 22:22:25 +02:00
Jeremy Benoist
4fc998245c Only display message in queue for admin
Instead of for EVERYONE
2016-09-16 20:08:07 +02:00
Nicolas Lœuillet
0ed8ce55b5 Merge pull request #2292 from wallabag/fix-markasread-label
Fixed label for mark as read link in entry view
2016-09-16 08:50:07 +02:00
Nicolas Lœuillet
458beef0a9 Fixed label for mark as read link in entry view
Fix #2286
2016-09-15 15:32:01 +02:00
Jeremy Benoist
760419cd43 Merge pull request #2291 from wallabag/add-links-doc-homepage
Add links to translations in documentation homepage
2016-09-15 15:20:37 +02:00
Nicolas Lœuillet
78d5da87fa Add links to translations in documentation homepage 2016-09-15 14:58:14 +02:00
Jeremy Benoist
c6b68dc1df Merge pull request #2287 from wallabag/remove-footer
Remove footer part
2016-09-15 14:21:21 +02:00
Nicolas Lœuillet
e77cde4531 Remove FooterController 2016-09-15 11:11:24 +02:00
Jeremy Benoist
5b382b9ffb Merge pull request #2290 from wallabag/Quent-in-patch-1
Update messages.oc.yml
2016-09-15 09:27:08 +02:00
Quent-in
15b1917142 Update messages.oc.yml
L44 : vosautres, general form
vosaltres : local and catalan form
vosaultres : doesnt exist ^^
2016-09-14 17:54:09 +02:00
Jeremy Benoist
ac87e0db2a AMPQ -> AMQP 2016-09-14 10:18:02 +02:00
Jeremy Benoist
a622fbc444 Fix typo 2016-09-14 09:10:13 +02:00
Jeremy Benoist
d4e366f6eb Add missing translations 2016-09-13 22:38:05 +02:00
Jeremy Benoist
47d7c682a4 Add more “real” tests 2016-09-13 22:27:27 +02:00
Jeremy Benoist
c80cc01afa Change flash message for queued articles 2016-09-13 21:09:05 +02:00
Jeremy Benoist
e01a3c98d6 Display how many messages are queue
- update the docker-composer to add Redis
- add migrations
2016-09-13 20:32:52 +02:00
Nicolas Lœuillet
d49c88f15a Remove footer part 2016-09-13 20:31:06 +02:00
Jeremy Benoist
5d002e9bdf Update import.worker.enabled translation 2016-09-12 09:07:53 +02:00
Jeremy Benoist
886d479734 Fix tests 2016-09-11 23:57:27 +02:00
Jeremy Benoist
ebf5e5087d Add tests on ImportCommand 2016-09-11 22:15:31 +02:00
Jeremy Benoist
03e078d060 Update docs about worker 2016-09-11 22:15:31 +02:00
Jeremy Benoist
015c7a8359 Add more tests
And ability to define how many messages can be hanle by the redis worker before stopping (usefull for tests)
2016-09-11 22:15:31 +02:00
Jeremy Benoist
7d862f83b9 Re-facto EntryConsumer
Using an abstract method allow to share code but also can be used it we add a new broker in the future
2016-09-11 22:15:31 +02:00
Jeremy Benoist
dc69e25f97 Display a message when async is enabled 2016-09-11 22:15:28 +02:00
Jeremy Benoist
7230e4c39f Enable Redis on Travis
Add generated files from `composer up`
Add more articles for Readability tests
2016-09-11 21:58:57 +02:00
Jeremy Benoist
b3437d58ae Enable Redis async import
- using javibravo/simpleue
- internal config value are now `import_with_redis` & `import_with_rabbit` which are more clear
- if both option are enable rabbit will be choosen
- services imports related to async are now splitted into 2 files: `redis.yml` & `rabbit.yml`
-
2016-09-11 21:58:56 +02:00
Jeremy Benoist
7f7531171f Retrieve created date from Pocket 2016-09-11 21:58:56 +02:00
Jeremy Benoist
13470c3596 Add test for RabbitMQ
Also update Symfony deps
2016-09-11 21:58:56 +02:00
Jeremy Benoist
8664069e1a Fix DateTime & clear() 2016-09-11 21:58:55 +02:00
Jeremy Benoist
6d65c0a8b0 Add ability to define created_at for all import
At the moment only Readability & wallabag v2 import allow created_at import.
Pocket removed `time_added` field from their API v2 to v3...
And wallabag v1 doesn't export that value.
2016-09-11 21:58:55 +02:00
Jeremy Benoist
3aca0a9f00 CS 2016-09-11 21:58:55 +02:00
Jeremy Benoist
3849a9f323 Some cleanup & refactor 2016-09-11 21:58:55 +02:00
Jeremy Benoist
02f6489572 Retrieve all items from Pocket
5000 by 5000.
Also, retrieve newest item first.
2016-09-11 21:58:31 +02:00
Jeremy Benoist
c98db1b653 Convert other imports to Rabbit 2016-09-11 21:58:31 +02:00
Jeremy Benoist
ef75e1220e Send every imported item to the queue
Instead of queing real Entry to process, we queue all the item to import from Pocket in a raw format.
Then, the worker retrieve that information, find / create the entry and save it.
2016-09-11 21:57:46 +02:00
Nicolas Lœuillet
87c9995b6c Update docker-composer with RabbitMQ configuration 2016-09-11 21:57:09 +02:00
Nicolas Lœuillet
40d2a29443 Replace RabbitMQ injection with CraueConfiguration 2016-09-11 21:57:09 +02:00
Nicolas Lœuillet
e31ee20dd7 Add RabbitMQ service for Travis CI 2016-09-11 21:57:09 +02:00
Nicolas Lœuillet
56c778b415 1st draft for rabbitMQ 2016-09-11 21:57:09 +02:00
Nicolas Lœuillet
59758d8fe5 Merge pull request #2279 from wallabag/cleanup-travis
Check if asset is enable instead of opposite
2016-09-11 18:48:36 +02:00
Jeremy Benoist
88e88016b9 Clearing entities in the loop fail on Postgres
It looks like when you clear entities on Postgres some references are lost and tags are not saved :-/
2016-09-11 16:30:01 +02:00
Jeremy Benoist
58fadbc9df Fix error on EntityManager clear
Introduced in the recent 2.5.5 release.
Also updated deps.
2016-09-11 15:53:16 +02:00
Jeremy Benoist
04d5c60216 Update install.sh
Since $ASSETS can be empty now and only be “build”.
2016-09-11 12:52:42 +02:00
Jeremy Benoist
40c47f7023 Check if asset is enable instead of opposite
Instead of defining ASSETS all the time, just define it when we want to
use it
Might give us more clearer build
2016-09-09 21:30:14 +02:00
Nicolas Lœuillet
c078d18372 Merge pull request #2275 from wallabag/export-dates
Export dates from entries
2016-09-08 18:33:09 +02:00
Jeremy Benoist
9401696fe4 Export dates from entries 2016-09-08 16:49:21 +02:00
Nicolas Lœuillet
5fc79381bb Merge pull request #2274 from wallabag/json-response-created-at
Re-use JsonResponse
2016-09-08 12:28:46 +02:00
Jeremy Benoist
60faee002c Re-user JsonResponse
Since Symfony 3.1 we can define the json of a JsonResonse using `->setJson()`
2016-09-08 12:03:38 +02:00
Nicolas Lœuillet
a707643ef1 Update md5 checksum for 2.0.8 in documentation 2016-09-07 15:40:15 +02:00
Nicolas Lœuillet
48a692c143 Merge pull request #2271 from wallabag/prepare-208
Prepare wallabag 2.0.8
2016-09-07 14:53:29 +02:00
Nicolas Lœuillet
5bdec0195f Prepare wallabag 2.0.8 2016-09-07 14:27:32 +02:00
Nicolas Lœuillet
94d1dae4ef Update install documentation 2016-09-06 13:43:53 +02:00
Jeremy Benoist
6f23289e72 Merge pull request #2266 from wallabag/add-tags-counter
Added tags counter in sidebar (material theme)
2016-09-05 22:20:27 +02:00
Jeremy Benoist
e5b090960b Merge pull request #2267 from wallabag/Quent-in-patch-1
Occitan  updated
2016-09-05 19:49:23 +02:00
Quent-in
fee8f2312e Occitan updated
Line 347, I'm not sure about what I wrote to avoid and end of string started with "
I had to use the simple ' in the sentence.
Let me know if it was okay like so.
2016-09-05 18:55:53 +02:00
Nicolas Lœuillet
5173fd1c3d Returned 0 instead of returning empty array for Twig Extension 2016-09-05 14:17:44 +02:00
Nicolas Lœuillet
a1d22ea7d0 Remove useless variable 2016-09-05 10:23:40 +02:00
Nicolas Lœuillet
13d9f7c96c Switched enableCache visibility to private 2016-09-04 21:06:52 +02:00
Nicolas Lœuillet
429d86f388 Added tags counter in sidebar (material theme) 2016-09-04 20:53:28 +02:00
Jeremy Benoist
c3b53188d7 Merge pull request #2263 from wallabag/speed-up-count
Instead of selecting the whole data, just count it
2016-09-04 20:07:45 +02:00
Jeremy Benoist
234ad94453 CS 2016-09-03 19:26:23 +02:00
Jeremy Benoist
59ddb9ae99 Remove Twig globals
Twig Global function are called globally. This means even on a query to the api.

Using a function we can decide when we want to call it.

Also, remove previous `COUNT(e.id)` since it doesn't work on PostgreSQL ...
2016-09-03 19:09:28 +02:00
Jeremy Benoist
543da3e0b7 Instead of selecting the whole data, just count it
Instead of performing a complex select (to retrieve all data for entry, etc...) just select the counter and retrieve it.

Down from ~50ms to ~30ms on the unread page (with 500 items)
2016-09-03 18:11:07 +02:00
Jeremy Benoist
8f8654913c Merge pull request #2002 from wallabag/feature-display-itemsNumber
Feature display items number
2016-09-03 16:13:08 +02:00
Nicolas Lœuillet
b3f4a11a81 Store cache lifetime in config 2016-09-03 14:02:50 +02:00
Nicolas Lœuillet
2b9c5097d4 Merge pull request #2262 from wallabag/install-check-db-connection
Add a check for the database connection
2016-09-03 13:34:13 +02:00
Jeremy Benoist
5070644a12 CS 2016-09-03 11:45:59 +02:00
Jeremy Benoist
f62c3faf88 Update test
If the database isn't found when checking for the connection it means, we can connect to the server.
The InstallCommand will create the database later.

Also, when checking for the SQLite connection, Doctrine creates the file (so the database). That's why the test is skipped for SQLite.
2016-09-03 10:34:27 +02:00
Jeremy Benoist
001a7bad66 Add a check for the database connection
Checking for the driver isn't enough.
We are now checking if we can etablish a connection to the database before trying to do anything.
By displaying the error from the Exception (in case of error) we hope to reduce issues overload about people getting error with the database
2016-09-03 09:24:34 +02:00
Nicolas Lœuillet
9972ab467a Merge pull request #2260 from wallabag/fix-config-fontsize
Fixed different font-size for labels in config screen
2016-09-02 11:17:47 +02:00
Nicolas Lœuillet
b1e0a586e8 Fixed different font-size for labels in config screen
Fix #1788
2016-09-02 10:53:22 +02:00
Nicolas Lœuillet
336262e6ee Merge pull request #2252 from wallabag/fix-last-merge
Fixed last merge who caused CSS/JS bugs
2016-09-02 10:27:41 +02:00
Jeremy Benoist
a8d5aa1c44 Add tinydot to material concat 2016-09-02 10:21:10 +02:00
Jeremy Benoist
33adf8dc91 Merge pull request #2242 from wallabag/fix-minor-css
Fix print / article views
2016-09-01 22:23:45 +02:00
Nicolas Lœuillet
8bde9d0efe Merge pull request #2258 from mruminski/2.1
Update messages.pl.yml
2016-09-01 20:26:23 +02:00
Nicolas Lœuillet
0b0233b1ec Enable cache for queries 2016-09-01 20:20:12 +02:00
Mateusz Rumiński
3a6c252104 Update messages.pl.yml
add missing polish translations
2016-09-01 19:42:26 +02:00
Nicolas Lœuillet
be20e6f009 CSS indentation 2016-09-01 19:18:39 +02:00
Jeremy Benoist
bd8c13e8b0 Merge pull request #2255 from wallabag/readability
Add Readability import
2016-09-01 14:18:48 +02:00
Nicolas Lœuillet
dc9d76b490 Added documentation for Readability migration 2016-09-01 13:40:00 +02:00
Jeremy Benoist
209ec7cedd Add Readability to Quickstart page 2016-09-01 13:39:55 +02:00
Jeremy Benoist
a1a1077059 Add tests on ReadabilityImport 2016-09-01 13:39:41 +02:00
Jeremy Benoist
ca2a43ae7d Add missing translations 2016-09-01 13:39:37 +02:00
Jeremy Benoist
ca15aaac18 Fix import count tests 2016-09-01 09:36:11 +02:00
Jeremy Benoist
03e3753f6b Add Readability import
Based on the JSON export instead of the API (which will be shutting down by the September 30, 2016)
2016-09-01 08:00:30 +02:00
Nicolas Lœuillet
a374ac0fd3 Fixed last merge who caused CSS/JS bugs 2016-08-30 13:52:28 +02:00
Jeremy Benoist
cdd3010b47 Merge remote-tracking branch 'origin/master' into 2.1 2016-08-28 16:15:27 +02:00
Jeremy Benoist
13d44ca766 Merge pull request #2243 from wallabag/feature-untagged-entries
Add untagged entries
2016-08-28 15:56:16 +02:00
Jeremy Benoist
0184e09a66 Add missing translations 2016-08-28 15:37:22 +02:00
Nicolas Lœuillet
d5d1612153 Add tests for untagged entries 2016-08-28 14:44:00 +02:00
Nicolas Lœuillet
b6520f0b15 Add untagged entries
Fix #1631
2016-08-28 14:44:00 +02:00
Jeremy Benoist
8635ab1cd1 Merge pull request #2245 from wallabag/change-page-title
Changed where page title is displayed
2016-08-28 14:33:46 +02:00
Quent-in
985f5f9d05 Occitan version
Occitan translation, I hope I properly put it where it has to be.
If there reminds other textes to translate, please let me know!
2016-08-27 12:24:18 +02:00
Nicolas Lœuillet
74d68fbf25 Changed where page title is displayed 2016-08-26 21:26:21 +02:00
Nicolas Lœuillet
add0e14cff Fixed print view for baggy theme 2016-08-26 21:20:02 +02:00
Nicolas Lœuillet
52ef497099 Fix print / article views 2016-08-26 14:35:43 +02:00
Jeremy Benoist
c4da9d1cd8 Merge pull request #2240 from wallabag/add-icon-public-share
Add icon for public share link
2016-08-26 12:14:36 +02:00
Jeremy Benoist
f7de67e26f Merge pull request #2241 from modos189/v2-issue-1991
Fix issue #1991: correction of the height field to add articles
2016-08-26 07:26:42 +02:00
Alexandr Danilov
ceebf13fe8 Fix issue #1991: correction of the height field to add articles 2016-08-26 01:13:35 +03:00
Nicolas Lœuillet
8e06720ff3 Add icon for public share link 2016-08-25 16:19:21 +02:00
Thomas Citharel
bf0d9ef534 Merge pull request #2238 from modos189/v2-improve-view
V2 improve view
2016-08-25 15:55:30 +02:00
Nicolas Lœuillet
aad350a5a2 Merge pull request #2237 from wallabag/add-original-url-public-entry
Add original link in public view of the article
2016-08-25 15:39:15 +02:00
Nicolas Lœuillet
0a512eaf57 Remove text about original URL in public view 2016-08-25 15:32:38 +02:00
Alexandr Danilov
538587855a A new version of the plugin tinydot with update on window resize 2016-08-25 16:22:47 +03:00
Alexandr Danilov
5aba43d92c Changes in the login form:
* The alignment of the login form centered in WebKit
* Indent after the reference password recovery
2016-08-25 16:09:55 +03:00
Nicolas Lœuillet
9415bc992e Add original link in public view of the article 2016-08-25 14:39:33 +02:00
Jeremy Benoist
60e7220406 Merge pull request #1904 from wallabag/feature-public-mode
Share entry with a public URL
2016-08-25 09:30:51 +02:00
Jeremy Benoist
eddda878a0 Update test
and some cleanup
2016-08-24 22:29:36 +02:00
Jeremy Benoist
b1afef30dc Handle share_entry
- share_entry needs to be in the migration too
- and it needs a translation
2016-08-24 21:56:02 +02:00
Jeremy Benoist
ad9304cd7e Handle table prefix in migration
and fix migration for name field in oauth table
2016-08-24 21:38:26 +02:00
Jeremy Benoist
c6d77eaf51 Merge pull request #2236 from wallabag/allow-failure-php-7.1
Allow failure for PHP 7.1
2016-08-24 11:39:17 +02:00
Jeremy Benoist
a1ab7d1d32 Merge pull request #2186 from wallabag/addRegistration
Add option to disable registration
2016-08-24 11:13:00 +02:00
Jeremy Benoist
ddb49dd931 Allow failure for PHP 7.1
Got tired of `EE/home/travis/build.sh: line 45:  4445 Segmentation fault      (core dumped) phpunit -v` using PHP 7.1.0beta3
2016-08-24 10:49:43 +02:00
Nicolas Lœuillet
8541b3c4fd Add simple test 2016-08-24 10:28:43 +02:00
Nicolas Lœuillet
a5684f6a23 Merge pull request #2234 from cstuder/patch-1
Fixes mailto link in documentation
2016-08-24 09:11:14 +02:00
Nicolas Lœuillet
cc654b427f Merge pull request #2235 from wallabag/german-doc-config
Add configuration for german documentation
2016-08-24 09:10:55 +02:00
Nicolas Lœuillet
78b3c31d70 Change annotation for uuid field 2016-08-24 09:07:49 +02:00
Nicolas Lœuillet
18545173a6 Add configuration for german documentation 2016-08-24 08:53:20 +02:00
Christian Studer
cdf405ad8f Fixes mailto link in german translation 2016-08-24 08:43:38 +02:00
Christian Studer
cdfeea0a96 Fixes mailto link in french translation 2016-08-24 08:43:17 +02:00
Christian Studer
cf967401b0 Fixes mailto link 2016-08-24 08:22:35 +02:00
Nicolas Lœuillet
2f9927404d Merge pull request #2230 from modos189/issue_2055
Cut entries title in card view: continued
2016-08-23 17:24:46 +02:00
Nicolas Lœuillet
3e860ff1ce Change links on baggy theme 2016-08-23 16:55:49 +02:00
Nicolas Lœuillet
f1be7af446 Change share entry behavior 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet
3377c938f8 Add translations 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet
9a5231e8c4 Improve migration 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet
a7e2218e25 Add test and fix migration 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet
222e09f140 Add Cache on Share Action 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet
d0545b6bd6 Add migration 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet
f3d0cb9106 Share entry with a public URL 2016-08-23 16:49:21 +02:00
Alexandr Danilov
28388e15c3 Replacement plugin dotdotdot (6.7 KB) on my tinydot (315 bytes) 2016-08-23 12:58:35 +03:00
Nicolas Lœuillet
1bee9e0760 Merge pull request #2218 from wallabag/api-delete-tags-1982
Delete tag or tags by label
2016-08-23 11:51:13 +02:00
Nicolas Lœuillet
f997ae6afb Implement Twig_Extension_GlobalsInterface to remove deprecation 2016-08-23 07:47:55 +02:00
Nicolas Lœuillet
8315130a75 Display entries number for each category 2016-08-23 07:47:55 +02:00
Jeremy Benoist
ee4442f42a CS 2016-08-23 07:40:36 +02:00
Thomas Citharel
7149aa5781 Proper parameter name, simplify logic & phpdoc 2016-08-23 07:40:36 +02:00
Thomas Citharel
de3d716ae4 Add option to disable registration 2016-08-23 07:40:36 +02:00
Jeremy Benoist
97e7ad4dc7 Remove duplicate pager on baggy 2016-08-23 07:36:43 +02:00
Jeremy Benoist
a0e1eafc35 Add some tests
Also, retrieve tag from the request instead of the query (which will be the same but it's more easy to test).

Moved down `deleteTagAction` because it conflicted with the new action:

  api_delete_tag => /api/tags/{tag}.{_format}
  api_delete_tags_label => /api/tags/label.{_format}

And finally, throw exception when a tag is not found before removing it.
2016-08-23 07:26:58 +02:00
Thomas Citharel
9bf83f1fb8 CS 2016-08-23 07:26:58 +02:00
Thomas Citharel
4da01f492b Delete tag or tags by label
Tests not included
2016-08-23 07:26:58 +02:00
Jeremy Benoist
e71cef0bb8 Fix typos in field name 2016-08-23 07:26:58 +02:00
Thomas Citharel
119914e65d added name on client 2016-08-23 07:26:58 +02:00
Nicolas Lœuillet
267e8d6361 Add tests for tag list routes 2016-08-23 07:26:18 +02:00
Nicolas Lœuillet
371bcca0f6 Translations and baggy view for tags 2016-08-23 07:26:18 +02:00
Nicolas Lœuillet
891456ba9a Links on each tag in Tags view 2016-08-23 07:24:42 +02:00
Jeremy Benoist
d5de909bbc Update SymfonyRequirements 2016-08-23 07:24:00 +02:00
Jeremy Benoist
79efca1e6f Merge remote-tracking branch 'origin/master' into 2.1 2016-08-22 23:03:16 +02:00
Alexandr Danilov
474b086656 Simplify the initialization of the plugin dotdotdot 2016-08-22 23:59:20 +03:00
Alexandr Danilov
e32aea53ab Added the jquery library dotdotdot ( http://dotdotdot.frebsite.nl/ ) that allows you to clip a text on the second line and fixed cut entries title in card view 2016-08-22 23:34:44 +03:00
Thomas Citharel
9c545fe028 Added name on client
- Fix typos in field name
- Added migration for name field in API client table

Manually cherry-picked from PR
https://github.com/wallabag/wallabag/pull/2171
2016-08-22 20:18:27 +02:00
Jeremy Benoist
db4d63fc1a Upgrade PHPUnit to version 5
- Fix deprecated getMock
- Use PHPUnit 4 for PHP 5.5 build

Manually cherry-picked from PR
https://github.com/wallabag/wallabag/pull/2201
2016-08-22 20:16:50 +02:00
Nicolas Lœuillet
80bb0b7344 Merge pull request #2226 from wallabag/prepare-207
Prepare wallabag 2.0.7
2016-08-22 10:40:24 +02:00
Nicolas Lœuillet
5068544e10 Prepare wallabag 2.0.7 2016-08-22 10:08:21 +02:00
Nicolas Lœuillet
c649d43381 Merge pull request #2222 from wallabag/add-date-on-article-view
Added creation date and reading time on article view
2016-08-22 09:40:21 +02:00
Jeremy Benoist
d35ba2c3d6 Display text on baggy
Instead of using icons (which aren't available) display real text for reading time & creation date
2016-08-21 22:22:34 +02:00
Jeremy Benoist
4e4e8e9899 Merge pull request #2221 from wallabag/replace-favorite-star
Replaced favorite word/icon with star one
2016-08-21 22:11:20 +02:00
Thomas Citharel
8642f14220 Merge pull request #2224 from wallabag/avoid-exception-import
Avoid breaking import when fetching fail
2016-08-20 14:31:32 +02:00
Jeremy Benoist
19d9efab32 Avoid breaking import when fetching fail
graby will throw an Exception in some case (like a bad url, a restricted url or a secured pdf).

Import doesn't handle that case and break the whole import.
With that commit the import isn't stopped but the entry is just skipped.

Also, as a  bonus, I've added extra test on WallabagImportV2 when the json is empty.
2016-08-20 01:17:26 +02:00
Nicolas Lœuillet
e7732deb1f Changed code indentation 2016-08-18 15:37:44 +02:00
Nicolas Lœuillet
eecd7e406d Fixed some translations 2016-08-18 15:30:28 +02:00
Nicolas Lœuillet
4e1be104ab Added creation date and reading time on article view
Fix #2034
2016-08-18 15:23:19 +02:00
Nicolas Lœuillet
519ba0b5e7 Replaced favorite word/icon with star one
Fix #2041
2016-08-18 14:27:17 +02:00
Jeremy Benoist
e408d7e895 Merge pull request #2220 from Rurik19/master
Enable PATCH method for CORS in API part
2016-08-18 11:56:02 +02:00
Rurik19
41c9eecfa7 Enable PATCH method for CORS in API part 2016-08-18 14:30:32 +05:00
Jeremy Benoist
b762ab3cce Merge pull request #2134 from wallabag/hhvm
Run tests on an uptodate HHVM
2016-08-17 18:00:17 +02:00
Jeremy Benoist
fc41abb990 Run tests on an uptodate HHVM
Using some tricks from symfony/symfony
2016-08-17 16:41:36 +02:00
Jeremy Benoist
782390a80e Merge pull request #2095 from wallabag/fix-2auth-form
Fix form user display when 2FA is disabled
2016-08-17 15:17:07 +02:00
Jeremy Benoist
0cecfa2536 CS 2016-08-17 14:36:20 +02:00
Jeremy Benoist
6dfac457d8 Fix tests
Ensure tests after the InstallCommand test will have a clean database.
Previous attempt failed because of a foreign key

Also, nightly on Travis seems to target PHP 7.2-dev, so I put 7.1 in requirement and moved nightly in allowed failures.
And it seems xdebug isn't shipped with PHP 7.1, so I added a workaround to avoid build to fail when trying to remove xdebug.ini file.
2016-08-17 14:34:39 +02:00
Jeremy Benoist
9a5c5c330e Disable autobranch & commit 2016-08-17 12:31:16 +02:00
Jeremy Benoist
7dbedfc8a3 Enable Zappr 2016-08-17 12:29:47 +02:00
Nicolas Lœuillet
e49c62fac8 Fix form user display for baggy theme 2016-08-17 11:41:46 +02:00
Nicolas Lœuillet
8f5e220327 Fix form user display when 2FA is disabled 2016-08-17 11:41:46 +02:00
Nicolas Lœuillet
2e16a90339 Merge pull request #2216 from Rurik19/master
Enable CORS headers for OAUTH part
2016-08-16 14:22:43 +02:00
Rurik19
848c2e1b97 Enable CORS headers for OAUTH part 2016-08-12 13:01:53 +05:00
Nicolas Lœuillet
00acc0d006 Changed URL for scrutinizer in README 2016-08-11 20:57:06 +02:00
Nicolas Lœuillet
8617972f3f Merge pull request #2212 from wallabag/prepare-206
Prepare release 2.0.6
2016-08-10 15:03:43 +02:00
Nicolas Lœuillet
a26f91dcb6 Prepare release 2.0.6 2016-08-10 14:26:13 +02:00
Jeremy Benoist
b10a422e1f Merge pull request #2202 from wallabag/fix-phpdoc
add some missing phpdoc parameters
2016-07-24 11:49:21 +02:00
Thomas Citharel
8cb869ea95 add some missing phpdoc parameters 2016-07-24 11:47:03 +02:00
Thomas Citharel
029965b6a2 Merge pull request #2200 from charno6/patch-1
Fixed typo in entry:notice:entry_saved
2016-07-23 22:58:26 +02:00
charno6
75ac3e6289 Fixed typo in entry:notice:entry_saved
"Eintag" to "Eintrag"
2016-07-23 22:40:23 +02:00
Jeremy Benoist
8c7d7c0300 Merge pull request #2199 from Simounet/facto/social-links
Handling socials links into a config file
2016-07-21 16:17:53 +02:00
Simounet
57c608fa94 php-cs-fixer pass 2016-07-20 23:08:04 +02:00
Simounet
40288b7166 Chrome extension URL updated 2016-07-20 22:55:43 +02:00
Thomas Citharel
78d1727096 Merge pull request #2198 from Simounet/fix/image-inside-figure
FIX image inside a figure element max-width
2016-07-20 20:44:47 +02:00
Simounet
0e1abf392c FIX image inside a figure element max-width (baggy theme) 2016-07-20 20:23:55 +02:00
Simounet
f64472e9f8 FIX image inside a figure element max-width 2016-07-20 19:39:24 +02:00
Simounet
39f27d6370 Handling socials links into a config file 2016-07-20 19:36:01 +02:00
Jeremy Benoist
0faeabefa7 Merge remote-tracking branch 'origin/master' into 2.1 2016-07-20 12:02:02 +02:00
Nicolas Lœuillet
317fc6e684 Merge pull request #2195 from wallabag/remove-bin
Remove binary from repo
2016-07-20 11:38:55 +02:00
Jeremy Benoist
8d8d48a2bb Remove binary from repo
Since Composer 1.2, binaries are re-installed from vendors if there aren't found.
This avoid us to commit binaries vendors into the repo.

⚠️ You have to update your Composer to the 1.2 (`composer selfupdate`)
2016-07-20 10:51:37 +02:00
Nicolas Lœuillet
0dc09439ef Merge pull request #2048 from wallabag/travis-php-7.1
Run PHP 7.1 on Travis
2016-07-19 11:24:26 +02:00
Jeremy Benoist
ab3eb4ba95 Merge pull request #2194 from benages/patch-2
Fixed spelling Artúclos --> Artículos
2016-07-18 22:56:02 +02:00
benages
57b62cbf79 Fixed spelling Artúclos --> Artículos 2016-07-18 21:53:53 +02:00
Jeremy Benoist
1973897305 Run PHP 7.1 on Travis
- Using nightly (as of now it's PHP 7.1 alpha)
- Force guzzle to be at least 5.3.1 (which fix some bugs in PHP 7)
2016-07-18 18:07:25 +02:00
Jeremy Benoist
2bb138ef6d Merge pull request #2183 from wallabag/tags-entries-view-baggy
Bring tags on entries view to baggy
2016-07-18 15:17:33 +02:00
Thomas Citharel
51cbc2ebfe Merge pull request #2185 from wallabag/fix-3rd-party-links
Fix 3rd-Party Apps links (Chrome & Firefox)
2016-07-02 12:33:33 +02:00
Thomas Citharel
8d4152f70d Remove fr part 2016-07-02 11:56:14 +02:00
Thomas Citharel
baef8ea26c Fix 3rd-Party Apps links (Chrome & Firefox) 2016-07-02 11:50:32 +02:00
Thomas Citharel
1d4d9aaf29 Bring tags on entries view to baggy
Also, a couple of UI improvement and CSS fixing
2016-07-01 13:59:30 +02:00
Nicolas Lœuillet
9dbd3e9302 Merge pull request #2174 from wallabag/api-filter-tags
Add filter for tags on API
2016-07-01 10:35:45 +02:00
Thomas Citharel
4f0558a0d4 fix merge issue 2016-06-29 20:52:37 +02:00
Thomas Citharel
28803f106b Add filter for tags on API 2016-06-29 09:55:57 +02:00
Nicolas Lœuillet
a314b920bf Merge pull request #2176 from wallabag/add-since-parameter
Add since parameter
2016-06-29 09:34:39 +02:00
Thomas Citharel
e43c78abd9 CS 2016-06-25 23:19:21 +02:00
Thomas Citharel
e5fb89e5d3 Add since parameter 2016-06-25 21:05:50 +02:00
Nicolas Lœuillet
33e2aec18b Merge pull request #2170 from wallabag/addTagsOnEntriesView
Add tags on entries view and minor ui fixes
2016-06-24 14:23:38 +02:00
Nicolas Lœuillet
9f8c43e222 Merge pull request #2172 from wallabag/more-tests
Change the way to login user in tests
2016-06-24 14:22:47 +02:00
Thomas Citharel
eef833d644 uniformize tags on article view too 2016-06-24 12:07:45 +02:00
Jeremy Benoist
fdc90ceb17 Change the way to login user in tests
Instead of using a HTTP request we just login user like FOSUser does.
It allows us to mock service in container for functional tests.

Also, fix a bad config name in fos_user for firewall

And finally, add functional test to PocketImport
2016-06-24 11:55:47 +02:00
Thomas Citharel
e7aed21b33 add line to other languages 2016-06-24 11:45:42 +02:00
Jeremy Benoist
2bc9cad78e Remove useless spaces 2016-06-24 11:28:07 +02:00
Jeremy Benoist
b1c9b78203 Merge pull request #2169 from wallabag/fix-fonts
fix font paths
2016-06-24 09:20:52 +02:00
Thomas Citharel
a15022db96 minor ui fixes 2016-06-23 23:13:25 +02:00
Thomas Citharel
91826e3ca2 fix typo on icons 2016-06-23 22:51:09 +02:00
Thomas Citharel
25dc07d3c9 Add tags on entries view
Should be tested on old browsers
2016-06-23 22:50:39 +02:00
Thomas Citharel
dafc5cf993 fix font paths 2016-06-23 22:10:12 +02:00
Nicolas Lœuillet
20218495a7 Merge pull request #2168 from wallabag/fix-npm-dep-old-nodejs
Add modules when NodeJS versions are too low.
2016-06-23 15:09:57 +02:00
Thomas Citharel
9ccb96cfe2 Add modules when NodeJS versions are too low.
And eventually one required anyway.
2016-06-23 14:34:59 +02:00
Jeremy Benoist
f49d9ca383 Merge branch 'master' into 2.1 2016-06-23 11:47:46 +02:00
Jeremy Benoist
fb5c17a9ab Merge pull request #2157 from wallabag/lower-upper-readingtime
Handle only upper or only lower reading filter
2016-06-23 11:38:10 +02:00
Jeremy Benoist
95859e54c5 Add some tests about readingTime 2016-06-23 10:46:47 +02:00
Jeremy Benoist
bf27f99d54 Merge pull request #2165 from wallabag/translation-typos
Fix a few french translations typos
2016-06-23 10:43:06 +02:00
Jeremy Benoist
2c00dddf01 fixup! Handle only upper or only lower reading filter 2016-06-23 09:41:30 +02:00
Jeremy Benoist
1bdbc39f02 Handle only upper or only lower reading filter
When we select only one value in the reading time filter, we need to perform a query with only one value (greater than OR lower than).
2016-06-23 09:41:30 +02:00
Thomas Citharel
b46124cb9b Fix a few french translations typos 2016-06-23 09:38:49 +02:00
Nicolas Lœuillet
49e2854d5c Merge pull request #2142 from wallabag/v2-use-npm
Manage assets through npm
2016-06-23 09:25:01 +02:00
Nicolas Lœuillet
d37bb05c88 Merge pull request #2132 from wallabag/sf3.1
Jump to Symfony 3.1
2016-06-23 09:18:18 +02:00
Jeremy Benoist
4eaaa27bb5 Update symlink to php-cs-fixer 2016-06-23 09:15:50 +02:00
Jeremy Benoist
4e411208cc Try to find bad redirection after delete
Instead of checking for the whole absolute url, we just check with the relative url.
If the referer ends with the relative url of the deleted entry, don't redirect to the referer.
2016-06-23 09:15:50 +02:00
Jeremy Benoist
11493858a7 Use friendsofphp instead of fabpot
The fabpot's one is now depreacted
2016-06-23 09:15:50 +02:00
Sven Fischer
3247b90776 translate documentation to German 2016-06-23 09:15:50 +02:00
Even Allmighty
afbe800be2 Corrected Regex for lighttpd rewrite 2016-06-23 09:15:50 +02:00
Nicolas Lœuillet
eae86d3403 Prepare wallabag 2.0.5 2016-06-23 09:15:50 +02:00
Jeremy Benoist
e42b13bcff Change ManyToMany between entry & tag
Following https://gist.github.com/Ocramius/3121916

Be sure to remove the related entity when removing an entity.

Let say you have Entry -> EntryTag -> Tag.
If you remove the entry:

 - before that commit, the EntryTag will stay (at least using SQLite).
 - with that commit, the related entity is removed
2016-06-23 09:15:50 +02:00
Jeremy Benoist
6334f2cac1 Display a message when saving an entry failed
When saving an entry fail because of database error we previously just returned `false`.
Now we got an error in the log and the displayed notice to the user is updated too.
2016-06-23 09:15:50 +02:00
Jeremy Benoist
f06f840c9d Move fixtures to the right place 2016-06-23 09:15:50 +02:00
Nicolas Lœuillet
af95c09c80 Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121
2016-06-23 09:15:50 +02:00
Daniel Bartram
26ed851f52 Add unread filter test to EntryControllerTest
Add a new test to the EntryControllerTest collection which checks that
only entries which have not been archived (and are treated as "unread")
are retrieved.
2016-06-23 09:15:50 +02:00
Daniel Bartram
710f8e69d7 Add unread filter to entries pages
Add the ability to filter for unread pages in the filters menu.
2016-06-23 09:15:50 +02:00
Jeremy Benoist
99451fe4b7 Fix bad loading fixtures
Since doctrine/data-fixtures 1.2.0 fixtures seems to be badly loaded.
No time for investigate but reverting back to 1.1.* is fixing issues.
2016-06-22 23:15:17 +02:00
Jeremy Benoist
23634d5d84 Jump to Symfony 3.1 2016-06-22 17:59:35 +02:00
Nicolas Lœuillet
891a026e31 Merge pull request #2160 from wallabag/bin-cs-fixer
Update symlink to php-cs-fixer
2016-06-20 12:11:53 +02:00
Jeremy Benoist
2f30eed236 Update symlink to php-cs-fixer 2016-06-20 11:22:30 +02:00
Nicolas Lœuillet
247cf4897a Merge pull request #2155 from wallabag/php-cs-fixer
Use friendsofphp instead of fabpot
2016-06-20 09:35:55 +02:00
Nicolas Lœuillet
3c552f0d04 Merge pull request #2156 from wallabag/delete-redirect
Try to find bad redirection after delete
2016-06-20 09:35:41 +02:00
Jeremy Benoist
ce0e9ec31b Try to find bad redirection after delete
Instead of checking for the whole absolute url, we just check with the relative url.
If the referer ends with the relative url of the deleted entry, don't redirect to the referer.
2016-06-17 22:18:48 +02:00
Jeremy Benoist
d71b600599 Use friendsofphp instead of fabpot
The fabpot's one is now depreacted
2016-06-17 22:03:29 +02:00
Jeremy Benoist
77c530f43c Merge pull request #2148 from wallabag/start-german-docu
translate documentation to German
2016-06-16 06:50:21 +02:00
Sven Fischer
429480357f translate documentation to German 2016-06-16 00:39:48 +02:00
Jeremy Benoist
d220a95121 Merge pull request #2145 from even-allmighty/master
Corrected Regex for lighttpd rewrite
2016-06-13 11:51:37 +02:00
Even Allmighty
02d10905b3 Corrected Regex for lighttpd rewrite 2016-06-13 10:35:05 +02:00
Thomas Citharel
496cfdc017 trailing comma 2016-06-09 20:08:57 +02:00
Thomas Citharel
2e24d12027 remove block added twice 2016-06-09 19:07:41 +02:00
Thomas Citharel
0743287f95 clean & lint stuff 2016-06-09 19:02:38 +02:00
Thomas Citharel
5ecdfcd041 manage assets through npm
first draft

remote assetic totally

work

nearly there

use at least nodejs > 0.12

use proper version of grunt

bump nodejs version for travis

update npm

workaround for materialize

install node 5.0

add grunt-cli

baggy theme & cache node modules

cache bower & npm

make travis build assets on php7 only

exclude installing node & npm if not needed & use bash

clean & try to make icomoon work on baggy

ready

config for travis

rebase

make travis work

more travis work

impove travis & update deps

add missing pixrem deps

add module through oddly lost

ui updates

install latest nodejs

add install_dev.sh, link local binaries for npm/bower/grunt

ui improvements (mostly baggy)

fix travis build

no need to install on travis

Add unread filter to entries pages

Add the ability to filter for unread pages in the filters menu.

Add unread filter test to EntryControllerTest

Add a new test to the EntryControllerTest collection which checks that
only entries which have not been archived (and are treated as "unread")
are retrieved.

Improve English translation

Update FAQ

-Fix grammar
-Add notes about MTA, firewall, and SELinux

Update installation instructions

-Fix grammar
-Add SELinux section

add screenshots of android docu in English

Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121

Move fixtures to the right place

Display a message when saving an entry failed

When saving an entry fail because of database error we previously just returned `false`.
Now we got an error in the log and the displayed notice to the user is updated too.

Change ManyToMany between entry & tag

Following https://gist.github.com/Ocramius/3121916

Be sure to remove the related entity when removing an entity.

Let say you have Entry -> EntryTag -> Tag.
If you remove the entry:

 - before that commit, the EntryTag will stay (at least using SQLite).
 - with that commit, the related entity is removed

Prepare wallabag 2.0.5

enforce older materialize version
2016-06-09 17:12:51 +02:00
Nicolas Lœuillet
235026e2c7 Enhance option in command 2016-05-27 09:43:49 +02:00
Nicolas Lœuillet
3fad6c74fe Add CLI import for wallabag v2 files 2016-05-27 09:43:48 +02:00
Baptiste Mille-Mathias
4b2774f8db Don't cut entries title in card view
Stop cutting titles arbitrary at caracter 42.
2016-05-21 10:39:49 +02:00
789 changed files with 42708 additions and 29522 deletions

5
.babelrc Normal file
View File

@@ -0,0 +1,5 @@
{
"presets": [
["env", {"modules": false}]
]
}

View File

@@ -8,3 +8,10 @@ indent_style = space
indent_size = 4
trim_trailing_whitespace = true
insert_final_newline = true
[*.{js,css}]
indent_style = space
indent_size = 2
[Makefile]
indent_style = tab

14
.eslintrc.json Normal file
View File

@@ -0,0 +1,14 @@
{
"extends": "airbnb-base",
"parser": "babel-eslint",
"env": {
"browser": true,
"es6": true
},
"globals": {
"Routing": true
},
"rules": {
"import/no-extraneous-dependencies": ["error", {"devDependencies": true, "optionalDependencies": true, "peerDependencies": true}]
}
}

View File

@@ -1,7 +1,9 @@
:warning: If your issue is about an error during fetching a link, please read: http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that
### Issue details
Please provide issue details here.
Remember, this is _not_ a place to ask questions. For that, go to http://gitter.im/wallabag/wallabag.
Remember, this is _not_ a place to ask questions. For that, go to https://community.wallabag.org/ (forum) or http://gitter.im/wallabag/wallabag (chat).
### Environment

View File

@@ -1,11 +1,17 @@
| Q | A
| ------------- | ---
| Bug fix? | yes|no
| New feature? | yes|no
| BC breaks? | yes|no
| Deprecations? | yes|no
| Tests pass? | yes|no
| Documentation | yes|no
| Translation | yes|no
| Fixed tickets | comma-separated list of tickets fixed by the PR, if any
| Bug fix? | yes/no
| New feature? | yes/no
| BC breaks? | yes/no
| Deprecations? | yes/no
| Tests pass? | yes/no
| Documentation | yes/no
| Translation | yes/no
| CHANGELOG.md | yes/no
| Fixed tickets | #...
| License | MIT
<!--
- Please fill in this template according to the PR you're about to submit.
- Replace this comment by a description of what your PR is solving.
-->

25
.gitignore vendored
View File

@@ -10,6 +10,10 @@
/var/sessions/*
!var/sessions/.gitkeep
!var/SymfonyRequirements.php
/bin/*
!/bin/console
!/bin/symfony_requirements
.php_cs.cache
# Parameters
/app/config/parameters.yml
@@ -18,8 +22,12 @@
/vendor/
# Assets and user uploads
/web/bundles/
/web/uploads/
web/uploads/
/web/bundles/*
!/web/bundles/.gitkeep
/web/assets/images/*
!web/assets/images/.gitkeep
/web/wallassets/*.dev.js
# Build
/app/build
@@ -29,7 +37,6 @@
/composer.phar
# Data for wallabag
data/assets/*
data/db/wallabag*.sqlite
# Docker container logs and data
@@ -38,3 +45,15 @@ docker/data/
# To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release
composer.lock
# assets stuff
node_modules/
bin
app/Resources/build/
!/src/Wallabag/CoreBundle/Resources/public
/src/Wallabag/CoreBundle/Resources/public/*
# Test-generated files
admin-export.json
specialexport.json
/data/site-credentials-secret-key.txt

47
.php_cs Normal file
View File

@@ -0,0 +1,47 @@
<?php
return PhpCsFixer\Config::create()
->setRiskyAllowed(true)
->setRules([
'@Symfony' => true,
'@Symfony:risky' => true,
'array_syntax' => [
'syntax' => 'short'
],
'combine_consecutive_unsets' => true,
'heredoc_to_nowdoc' => true,
'no_extra_consecutive_blank_lines' => [
'break',
'continue',
'extra',
'return',
'throw',
'use',
'parenthesis_brace_block',
'square_brace_block',
'curly_brace_block'
],
'no_unreachable_default_argument_value' => true,
'no_useless_else' => true,
'no_useless_return' => true,
'ordered_class_elements' => true,
'ordered_imports' => true,
'php_unit_strict' => true,
'phpdoc_order' => true,
// 'psr4' => true,
'strict_comparison' => true,
'strict_param' => true,
'concat_space' => [
'spacing' => 'one'
],
])
->setFinder(
PhpCsFixer\Finder::create()
->exclude([
'vendor',
'var',
'web'
])
->in(__DIR__)
)
;

View File

@@ -26,3 +26,18 @@ tools:
checks:
php:
code_rating: true
# use the new PHP analysis engine
# https://scrutinizer-ci.com/docs/tools/php/php-analyzer/guides/migrate_to_new_php_analysis
build:
nodes:
analysis:
tests:
override:
- php-scrutinizer-run
dependencies:
override:
- npm install -g 'yarn'
- yarn install --force
- COMPOSER_MEMORY_LIMIT=-1 composer install -o --no-interaction --no-progress --prefer-dist

3
.stylelintrc Normal file
View File

@@ -0,0 +1,3 @@
{
"extends": "stylelint-config-standard"
}

View File

@@ -1,5 +1,9 @@
language: php
services:
- rabbitmq
- redis
# faster builds on docker-container setup
sudo: false
@@ -15,12 +19,19 @@ cache:
directories:
- vendor
- $HOME/.composer/cache
- node_modules
- $HOME/.npm
- $HOME/.yarn-cache
php:
- 5.5
- 5.6
- 7.0
- hhvm
- 7.1
- 7.2
- nightly
node_js:
- "5"
env:
- DB=mysql
@@ -31,12 +42,9 @@ matrix:
fast_finish: true
include:
- php: 7.0
env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite
exclude:
- php: hhvm
env: DB=pgsql # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
allow_failures:
- php: hhvm
- php: nightly
# exclude v1 branches
branches:
@@ -44,17 +52,34 @@ branches:
- legacy
before_script:
- if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
- if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi;
- PHP=$TRAVIS_PHP_VERSION
- if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
# xdebug isn't enable for PHP 7.1
- if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
- composer self-update --no-progress
- if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
- if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
install:
- if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.10; fi;
- if [[ $ASSETS = build ]]; then npm install -g yarn@latest; fi;
- if [[ $ASSETS = build ]]; then yarn install; fi;
before_install:
- if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
script:
- travis_wait composer install --no-interaction --no-progress --prefer-dist -o
- ant prepare-$DB
- bin/phpunit -v
- if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
- if [ "$VALIDATE_TRANSLATION_FILE" = "run" ]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
- travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
- echo "travis_fold:start:prepare"
- make prepare DB=$DB
- echo "travis_fold:end:prepare"
- echo "travis_fold:start:fixtures"
- php bin/console doctrine:fixtures:load --no-interaction --env=test
- echo "travis_fold:end:fixtures"
- if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then ./bin/simple-phpunit -v ; fi;
- if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix --verbose --dry-run ; fi;
- if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
- if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v ; fi;
- if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/UserBundle/Resources/translations -v ; fi;
- if [[ $ASSETS = build ]]; then yarn run build:prod; fi;

26
.zappr.yaml Normal file
View File

@@ -0,0 +1,26 @@
# see https://zappr.opensource.zalan.do/
autobranch: false
commit: false
approvals:
minimum: 1
ignore: pr_opener
pattern: "^(:\\+1:|👍)$"
veto:
pattern: "^(:\\-1:|👎)$"
from:
orgs:
- wallabag
collaborators: true
specification:
title:
minimum-length:
enabled: true
length: 8
body:
minimum-length:
enabled: true
length: 8
contains-url: false
contains-issue-number: false
template:
differs-from-body: true

View File

@@ -1,142 +1,612 @@
# Changelog
All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
## [2.3.3](https://github.com/wallabag/wallabag/tree/2.3.3)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.2...2.3.3)
## [2.0.5] - 2016-05-31
### Fixes
### Added
- Fix error when withRemove variable is not defined. [#3573](https://github.com/wallabag/wallabag/pull/3573)
- Fix title card HTML parsing [#3592](https://github.com/wallabag/wallabag/pull/3592)
- Fix tests [#3597](https://github.com/wallabag/wallabag/pull/3597)
- Fix tests [#3619](https://github.com/wallabag/wallabag/pull/3619)
- Better encoding of the URI for the bookmarklet [#3616](https://github.com/wallabag/wallabag/pull/3616)
- Fix overflow wrap issue [#3652](https://github.com/wallabag/wallabag/pull/3652)
- Fix/firefox mobile unneeded resize [#3653](https://github.com/wallabag/wallabag/pull/3653)
- Fix srcset attribute on images downloaded [#3661](https://github.com/wallabag/wallabag/pull/3661)
- Fix authors and preview alt encoding display [#3664](https://github.com/wallabag/wallabag/pull/3664)
- Spelling: GitHub, Log out, of the dev [#3614](https://github.com/wallabag/wallabag/pull/3614)
- Fix tests [#3668](https://github.com/wallabag/wallabag/pull/3668)
- Fixed migrations with dash into db names [#3538](https://github.com/wallabag/wallabag/pull/3538)
- [#2052](https://github.com/wallabag/wallabag/pull/2052) Add unread filter to entries pages (Dan Bartram)
### Changes
### Changed
- Allow login by email [#3615](https://github.com/wallabag/wallabag/pull/3615)
- Occitan update [#3646](https://github.com/wallabag/wallabag/pull/3646)
- Highlight code in articles using highlight.js [#3636](https://github.com/wallabag/wallabag/pull/3636)
- [#2093](https://github.com/wallabag/wallabag/pull/2093) Replace vertical dots in material theme with horizontal dots (Nicolas Lœuillet)
- [#2054](https://github.com/wallabag/wallabag/pull/2054) Update italian translation (Daniele Conca)
- [#2068](https://github.com/wallabag/wallabag/pull/2068), [#2049](https://github.com/wallabag/wallabag/pull/2049) Update documentation (Josh Panter, Mario Vormstein)
## [2.3.2](https://github.com/wallabag/wallabag/tree/2.3.2)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.1...2.3.2)
### Fixed
### Fixes
- [#2122](https://github.com/wallabag/wallabag/pull/2122) Fix the deletion of Tags/Entries relation when delete an entry (Jeremy Benoist, Nicolas Lœuillet)
- [#2095](https://github.com/wallabag/wallabag/pull/2095) Fix form user display when 2FA is disabled (Nicolas Lœuillet)
- [#2092](https://github.com/wallabag/wallabag/pull/2092) API: Starred and archived clears if article is already exists (Rurik19)
- [#2097](https://github.com/wallabag/wallabag/issues/2097) Fix image path in 2-factor authentification email (Baptiste Mille-Mathias)
- [#2069](https://github.com/wallabag/wallabag/pull/2069) Do not specify language in Firefox addon link (Merouane Atig)
- Add `set -eu` to update.sh [#3546](https://github.com/wallabag/wallabag/pull/3546)
- Fix broken link to remove tags from entries [#3536](https://github.com/wallabag/wallabag/pull/3536)
## [2.0.4] - 2016-05-07
### Changes
### Added
- Nav actions updated [#3541](https://github.com/wallabag/wallabag/pull/3541)
- Replaced Create new client link with a button [#3539](https://github.com/wallabag/wallabag/pull/3539)
- [#2016](https://github.com/wallabag/wallabag/pull/2016) Big updates in [our documentation](http://doc.wallabag.org/en/master/) (Nicolas Lœuillet)
- [#2028](https://github.com/wallabag/wallabag/pull/2028) Documentation about android application (Strubbl)
- [#2019](https://github.com/wallabag/wallabag/pull/2019) Italian translation (Daniele Conca)
- [#2011](https://github.com/wallabag/wallabag/pull/2011) Documentation about wallabag upgrade (biva)
- [#1985](https://github.com/wallabag/wallabag/pull/1985) Documentation about rights access (FoxMaSk)
- [#1969](https://github.com/wallabag/wallabag/pull/1969) Third resources for API in documentation (Nicolas Lœuillet)
- [#1967](https://github.com/wallabag/wallabag/pull/1967) FAQ page in documentation (Nicolas Lœuillet)
## [2.3.1](https://github.com/wallabag/wallabag/tree/2.3.1)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.0...2.3.1)
### Changed
### Fixes
- [#1977](https://github.com/wallabag/wallabag/pull/1977) Spanish documentation (jami7)
- Changed the way to check for initial migration [#3487](https://github.com/wallabag/wallabag/pull/3487)
- Displayed the RSS icon on homepage route [#3490](https://github.com/wallabag/wallabag/pull/3490)
- Hided the share toggle button if no service is enabled [#3492](https://github.com/wallabag/wallabag/pull/3492)
- Updated robots.txt to prevent crawling [#3510](https://github.com/wallabag/wallabag/pull/3510)
- Fixed lower case tags migration [#3507](https://github.com/wallabag/wallabag/pull/3507)
- Fixed initial migration when using custom table prefix [#3504](https://github.com/wallabag/wallabag/pull/3504)
- Fixed assets for subfolder install [#3524](https://github.com/wallabag/wallabag/pull/3524)
- Fixed empty card title link [#3525](https://github.com/wallabag/wallabag/pull/3525)
- Fixed empty title and domain_name when exception is thrown during fetch [#3442](https://github.com/wallabag/wallabag/pull/3442)
- API: copied entry object before sending, to keep id [#3516](https://github.com/wallabag/wallabag/pull/3516)
### Fixed
### Changes
- [#2023](https://github.com/wallabag/wallabag/pull/2023) Fix translation for validators (Nicolas Lœuillet)
- [#2020](https://github.com/wallabag/wallabag/pull/2020) Fix number of entries in tag/list (Nicolas Lœuillet)
- [#2022](https://github.com/wallabag/wallabag/pull/2022) Fix pagination bar on small devices (Nicolas Lœuillet)
- [#2013](https://github.com/wallabag/wallabag/pull/2013) Fix tag listing (Nicolas Lœuillet)
- [#1976](https://github.com/wallabag/wallabag/pull/1976) Fix filter reading time (Nicolas Lœuillet)
- [#2005](https://github.com/wallabag/wallabag/pull/2005) Fix reading speed not defined when user was created via config page (Nicolas Lœuillet)
- [#2010](https://github.com/wallabag/wallabag/pull/2010) Set the title via POST /api/entries (Nicolas Lœuillet)
- Added custom driver & schema manager for PostgreSQL 10 [#3488](https://github.com/wallabag/wallabag/pull/3488)
- Replaced exit_to_app, redo and autorenew icons [#3513](https://github.com/wallabag/wallabag/pull/3513)
- Added PHP 7.2 compatibility [#3515](https://github.com/wallabag/wallabag/pull/3515)
## [2.0.3] - 2016-04-22
## [2.3.0](https://github.com/wallabag/wallabag/tree/2.3.0) (2017-12-11)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.2.3...2.3.0)
### Added
### API
- [#1962](https://github.com/wallabag/wallabag/pull/1962) cURL examples in documentation about API (Dirk Deimeke)
- API `exists` returns `id` if article exists [#2919](https://github.com/wallabag/wallabag/pull/2919)
- Added API endpoint to handle a list of URL and to add/delete tags [#3055](https://github.com/wallabag/wallabag/pull/3055)
- Added API endpoint to handle a list of URL [#3053](https://github.com/wallabag/wallabag/pull/3053)
- Retrieve tag / tags value from query or request [#3103](https://github.com/wallabag/wallabag/pull/3103)
- Register through API [#3065](https://github.com/wallabag/wallabag/pull/3065)
- API user creation behind a toggle [#3177](https://github.com/wallabag/wallabag/pull/3177)
- Allow other fields to be sent using API [#3106](https://github.com/wallabag/wallabag/pull/3106)
- Add ability to patch an entry with more fields [#3181](https://github.com/wallabag/wallabag/pull/3181)
- Create (and return) a client after creating a new user using the API [#3187](https://github.com/wallabag/wallabag/pull/3187)
- Fix PATCH method [#3256](https://github.com/wallabag/wallabag/pull/3256)
### Fixed
### Technical stuff
- Forgot `composer.lock` file in 2.0.2 release so some users may encounter `Fatal error: Out of memory` error during installation
- Dropping PHP 5.5 [#2861](https://github.com/wallabag/wallabag/pull/2861), migrated to Symfony 3.3 [#3376](https://github.com/wallabag/wallabag/pull/3376), defined MySQL as the default rdbms for wallabag [#3171](https://github.com/wallabag/wallabag/pull/3171)
- Add Cloudron as installation method [#3000](https://github.com/wallabag/wallabag/pull/3000)
- Added migrations execution after fresh install [#3088](https://github.com/wallabag/wallabag/pull/3088)
- Upgraded CraueConfigBundle to 2.0 [#3113](https://github.com/wallabag/wallabag/pull/3113)
- Removed embedded documentation. [The repository is now here](https://github.com/wallabag/doc). [#3122](https://github.com/wallabag/wallabag/pull/3122)
- Fix some Scrutinizer issues [#3161](https://github.com/wallabag/wallabag/pull/3161) [#3172](https://github.com/wallabag/wallabag/pull/3172)
- Isolated tests [#3137](https://github.com/wallabag/wallabag/pull/3137)
- Log an error level message when user auth fail [#3195](https://github.com/wallabag/wallabag/pull/3195)
- Add a real configuration for CS-Fixer [#3258](https://github.com/wallabag/wallabag/pull/3258)
- Replace ant with Makefile [#3398](https://github.com/wallabag/wallabag/pull/3398)
## [2.0.2] - 2016-04-21
### Features
### Added
- Share articles to Scuttle (https://github.com/scronide/scuttle) instance [#2999](https://github.com/wallabag/wallabag/pull/2999)
- Allow to remove all archived entries [#3020](https://github.com/wallabag/wallabag/pull/3020)
- Added publication date and author [#3024](https://github.com/wallabag/wallabag/pull/3024)
- Added `notmatches` operator for automatic tagging rule [#3047](https://github.com/wallabag/wallabag/pull/3047)
- Search & paginate users [#3060](https://github.com/wallabag/wallabag/pull/3060)
- **Clean duplicates entries** command [#2920](https://github.com/wallabag/wallabag/pull/2920)
- Added headers field in Entry [#3108](https://github.com/wallabag/wallabag/pull/3108)
- Add some deletion confirmation to avoid mistake [#3147](https://github.com/wallabag/wallabag/pull/3147)
- Add support for tag in Instapaper import [#3168](https://github.com/wallabag/wallabag/pull/3168)
- Added tags on list view [#3077](https://github.com/wallabag/wallabag/pull/3077)
- **Show user** command [#3179](https://github.com/wallabag/wallabag/pull/3179)
- Add ability to filter public entries & use it in the API [#3208](https://github.com/wallabag/wallabag/pull/3208)
- Store credentials for restricted site in database [#2683](https://github.com/wallabag/wallabag/pull/2683)
- Add RSS for tags & All entries [#3207](https://github.com/wallabag/wallabag/pull/3207)
- Add **list users** command [#3301](https://github.com/wallabag/wallabag/pull/3301)
- Add **reload entry** command [#3326](https://github.com/wallabag/wallabag/pull/3326)
- Add starred_at field which is set when an entry is starred [#3330](https://github.com/wallabag/wallabag/pull/3330)
- Add originUrl property to Entry [#3346](https://github.com/wallabag/wallabag/pull/3346)
- [#1945](https://github.com/wallabag/wallabag/pull/1945) cURL examples in documentation about API (Dirk Deimeke)
- [#1911](https://github.com/wallabag/wallabag/pull/1911) Add title hover on entry titles (Thomas Citharel)
### Changes
### Changed
- Changed default value for list mode (grid instead of list) [#3014](https://github.com/wallabag/wallabag/pull/3014)
- Remove `isPublic` from Entry entity [#3030](https://github.com/wallabag/wallabag/pull/3030)
- Use username to import [#3080](https://github.com/wallabag/wallabag/pull/3080)
- Adds Webpack support and remove Grunt [#3022](https://github.com/wallabag/wallabag/pull/3022)
- Improved Guzzle subscribers extensibility [#2751](https://github.com/wallabag/wallabag/pull/2751)
- Added logger when we match Tagging rules [#3110](https://github.com/wallabag/wallabag/pull/3110)
- unify Download/Export wording. [#3130](https://github.com/wallabag/wallabag/pull/3130)
- Staying on an article view after removing a tag [#3138](https://github.com/wallabag/wallabag/pull/3138)
- Use an alternative way to detect images [#3184](https://github.com/wallabag/wallabag/pull/3184)
- Displays an error with an annotation with a too long quote [#3093](https://github.com/wallabag/wallabag/pull/3093)
- Validate language & preview picture fields [#3192](https://github.com/wallabag/wallabag/pull/3192)
- remove craueconfig domain name setting and add a proper one in parameters [#3173](https://github.com/wallabag/wallabag/pull/3173)
- Better public sharing page [#3204](https://github.com/wallabag/wallabag/pull/3204), [#3449](https://github.com/wallabag/wallabag/pull/3449)
- Improved pagination, navigation, tag's list and footer UI [#3459](https://github.com/wallabag/wallabag/pull/3459), [#3467](https://github.com/wallabag/wallabag/pull/3467), [#3461](https://github.com/wallabag/wallabag/pull/3461), [#3463](https://github.com/wallabag/wallabag/pull/3463)
- [#1944](https://github.com/wallabag/wallabag/pull/1944), [#1953](https://github.com/wallabag/wallabag/pull/1953), [#1954](https://github.com/wallabag/wallabag/pull/1954) Due to branches renaming, update documentation and configuration (maxi62330, Nicolas Lœuillet)
- [#1942](https://github.com/wallabag/wallabag/pull/1942) Optimize import (Nicolas Lœuillet)
- [#1935](https://github.com/wallabag/wallabag/pull/1935) Update spanish translation (jami7)
- [#1929](https://github.com/wallabag/wallabag/pull/1929) Change guid and link in RSS feeds to give original entry URL (Nicolas Lœuillet)
- [#1918](https://github.com/wallabag/wallabag/pull/1918) Improve pagination when user has lot of entries (Nicolas Lœuillet)
- [#1916](https://github.com/wallabag/wallabag/pull/1916) Change PHP arrays and move test parameters in a separated file (Jeremy Benoist)
### Fixes
### Fixed
- Use up-to-date Firefox extension and add F-Droid link for Android app [#3057](https://github.com/wallabag/wallabag/pull/3057)
- Fixed sandwich menu position in entry view (material theme) [#3073](https://github.com/wallabag/wallabag/pull/3073)
- Disabled shortcuts on login/register page [#3075](https://github.com/wallabag/wallabag/pull/3075)
- "+" in url not parsed correctly (when we click on original URL) [#3002](https://github.com/wallabag/wallabag/pull/3002)
- Skip auth when no credentials are found [#3101](https://github.com/wallabag/wallabag/pull/3101)
- Added migration to change length for user fields [#3104](https://github.com/wallabag/wallabag/pull/3104)
- Fix delete annotation when username is defined [#3120](https://github.com/wallabag/wallabag/pull/3120)
- Fixed is_starred for wallabag v2 import [#3143](https://github.com/wallabag/wallabag/pull/3143)
- Replace images with & in url [#3176](https://github.com/wallabag/wallabag/pull/3176)
- Ignore tag's case [#3139](https://github.com/wallabag/wallabag/pull/3139)
- Multiple tag search, which was broken from API [#3309](https://github.com/wallabag/wallabag/pull/3309)
- In RSS feeds, pubDate now conformant to DateTime RFC822 specifications [#3471](https://github.com/wallabag/wallabag/pull/3471)
- [#1957](https://github.com/wallabag/wallabag/pull/1957) Fix translation for `Go to your account` button (Nicolas Lœuillet)
- [#1925](https://github.com/wallabag/wallabag/pull/1925) Redirect to homepage if refered is null (Nicolas Lœuillet)
- [#1912](https://github.com/wallabag/wallabag/pull/1912) Fix 500 Internal Server Error -> "Setting piwik_enabled couldn't be found" (Jeremy Benoist)
### Translations
## [2.0.1] - 2016-04-11
### Added
- Add Russian language [#3378](https://github.com/wallabag/wallabag/pull/3378)
- [Documentation about importing large file](http://doc.wallabag.org/en/v2/user/installation.html#installing-on-nginx) into nginx. (Nicolas Lœuillet)
- [Documentation about wallabag API](http://doc.wallabag.org/en/v2/developer/api.html) (Nicolas Lœuillet)
- [#1861](https://github.com/wallabag/wallabag/pull/1861) Round estimated time and add reading speed for Baggy (Nicolas Lœuillet)
- [Documentation about wallabag v1 CLI import](http://doc.wallabag.org/en/v2/user/migration.html#import-via-command-line-interface-cli) (Nicolas Lœuillet)
- [Add migrate link](http://doc.wallabag.org/en/v2/user/migration.html) in documentation (Nicolas Lœuillet)
## [2.2.3](https://github.com/wallabag/wallabag/tree/2.2.3) (2017-05-17)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.2.2...2.2.3)
### Changed
- Lock guzzle-site-authenticator to avoid errors [\#3124](https://github.com/wallabag/wallabag/pull/3124) ([j0k3r](https://github.com/j0k3r))
- reorder contrib strings in about page [\#3123](https://github.com/wallabag/wallabag/pull/3123) ([X-dark](https://github.com/X-dark))
- Fixed documentation URL [\#3117](https://github.com/wallabag/wallabag/pull/3117) ([nicosomb](https://github.com/nicosomb))
- Update graby\* licenses [\#3097](https://github.com/wallabag/wallabag/pull/3097) ([j0k3r](https://github.com/j0k3r))
- Fix API pagination is broken if perPage is custom value [\#3096](https://github.com/wallabag/wallabag/pull/3096) ([aaa2000](https://github.com/aaa2000))
- Create a new entry via API even when its content can't be retrieved [\#3095](https://github.com/wallabag/wallabag/pull/3095) ([aaa2000](https://github.com/aaa2000))
- Translate error message in login page [\#3090](https://github.com/wallabag/wallabag/pull/3090) ([aaa2000](https://github.com/aaa2000))
- Fix display the form errors correctly [\#3082](https://github.com/wallabag/wallabag/pull/3082) ([aaa2000](https://github.com/aaa2000))
- Disable negative numbers in filters [\#3076](https://github.com/wallabag/wallabag/pull/3076) ([bourvill](https://github.com/bourvill))
- Small typo in documentation fix \#3061 [\#3072](https://github.com/wallabag/wallabag/pull/3072) ([bourvill](https://github.com/bourvill))
- Ignore tests exported files [\#3066](https://github.com/wallabag/wallabag/pull/3066) ([tcitworld](https://github.com/tcitworld))
- Correct create\_application en string [\#3064](https://github.com/wallabag/wallabag/pull/3064) ([gileri](https://github.com/gileri))
- Make symfony-assets-install use `relative` symlinks [\#3052](https://github.com/wallabag/wallabag/pull/3052) ([shtrom](https://github.com/shtrom))
- Add export notice at the end of the epub [\#3023](https://github.com/wallabag/wallabag/pull/3023) ([mart-e](https://github.com/mart-e))
- Save alpha channel when downloading PNG images [\#3017](https://github.com/wallabag/wallabag/pull/3017) ([Kdecherf](https://github.com/Kdecherf))
- Update paywall.rst \(more details and clear cache\) [\#2985](https://github.com/wallabag/wallabag/pull/2985) ([etiess](https://github.com/etiess))
- Update paywall.rst \(EN\) with details + clear cache [\#2971](https://github.com/wallabag/wallabag/pull/2971) ([j0k3r](https://github.com/j0k3r))
- remove language on html tag [\#2968](https://github.com/wallabag/wallabag/pull/2968) ([chrido](https://github.com/chrido))
- [#1823](https://github.com/wallabag/wallabag/pull/1823) Persian translation (Masoud Abkenar)
- [#1901](https://github.com/wallabag/wallabag/pull/1901) Spanish translation (Jeremy Benoist)
- [#1879](https://github.com/wallabag/wallabag/pull/1879) Move tag form in Material theme (Nicolas Lœuillet)
## [2.2.2](https://github.com/wallabag/wallabag/tree/2.2.2) (2017-03-02)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.2.1...2.2.2)
### Fixed
- Update Polish translation [\#2932](https://github.com/wallabag/wallabag/pull/2932) ([mruminski](https://github.com/mruminski))
- Update Spanish translation [\#2917](https://github.com/wallabag/wallabag/pull/2917) ([ngosang](https://github.com/ngosang))
- Remove word repetition from german translation [\#2911](https://github.com/wallabag/wallabag/pull/2911) ([jlnostr](https://github.com/jlnostr))
- Italian documentation added [\#2878](https://github.com/wallabag/wallabag/pull/2878) ([matteocoder](https://github.com/matteocoder))
- Add informations about Apache 2.4 [\#2874](https://github.com/wallabag/wallabag/pull/2874) ([kgaut](https://github.com/kgaut))
- Fixed symlinks issue during release creation [\#2950](https://github.com/wallabag/wallabag/pull/2950) ([nicosomb](https://github.com/nicosomb))
- Use wallabag/tcpdf [\#2931](https://github.com/wallabag/wallabag/pull/2931) ([j0k3r](https://github.com/j0k3r))
- Add activation of 'rewrite' mod of Apache [\#2926](https://github.com/wallabag/wallabag/pull/2926) ([qtheuret](https://github.com/qtheuret))
- Updated CHANGELOG with latest changes [\#2916](https://github.com/wallabag/wallabag/pull/2916) ([nicosomb](https://github.com/nicosomb))
- Import: we now skip messages when user is null [\#2915](https://github.com/wallabag/wallabag/pull/2915) ([nicosomb](https://github.com/nicosomb))
- Added wallabag.it link in README [\#2913](https://github.com/wallabag/wallabag/pull/2913) ([nicosomb](https://github.com/nicosomb))
- Moved :it: documentation into it folder [\#2908](https://github.com/wallabag/wallabag/pull/2908) ([nicosomb](https://github.com/nicosomb))
- Alert that 2FA must be authorized in app/config/parameters.yml [\#2905](https://github.com/wallabag/wallabag/pull/2905) ([nicofrand](https://github.com/nicofrand))
- Update Spanish translation [\#2892](https://github.com/wallabag/wallabag/pull/2892) ([ngosang](https://github.com/ngosang))
- Doc: translated mobile apps configuration in french [\#2882](https://github.com/wallabag/wallabag/pull/2882) ([nicosomb](https://github.com/nicosomb))
- Fixed typo in "first\_steps" [\#2879](https://github.com/wallabag/wallabag/pull/2879) ([matteocoder](https://github.com/matteocoder))
- Doc - information about Apache 2.4 [\#2875](https://github.com/wallabag/wallabag/pull/2875) ([kgaut](https://github.com/kgaut))
- Log restricted access value [\#2869](https://github.com/wallabag/wallabag/pull/2869) ([j0k3r](https://github.com/j0k3r))
- docs 3rd party tools: update java wrapper, add cmd tool to add article [\#2860](https://github.com/wallabag/wallabag/pull/2860) ([Strubbl](https://github.com/Strubbl))
- fix misspells in polish translation [\#2846](https://github.com/wallabag/wallabag/pull/2846) ([mruminski](https://github.com/mruminski))
- Update RulerZ [\#2842](https://github.com/wallabag/wallabag/pull/2842) ([K-Phoen](https://github.com/K-Phoen))
- Show active list in the left menu during search [\#2841](https://github.com/wallabag/wallabag/pull/2841) ([Kdecherf](https://github.com/Kdecherf))
- Restored correct version for framework-extra-bundle [\#2840](https://github.com/wallabag/wallabag/pull/2840) ([nicosomb](https://github.com/nicosomb))
- scripts/update.sh: 18: scripts/update.sh: composer.phar: not found [\#2839](https://github.com/wallabag/wallabag/pull/2839) ([foxmask](https://github.com/foxmask))
- Update Oc version [\#2838](https://github.com/wallabag/wallabag/pull/2838) ([Quent-in](https://github.com/Quent-in))
- Search by term: extend to entries url [\#2832](https://github.com/wallabag/wallabag/pull/2832) ([Kdecherf](https://github.com/Kdecherf))
- Update of CraueConfigBundle in Occitan [\#2831](https://github.com/wallabag/wallabag/pull/2831) ([Quent-in](https://github.com/Quent-in))
- Fix rendering of entry title in Twig views [\#2830](https://github.com/wallabag/wallabag/pull/2830) ([Kdecherf](https://github.com/Kdecherf))
- Translate missing strings for de-DE. [\#2826](https://github.com/wallabag/wallabag/pull/2826) ([jlnostr](https://github.com/jlnostr))
- Renamed Developer section to API client management [\#2824](https://github.com/wallabag/wallabag/pull/2824) ([nicosomb](https://github.com/nicosomb))
- Fix nav-panel-search height [\#2818](https://github.com/wallabag/wallabag/pull/2818) ([Kdecherf](https://github.com/Kdecherf))
- Added details about upgrade from 2.1.x or 2.2.0 [\#2816](https://github.com/wallabag/wallabag/pull/2816) ([nicosomb](https://github.com/nicosomb))
- Documentation on how to configure mobile apps to work with wallabag.it [\#2788](https://github.com/wallabag/wallabag/pull/2788) ([Zettt](https://github.com/Zettt))
- first\_article.rst already inside articles.rst [\#2785](https://github.com/wallabag/wallabag/pull/2785) ([matteocoder](https://github.com/matteocoder))
- share.rst already integrated inside articles.rst [\#2784](https://github.com/wallabag/wallabag/pull/2784) ([matteocoder](https://github.com/matteocoder))
- [#1903](https://github.com/wallabag/wallabag/pull/1903) Force server version to avoid connection error (Jeremy Benoist)
- [#1887](https://github.com/wallabag/wallabag/pull/1887) Fix duplicate article when added via the bookmarklet (Nicolas Lœuillet)
- [#1895](https://github.com/wallabag/wallabag/pull/1895) API: All the entries are fetched via GET /api/entries (Nicolas Lœuillet)
- [#1898](https://github.com/wallabag/wallabag/pull/1898) Fix estimated reading time in material view #1893 (Nicolas Lœuillet)
- [#1896](https://github.com/wallabag/wallabag/pull/1896) remove download_picture setting and manage show_printlink in material theme #1867 (Nicolas Lœuillet)
- [#1894](https://github.com/wallabag/wallabag/pull/1894) Fix documentation link in developer page (Nicolas Lœuillet)
- [#1891](https://github.com/wallabag/wallabag/pull/1891) Fix typo on configuration page (Nicolas Lœuillet)
- [#1884](https://github.com/wallabag/wallabag/pull/1884) Change the installation method in issue template (Nicolas Lœuillet)
- [#1844](https://github.com/wallabag/wallabag/pull/1844) Lock ocramius/proxy-manager (Jeremy Benoist)
- [#1840](https://github.com/wallabag/wallabag/pull/1840) Fix Archive page title translation (Nicolas Lœuillet)
- [#1801](https://github.com/wallabag/wallabag/pull/1804) Force user-agent for iansommerville.com (Jeremy Benoist)
## [2.2.1](https://github.com/wallabag/wallabag/tree/2.2.1) (2017-01-31)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.2.0...2.2.1)
### Removed
- Fixed duplicate entry for share\_public in craue\_setting\_table [\#2809](https://github.com/wallabag/wallabag/pull/2809) ([nicosomb](https://github.com/nicosomb))
- [#1900](https://github.com/wallabag/wallabag/pull/1900) Remove empty portugese documentation (Nicolas Lœuillet)
- [#1868](https://github.com/wallabag/wallabag/pull/1868) Remove keyboard shortcut and add tagging rule panel in baggy (Nicolas Lœuillet)
- [#1824](https://github.com/wallabag/wallabag/pull/1824) Remove SMTP configuration environment overrides (Mathieu Bruyen)
## [2.2.0](https://github.com/wallabag/wallabag/tree/2.2.0) (2017-01-28)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.1.6.1...2.2.0)
## [2.0.0] - 2016-04-03
### Added
- Added indexes on is\_archived and is\_starred [\#2789](https://github.com/wallabag/wallabag/pull/2789) ([nicosomb](https://github.com/nicosomb))
- Fix \#2056 update config.yml [\#2624](https://github.com/wallabag/wallabag/pull/2624) ([Rurik19](https://github.com/Rurik19))
* save an article, read it, favorite it, archive it. (Hopefully)
* annotations: In each article you read, you can write annotations. ([read the doc](http://doc.wallabag.org/en/v2/user/annotations.html))
* filter entries by reading time, domain name, creation date, status, etc.
* assign tags to entries
* edit article titles
* a REST API ([you can have a look to the documentation](http://v2.wallabag.org/api/doc))
* authorization via oAuth2
* a new default theme, called `material`
* RSS feeds (with ability to limit number of articles)
* create a new account from the config page (for super admin only)
* recover passwords from login page (you have to fill your email on config page)
* picture preview, if available, is displayed for each entry
* Public registration
* migration from wallabag v1/v2 (based on JSON export) ([read the doc](http://doc.wallabag.org/en/v2/user/import.html))
* migration from Pocket (it works, but we need to implement asynchronous import: if you have too many articles, it can fail) ([read the doc](http://doc.wallabag.org/en/v2/user/import.html))
* exports in many formats (PDF, JSON, EPUB, MOBI, XML, CSV and TXT).
* 2-Factor authentication via email ([read the doc](http://doc.wallabag.org/en/v2/user/configuration.html#two-factor-authentication))
* Tagging rule: create a rule to automatically assign tags to entries! ([read the doc](http://doc.wallabag.org/en/v2/user/configuration.html#tagging-rules))
* Occitan, German, French, Turkish, Persian, Romanian, Polish, Danish, Spanish and English translations
* Quickstart for beginners (when you don't have any entries)
* Internal settings for administrator (the account created during installation)
* For 3rd apps developers, a developer page is available to create API token
## [2.1.6.1](https://github.com/wallabag/wallabag/tree/2.1.6.1) (2017-01-23)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.1.6...2.1.6.1)
## [2.1.6](https://github.com/wallabag/wallabag/tree/2.1.6) (2017-01-18)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.1.5...2.1.6)
- Update copyright year [\#2736](https://github.com/wallabag/wallabag/pull/2736) ([lex111](https://github.com/lex111))
- Fixed possible JS injection via the title edition [\#2758](https://github.com/wallabag/wallabag/pull/2758) ([nicosomb](https://github.com/nicosomb))
## [2.1.5](https://github.com/wallabag/wallabag/tree/2.1.5) (2016-11-21)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.1.4...2.1.5)
- Force composer to run as PHP 5.5.9 [\#2623](https://github.com/wallabag/wallabag/pull/2623) ([j0k3r](https://github.com/j0k3r))
## [2.1.4](https://github.com/wallabag/wallabag/tree/2.1.4) (2016-11-19)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.1.3...2.1.4)
- Add .travis.yml change to RELEASE\_PROCESS [\#2605](https://github.com/wallabag/wallabag/pull/2605) ([j0k3r](https://github.com/j0k3r))
- wallabag cant work on PostgreSQL \<= 9.1 [\#2604](https://github.com/wallabag/wallabag/pull/2604) ([j0k3r](https://github.com/j0k3r))
- Fix clear-cache problem using —no-dev [\#2603](https://github.com/wallabag/wallabag/pull/2603) ([j0k3r](https://github.com/j0k3r))
- User-agents have moved to site-config [\#2587](https://github.com/wallabag/wallabag/pull/2587) ([j0k3r](https://github.com/j0k3r))
- fix \#2582 - Documentation, Nginx config: disable all other PHP file from symphony [\#2584](https://github.com/wallabag/wallabag/pull/2584) ([blankoworld](https://github.com/blankoworld))
- Added help on config screen [\#2578](https://github.com/wallabag/wallabag/pull/2578) ([nicosomb](https://github.com/nicosomb))
- Added tooltips in header bar [\#2577](https://github.com/wallabag/wallabag/pull/2577) ([nicosomb](https://github.com/nicosomb))
- Changed behavior when we change language [\#2571](https://github.com/wallabag/wallabag/pull/2571) ([nicosomb](https://github.com/nicosomb))
- Added creation date on entries view [\#2570](https://github.com/wallabag/wallabag/pull/2570) ([nicosomb](https://github.com/nicosomb))
- Removed support website on about page [\#2565](https://github.com/wallabag/wallabag/pull/2565) ([nicosomb](https://github.com/nicosomb))
- Improve PR template [\#2563](https://github.com/wallabag/wallabag/pull/2563) ([j0k3r](https://github.com/j0k3r))
- Bigger image preview in case of only image content [\#2562](https://github.com/wallabag/wallabag/pull/2562) ([j0k3r](https://github.com/j0k3r))
- Improve tags list on small screen [\#2561](https://github.com/wallabag/wallabag/pull/2561) ([Rurik19](https://github.com/Rurik19))
- Replaced TokenStorage with TokenStorageInterface [\#2556](https://github.com/wallabag/wallabag/pull/2556) ([nicosomb](https://github.com/nicosomb))
- Reorder variable assignation in update.sh script, fix \#2554 [\#2555](https://github.com/wallabag/wallabag/pull/2555) ([dkrmr](https://github.com/dkrmr))
- Round readingtime to avoid crazy number [\#2552](https://github.com/wallabag/wallabag/pull/2552) ([j0k3r](https://github.com/j0k3r))
- Reordered documentation [\#2550](https://github.com/wallabag/wallabag/pull/2550) ([nicosomb](https://github.com/nicosomb))
- Updated default parameters.yml file in documentation [\#2546](https://github.com/wallabag/wallabag/pull/2546) ([nicosomb](https://github.com/nicosomb))
- Update the upgrade documentation [\#2545](https://github.com/wallabag/wallabag/pull/2545) ([nicosomb](https://github.com/nicosomb))
## [2.1.3](https://github.com/wallabag/wallabag/tree/2.1.3) (2016-11-04)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.1.2...2.1.3)
- Force user-agent for .slashdot.org [\#2528](https://github.com/wallabag/wallabag/pull/2528) ([Kdecherf](https://github.com/Kdecherf))
- Translation update - French [\#2519](https://github.com/wallabag/wallabag/pull/2519) ([Jibec](https://github.com/Jibec))
- docs: fix link to wallabag-stats project [\#2518](https://github.com/wallabag/wallabag/pull/2518) ([Strubbl](https://github.com/Strubbl))
- docs: update 3rd party projects by Strubbl [\#2514](https://github.com/wallabag/wallabag/pull/2514) ([Strubbl](https://github.com/Strubbl))
- Fix missing words in Android application documentation [\#2485](https://github.com/wallabag/wallabag/pull/2485) ([bmillemathias](https://github.com/bmillemathias))
- Removed MD5 hash in documentation [\#2466](https://github.com/wallabag/wallabag/pull/2466) ([nicosomb](https://github.com/nicosomb))
- Use created\_at as default sort [\#2534](https://github.com/wallabag/wallabag/pull/2534) ([j0k3r](https://github.com/j0k3r))
- Added documentation about failed to load external entity error [\#2530](https://github.com/wallabag/wallabag/pull/2530) ([nicosomb](https://github.com/nicosomb))
- Add Instapaper to CLI import [\#2524](https://github.com/wallabag/wallabag/pull/2524) ([lologhi](https://github.com/lologhi))
- fix path for the install scripts [\#2521](https://github.com/wallabag/wallabag/pull/2521) ([foxmask](https://github.com/foxmask))
- Inject parameter instead of service [\#2520](https://github.com/wallabag/wallabag/pull/2520) ([j0k3r](https://github.com/j0k3r))
- Updated Capistrano configuration [\#2513](https://github.com/wallabag/wallabag/pull/2513) ([nicosomb](https://github.com/nicosomb))
- Exploded WallabagRestController into many controllers [\#2509](https://github.com/wallabag/wallabag/pull/2509) ([nicosomb](https://github.com/nicosomb))
- Added the whole path to parameters.yml file [\#2508](https://github.com/wallabag/wallabag/pull/2508) ([nicosomb](https://github.com/nicosomb))
- Added require.sh to check if composer is installed [\#2507](https://github.com/wallabag/wallabag/pull/2507) ([nicosomb](https://github.com/nicosomb))
- Fixed entries export filtered with a tag [\#2506](https://github.com/wallabag/wallabag/pull/2506) ([nicosomb](https://github.com/nicosomb))
- Added tag label in the page title [\#2504](https://github.com/wallabag/wallabag/pull/2504) ([nicosomb](https://github.com/nicosomb))
- Added a check in Makefile to see if composer is installed [\#2500](https://github.com/wallabag/wallabag/pull/2500) ([nicosomb](https://github.com/nicosomb))
- Add relevant links to fetch content error page [\#2493](https://github.com/wallabag/wallabag/pull/2493) ([bmillemathias](https://github.com/bmillemathias))
- Added :fr: documentation for wallabag backup [\#2486](https://github.com/wallabag/wallabag/pull/2486) ([nicosomb](https://github.com/nicosomb))
- Document what to backup in Wallabag [\#2484](https://github.com/wallabag/wallabag/pull/2484) ([bmillemathias](https://github.com/bmillemathias))
- If reload content failed, dont update it [\#2482](https://github.com/wallabag/wallabag/pull/2482) ([j0k3r](https://github.com/j0k3r))
- Some fixes [\#2481](https://github.com/wallabag/wallabag/pull/2481) ([j0k3r](https://github.com/j0k3r))
- Portuguese \(Brazilian\) translation [\#2473](https://github.com/wallabag/wallabag/pull/2473) ([pmichelazzo](https://github.com/pmichelazzo))
- Update wallabag version for master branch [\#2467](https://github.com/wallabag/wallabag/pull/2467) ([nicosomb](https://github.com/nicosomb))
- UI Changes [\#2460](https://github.com/wallabag/wallabag/pull/2460) ([tcitworld](https://github.com/tcitworld))
## [2.1.2](https://github.com/wallabag/wallabag/tree/2.1.2) (2016-10-17)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.1.1...2.1.2)
- German: improve existing and add missing translation [\#2459](https://github.com/wallabag/wallabag/pull/2459) ([Strubbl](https://github.com/Strubbl))
- add link to German documentation in about page [\#2457](https://github.com/wallabag/wallabag/pull/2457) ([Strubbl](https://github.com/Strubbl))
- Bring make dev [\#2451](https://github.com/wallabag/wallabag/pull/2451) ([tcitworld](https://github.com/tcitworld))
- Update ISSUE\_TEMPLATE.md [\#2432](https://github.com/wallabag/wallabag/pull/2432) ([j0k3r](https://github.com/j0k3r))
- Define a dev version for the master [\#2417](https://github.com/wallabag/wallabag/pull/2417) ([j0k3r](https://github.com/j0k3r))
- try to reduce assets build npm connection failing by updating nodejs [\#2375](https://github.com/wallabag/wallabag/pull/2375) ([tcitworld](https://github.com/tcitworld))
- Fixed hardcoded title for internal settings [\#2464](https://github.com/wallabag/wallabag/pull/2464) ([nicosomb](https://github.com/nicosomb))
- Fix tabs on material [\#2455](https://github.com/wallabag/wallabag/pull/2455) ([tcitworld](https://github.com/tcitworld))
- Fix baggy display on small screens [\#2454](https://github.com/wallabag/wallabag/pull/2454) ([tcitworld](https://github.com/tcitworld))
- View improvements [\#2450](https://github.com/wallabag/wallabag/pull/2450) ([nicosomb](https://github.com/nicosomb))
- Fixed french and german doc homepages [\#2447](https://github.com/wallabag/wallabag/pull/2447) ([nicosomb](https://github.com/nicosomb))
- Added information about tagging rules in documentation [\#2446](https://github.com/wallabag/wallabag/pull/2446) ([nicosomb](https://github.com/nicosomb))
- Mention example instance in docs [\#2444](https://github.com/wallabag/wallabag/pull/2444) ([Kaligule](https://github.com/Kaligule))
- Minor fixes in the english documentation [\#2439](https://github.com/wallabag/wallabag/pull/2439) ([zertrin](https://github.com/zertrin))
- Added french documentation for upgrade [\#2435](https://github.com/wallabag/wallabag/pull/2435) ([nicosomb](https://github.com/nicosomb))
- Added french documentation for parameters.yml [\#2434](https://github.com/wallabag/wallabag/pull/2434) ([nicosomb](https://github.com/nicosomb))
- Lock deps for FOSUser [\#2429](https://github.com/wallabag/wallabag/pull/2429) ([j0k3r](https://github.com/j0k3r))
- Fix links on english documentation homepage [\#2426](https://github.com/wallabag/wallabag/pull/2426) ([nicosomb](https://github.com/nicosomb))
- Fixed display for note in installation page [\#2422](https://github.com/wallabag/wallabag/pull/2422) ([nicosomb](https://github.com/nicosomb))
- Avoid error when Redis isn't here in tests [\#2420](https://github.com/wallabag/wallabag/pull/2420) ([j0k3r](https://github.com/j0k3r))
- Fixed Twitter Cards by adding a description tag [\#2419](https://github.com/wallabag/wallabag/pull/2419) ([nicosomb](https://github.com/nicosomb))
- Added support of Twitter Cards for public articles [\#2418](https://github.com/wallabag/wallabag/pull/2418) ([nicosomb](https://github.com/nicosomb))
- Remove automatic closing of the window from bookmarklet [\#2414](https://github.com/wallabag/wallabag/pull/2414) ([szafranek](https://github.com/szafranek))
- When a sub command fail, display error message [\#2413](https://github.com/wallabag/wallabag/pull/2413) ([j0k3r](https://github.com/j0k3r))
- Fix PostgreSQL migrations [\#2412](https://github.com/wallabag/wallabag/pull/2412) ([j0k3r](https://github.com/j0k3r))
- Fix entities definition [\#2411](https://github.com/wallabag/wallabag/pull/2411) ([j0k3r](https://github.com/j0k3r))
- Optimize tag list display [\#2410](https://github.com/wallabag/wallabag/pull/2410) ([j0k3r](https://github.com/j0k3r))
- Show number of annotations instead of nbAnnotations placeholder [\#2406](https://github.com/wallabag/wallabag/pull/2406) ([szafranek](https://github.com/szafranek))
- Fix few invalid HTML tags [\#2405](https://github.com/wallabag/wallabag/pull/2405) ([szafranek](https://github.com/szafranek))
- Cleaned up documentation for installation process [\#2403](https://github.com/wallabag/wallabag/pull/2403) ([nicosomb](https://github.com/nicosomb))
- Removed 1.x stuff in CHANGELOG [\#2402](https://github.com/wallabag/wallabag/pull/2402) ([nicosomb](https://github.com/nicosomb))
- Set env to prod in documentation [\#2400](https://github.com/wallabag/wallabag/pull/2400) ([j0k3r](https://github.com/j0k3r))
- Use default locale for user config [\#2399](https://github.com/wallabag/wallabag/pull/2399) ([j0k3r](https://github.com/j0k3r))
- Ensure orphan tag are remove in API [\#2397](https://github.com/wallabag/wallabag/pull/2397) ([j0k3r](https://github.com/j0k3r))
- Update messages.pl.yml [\#2396](https://github.com/wallabag/wallabag/pull/2396) ([mruminski](https://github.com/mruminski))
- Add ability to use socket [\#2395](https://github.com/wallabag/wallabag/pull/2395) ([j0k3r](https://github.com/j0k3r))
- Ability to check multiple urls in API [\#2393](https://github.com/wallabag/wallabag/pull/2393) ([j0k3r](https://github.com/j0k3r))
- Added default picture if preview picture is null [\#2389](https://github.com/wallabag/wallabag/pull/2389) ([nicosomb](https://github.com/nicosomb))
- Fixed two-factor checkbox display in user admin panel [\#2388](https://github.com/wallabag/wallabag/pull/2388) ([nicosomb](https://github.com/nicosomb))
- Changed Changelog by using github-changelog-generator from @skywinder [\#2386](https://github.com/wallabag/wallabag/pull/2386) ([nicosomb](https://github.com/nicosomb))
- Added documentation about siteconfig fix [\#2385](https://github.com/wallabag/wallabag/pull/2385) ([nicosomb](https://github.com/nicosomb))
- Added OpenGraph support for public articles [\#2383](https://github.com/wallabag/wallabag/pull/2383) ([nicosomb](https://github.com/nicosomb))
- Fix exists API call [\#2377](https://github.com/wallabag/wallabag/pull/2377) ([tcitworld](https://github.com/tcitworld))
- Clickable tags [\#2374](https://github.com/wallabag/wallabag/pull/2374) ([tcitworld](https://github.com/tcitworld))
- Remove mouf/nodejs-installer from composer [\#2363](https://github.com/wallabag/wallabag/pull/2363) ([j0k3r](https://github.com/j0k3r))
- Changed relation between API client and refresh token [\#2351](https://github.com/wallabag/wallabag/pull/2351) ([nicosomb](https://github.com/nicosomb))
- Fix relations export for Entry [\#2332](https://github.com/wallabag/wallabag/pull/2332) ([j0k3r](https://github.com/j0k3r))
## [2.1.1](https://github.com/wallabag/wallabag/tree/2.1.1) (2016-10-04)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.1.0...2.1.1)
- Create config even if user is disabled [\#2359](https://github.com/wallabag/wallabag/pull/2359) ([j0k3r](https://github.com/j0k3r))
- Add php-bcmath extension to requirements [\#2354](https://github.com/wallabag/wallabag/pull/2354) ([Zayon](https://github.com/Zayon))
- Basically, fix everything [\#2353](https://github.com/wallabag/wallabag/pull/2353) ([tcitworld](https://github.com/tcitworld))
- Update messages.pl.yml [\#2341](https://github.com/wallabag/wallabag/pull/2341) ([mruminski](https://github.com/mruminski))
- small improvement for german translation [\#2340](https://github.com/wallabag/wallabag/pull/2340) ([Strubbl](https://github.com/Strubbl))
- Fix for 2.1 installation [\#2338](https://github.com/wallabag/wallabag/pull/2338) ([j0k3r](https://github.com/j0k3r))
## [2.1.0](https://github.com/wallabag/wallabag/tree/2.1.0) (2016-10-03)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.8...2.1.0)
- Docker : install PHP 'gd' extension [\#2319](https://github.com/wallabag/wallabag/pull/2319) ([pmartin](https://github.com/pmartin))
- Fix issue \#2296: epub export with special chars in the title. [\#2297](https://github.com/wallabag/wallabag/pull/2297) ([egilli](https://github.com/egilli))
- Remove error message when creating ePub versions [\#2330](https://github.com/wallabag/wallabag/pull/2330) ([pmichelazzo](https://github.com/pmichelazzo))
## [2.0.8](https://github.com/wallabag/wallabag/tree/2.0.8) (2016-09-07)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.7...2.0.8)
- Allow failure for PHP 7.1 [\#2236](https://github.com/wallabag/wallabag/pull/2236) ([j0k3r](https://github.com/j0k3r))
- Add a check for the database connection [\#2262](https://github.com/wallabag/wallabag/pull/2262) ([j0k3r](https://github.com/j0k3r))
- Fix issue \#1991: correction of the height field to add articles [\#2241](https://github.com/wallabag/wallabag/pull/2241) ([modos189](https://github.com/modos189))
- V2 improve view [\#2238](https://github.com/wallabag/wallabag/pull/2238) ([modos189](https://github.com/modos189))
- Add configuration for german documentation [\#2235](https://github.com/wallabag/wallabag/pull/2235) ([nicosomb](https://github.com/nicosomb))
- Fixes mailto link in documentation [\#2234](https://github.com/wallabag/wallabag/pull/2234) ([cstuder](https://github.com/cstuder))
- Cut entries title in card view: continued [\#2230](https://github.com/wallabag/wallabag/pull/2230) ([modos189](https://github.com/modos189))
## [2.0.7](https://github.com/wallabag/wallabag/tree/2.0.7) (2016-08-22)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.6...2.0.7)
- Avoid breaking import when fetching fail [\#2224](https://github.com/wallabag/wallabag/pull/2224) ([j0k3r](https://github.com/j0k3r))
- Added creation date and reading time on article view [\#2222](https://github.com/wallabag/wallabag/pull/2222) ([nicosomb](https://github.com/nicosomb))
- Replaced favorite word/icon with star one [\#2221](https://github.com/wallabag/wallabag/pull/2221) ([nicosomb](https://github.com/nicosomb))
- Enable PATCH method for CORS in API part [\#2220](https://github.com/wallabag/wallabag/pull/2220) ([Rurik19](https://github.com/Rurik19))
- Enable CORS headers for OAUTH part [\#2216](https://github.com/wallabag/wallabag/pull/2216) ([Rurik19](https://github.com/Rurik19))
- Run tests on an uptodate HHVM [\#2134](https://github.com/wallabag/wallabag/pull/2134) ([j0k3r](https://github.com/j0k3r))
- Fix form user display when 2FA is disabled [\#2095](https://github.com/wallabag/wallabag/pull/2095) ([nicosomb](https://github.com/nicosomb))
## [2.0.6](https://github.com/wallabag/wallabag/tree/2.0.6) (2016-08-10)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.5...2.0.6)
- Run PHP 7.1 on Travis [\#2048](https://github.com/wallabag/wallabag/pull/2048) ([j0k3r](https://github.com/j0k3r))
- Fixed typo in entry:notice:entry\_saved [\#2200](https://github.com/wallabag/wallabag/pull/2200) ([charno6](https://github.com/charno6))
- Handling socials links into a config file [\#2199](https://github.com/wallabag/wallabag/pull/2199) ([Simounet](https://github.com/Simounet))
- FIX image inside a figure element max-width [\#2198](https://github.com/wallabag/wallabag/pull/2198) ([Simounet](https://github.com/Simounet))
- Remove binary from repo [\#2195](https://github.com/wallabag/wallabag/pull/2195) ([j0k3r](https://github.com/j0k3r))
- Fixed spelling Artúclos --\> Artículos [\#2194](https://github.com/wallabag/wallabag/pull/2194) ([benages](https://github.com/benages))
- Fix 3rd-Party Apps links \(Chrome & Firefox\) [\#2185](https://github.com/wallabag/wallabag/pull/2185) ([tcitworld](https://github.com/tcitworld))
- Change the way to login user in tests [\#2172](https://github.com/wallabag/wallabag/pull/2172) ([j0k3r](https://github.com/j0k3r))
- Fix a few french translations typos [\#2165](https://github.com/wallabag/wallabag/pull/2165) ([tcitworld](https://github.com/tcitworld))
- Update symlink to php-cs-fixer [\#2160](https://github.com/wallabag/wallabag/pull/2160) ([j0k3r](https://github.com/j0k3r))
- Handle only upper or only lower reading filter [\#2157](https://github.com/wallabag/wallabag/pull/2157) ([j0k3r](https://github.com/j0k3r))
- Try to find bad redirection after delete [\#2156](https://github.com/wallabag/wallabag/pull/2156) ([j0k3r](https://github.com/j0k3r))
- Use friendsofphp instead of fabpot [\#2155](https://github.com/wallabag/wallabag/pull/2155) ([j0k3r](https://github.com/j0k3r))
- translate documentation to German [\#2148](https://github.com/wallabag/wallabag/pull/2148) ([Strubbl](https://github.com/Strubbl))
- Corrected Regex for lighttpd rewrite [\#2145](https://github.com/wallabag/wallabag/pull/2145) ([even-allmighty](https://github.com/even-allmighty))
- Jump to Symfony 3.1 [\#2132](https://github.com/wallabag/wallabag/pull/2132) ([j0k3r](https://github.com/j0k3r))
## [2.0.5](https://github.com/wallabag/wallabag/tree/2.0.5) (2016-05-31)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.4...2.0.5)
- Improve English translation [\#2109](https://github.com/wallabag/wallabag/pull/2109) ([Poorchop](https://github.com/Poorchop))
- Update api.rst [\#2044](https://github.com/wallabag/wallabag/pull/2044) ([joshp23](https://github.com/joshp23))
- new details in the doc about the rights access again;\) [\#2038](https://github.com/wallabag/wallabag/pull/2038) ([foxmask](https://github.com/foxmask))
- Fix the deletion of Tags/Entries relation when delete an entry [\#2122](https://github.com/wallabag/wallabag/pull/2122) ([nicosomb](https://github.com/nicosomb))
- Docs proposal [\#2112](https://github.com/wallabag/wallabag/pull/2112) ([Poorchop](https://github.com/Poorchop))
- add screenshots of android docu in English [\#2111](https://github.com/wallabag/wallabag/pull/2111) ([Strubbl](https://github.com/Strubbl))
- CS [\#2098](https://github.com/wallabag/wallabag/pull/2098) ([j0k3r](https://github.com/j0k3r))
- Fix image path in 2-factor authentification email [\#2097](https://github.com/wallabag/wallabag/pull/2097) ([bmillemathias](https://github.com/bmillemathias))
- Update CONTRIBUTING file [\#2094](https://github.com/wallabag/wallabag/pull/2094) ([nicosomb](https://github.com/nicosomb))
- Replace vertical dots in material theme with horizontal dots [\#2093](https://github.com/wallabag/wallabag/pull/2093) ([nicosomb](https://github.com/nicosomb))
- Starred and Archived clears if article is already exists [\#2092](https://github.com/wallabag/wallabag/pull/2092) ([Rurik19](https://github.com/Rurik19))
- Do not specify language in Firefox addon link [\#2069](https://github.com/wallabag/wallabag/pull/2069) ([merwan](https://github.com/merwan))
- Added information about permissions on data/ [\#2068](https://github.com/wallabag/wallabag/pull/2068) ([mariovor](https://github.com/mariovor))
- Update CraueConfigBundle.it.yml [\#2054](https://github.com/wallabag/wallabag/pull/2054) ([jamiroconca](https://github.com/jamiroconca))
- Add unread filter to entries pages [\#2052](https://github.com/wallabag/wallabag/pull/2052) ([danbartram](https://github.com/danbartram))
- Update api.rst [\#2049](https://github.com/wallabag/wallabag/pull/2049) ([joshp23](https://github.com/joshp23))
## [2.0.4](https://github.com/wallabag/wallabag/tree/2.0.4) (2016-05-07)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.3...2.0.4)
- Change Travis/Scrutinizer pictures in README [\#2029](https://github.com/wallabag/wallabag/pull/2029) ([nicosomb](https://github.com/nicosomb))
- Docu for android app [\#2028](https://github.com/wallabag/wallabag/pull/2028) ([Strubbl](https://github.com/Strubbl))
- Update messages.it.yml [\#2024](https://github.com/wallabag/wallabag/pull/2024) ([jamiroconca](https://github.com/jamiroconca))
- Fix translation for validators [\#2023](https://github.com/wallabag/wallabag/pull/2023) ([nicosomb](https://github.com/nicosomb))
- Fix pagination bar on small devices [\#2022](https://github.com/wallabag/wallabag/pull/2022) ([nicosomb](https://github.com/nicosomb))
- Fix number of entries in tag/list [\#2020](https://github.com/wallabag/wallabag/pull/2020) ([nicosomb](https://github.com/nicosomb))
- Create CraueConfigBundle.it.yml [\#2019](https://github.com/wallabag/wallabag/pull/2019) ([jamiroconca](https://github.com/jamiroconca))
- Update config.yml, add italian as available language [\#2018](https://github.com/wallabag/wallabag/pull/2018) ([jamiroconca](https://github.com/jamiroconca))
- Create messages.it.yml [\#2017](https://github.com/wallabag/wallabag/pull/2017) ([jamiroconca](https://github.com/jamiroconca))
- Update documentation [\#2016](https://github.com/wallabag/wallabag/pull/2016) ([nicosomb](https://github.com/nicosomb))
- Fix tags listing [\#2013](https://github.com/wallabag/wallabag/pull/2013) ([nicosomb](https://github.com/nicosomb))
- integrate upgrade.rst [\#2012](https://github.com/wallabag/wallabag/pull/2012) ([biva](https://github.com/biva))
- upgrade.rst \(Creation of an upgrade page in the documentation\) [\#2011](https://github.com/wallabag/wallabag/pull/2011) ([biva](https://github.com/biva))
- Set the title via POST /api/entries [\#2010](https://github.com/wallabag/wallabag/pull/2010) ([nicosomb](https://github.com/nicosomb))
- Fix reading speed not defined when user was created via config page [\#2005](https://github.com/wallabag/wallabag/pull/2005) ([nicosomb](https://github.com/nicosomb))
- Fix old branch name urls [\#2001](https://github.com/wallabag/wallabag/pull/2001) ([tcitworld](https://github.com/tcitworld))
- Update CraueConfigBundle.es.yml [\#1992](https://github.com/wallabag/wallabag/pull/1992) ([jami7](https://github.com/jami7))
- Rights access to the folders of the project [\#1985](https://github.com/wallabag/wallabag/pull/1985) ([foxmask](https://github.com/foxmask))
- Es translation [\#1977](https://github.com/wallabag/wallabag/pull/1977) ([j0k3r](https://github.com/j0k3r))
- Fix filter reading time [\#1976](https://github.com/wallabag/wallabag/pull/1976) ([nicosomb](https://github.com/nicosomb))
- Fix typos in API documentation [\#1970](https://github.com/wallabag/wallabag/pull/1970) ([nicosomb](https://github.com/nicosomb))
- Create 3rd Resources chapter in API documentation [\#1969](https://github.com/wallabag/wallabag/pull/1969) ([nicosomb](https://github.com/nicosomb))
- Add FAQ page in documentation [\#1967](https://github.com/wallabag/wallabag/pull/1967) ([nicosomb](https://github.com/nicosomb))
## [2.0.3](https://github.com/wallabag/wallabag/tree/2.0.3) (2016-04-22)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.2...2.0.3)
- Update API documentation with cURL examples [\#1962](https://github.com/wallabag/wallabag/pull/1962) ([nicosomb](https://github.com/nicosomb))
## [2.0.2](https://github.com/wallabag/wallabag/tree/2.0.2) (2016-04-21)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9.2...2.0.2)
- Fix translation for Go to your account button after subscription [\#1957](https://github.com/wallabag/wallabag/pull/1957) ([nicosomb](https://github.com/nicosomb))
- Update links in documentation [\#1954](https://github.com/wallabag/wallabag/pull/1954) ([nicosomb](https://github.com/nicosomb))
- Actualisation des liens morts \(Documentation de traduction\) [\#1953](https://github.com/wallabag/wallabag/pull/1953) ([maxi62330](https://github.com/maxi62330))
- Added some curl examples [\#1945](https://github.com/wallabag/wallabag/pull/1945) ([ddeimeke](https://github.com/ddeimeke))
- Update Travis configuration with branches renaming [\#1944](https://github.com/wallabag/wallabag/pull/1944) ([nicosomb](https://github.com/nicosomb))
- Optimize import [\#1942](https://github.com/wallabag/wallabag/pull/1942) ([nicosomb](https://github.com/nicosomb))
## [1.9.2](https://github.com/wallabag/wallabag/tree/1.9.2) (2016-04-18)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.1...1.9.2)
## [2.0.1](https://github.com/wallabag/wallabag/tree/2.0.1) (2016-04-11)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.0...2.0.1)
## [2.0.0](https://github.com/wallabag/wallabag/tree/2.0.0) (2016-04-03)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.0-beta.2...2.0.0)
## [2.0.0-beta.2](https://github.com/wallabag/wallabag/tree/2.0.0-beta.2) (2016-03-12)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.0-beta.1...2.0.0-beta.2)
## [2.0.0-beta.1](https://github.com/wallabag/wallabag/tree/2.0.0-beta.1) (2016-03-01)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.0-alpha.2...2.0.0-beta.1)
## [2.0.0-alpha.2](https://github.com/wallabag/wallabag/tree/2.0.0-alpha.2) (2016-01-22)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.0-alpha.1...2.0.0-alpha.2)
## [2.0.0-alpha.1](https://github.com/wallabag/wallabag/tree/2.0.0-alpha.1) (2016-01-07)
[Full Changelog](https://github.com/wallabag/wallabag/compare/2.0.0-alpha.0...2.0.0-alpha.1)
## [2.0.0-alpha.0](https://github.com/wallabag/wallabag/tree/2.0.0-alpha.0) (2015-09-14)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9.1-b...2.0.0-alpha.0)
## [1.9.1-b](https://github.com/wallabag/wallabag/tree/1.9.1-b) (2015-08-04)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9.1...1.9.1-b)
## [1.9.1](https://github.com/wallabag/wallabag/tree/1.9.1) (2015-08-03)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9.1beta3...1.9.1)
## [1.9.1beta3](https://github.com/wallabag/wallabag/tree/1.9.1beta3) (2015-06-06)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9.1beta2...1.9.1beta3)
## [1.9.1beta2](https://github.com/wallabag/wallabag/tree/1.9.1beta2) (2015-05-09)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9.1beta1...1.9.1beta2)
## [1.9.1beta1](https://github.com/wallabag/wallabag/tree/1.9.1beta1) (2015-04-08)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9.1alpha2...1.9.1beta1)
## [1.9.1alpha2](https://github.com/wallabag/wallabag/tree/1.9.1alpha2) (2015-04-07)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9.1alpha1...1.9.1alpha2)
## [1.9.1alpha1](https://github.com/wallabag/wallabag/tree/1.9.1alpha1) (2015-03-08)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9...1.9.1alpha1)
## [1.9](https://github.com/wallabag/wallabag/tree/1.9) (2015-02-18)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9RC1...1.9)
## [1.9RC1](https://github.com/wallabag/wallabag/tree/1.9RC1) (2015-02-16)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9beta2...1.9RC1)
## [1.9beta2](https://github.com/wallabag/wallabag/tree/1.9beta2) (2015-02-15)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.9beta...1.9beta2)
## [1.9beta](https://github.com/wallabag/wallabag/tree/1.9beta) (2015-02-14)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.8.1old...1.9beta)
## [1.8.1old](https://github.com/wallabag/wallabag/tree/1.8.1old) (2014-11-16)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.8.1bis...1.8.1old)
## [1.8.1bis](https://github.com/wallabag/wallabag/tree/1.8.1bis) (2014-11-16)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.8.1b...1.8.1bis)
## [1.8.1b](https://github.com/wallabag/wallabag/tree/1.8.1b) (2014-11-16)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.8.1...1.8.1b)
## [1.8.1](https://github.com/wallabag/wallabag/tree/1.8.1) (2014-11-15)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.8.0...1.8.1)
## [1.8.0](https://github.com/wallabag/wallabag/tree/1.8.0) (2014-10-10)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.7.2...1.8.0)
## [1.7.2](https://github.com/wallabag/wallabag/tree/1.7.2) (2014-07-24)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.7.1...1.7.2)
## [1.7.1](https://github.com/wallabag/wallabag/tree/1.7.1) (2014-07-15)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.7.0...1.7.1)
## [1.7.0](https://github.com/wallabag/wallabag/tree/1.7.0) (2014-05-29)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.6.1b...1.7.0)
## [1.6.1b](https://github.com/wallabag/wallabag/tree/1.6.1b) (2014-04-11)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.6.1...1.6.1b)
## [1.6.1](https://github.com/wallabag/wallabag/tree/1.6.1) (2014-04-03)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.6.0...1.6.1)
## [1.6.0](https://github.com/wallabag/wallabag/tree/1.6.0) (2014-04-03)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.5.2...1.6.0)
## [1.5.2](https://github.com/wallabag/wallabag/tree/1.5.2) (2014-02-21)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.5.1.1...1.5.2)
## [1.5.1.1](https://github.com/wallabag/wallabag/tree/1.5.1.1) (2014-02-19)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.5.1...1.5.1.1)
## [1.5.1](https://github.com/wallabag/wallabag/tree/1.5.1) (2014-02-19)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.5.0...1.5.1)
## [1.5.0](https://github.com/wallabag/wallabag/tree/1.5.0) (2014-02-13)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.4.0...1.5.0)
## [1.4.0](https://github.com/wallabag/wallabag/tree/1.4.0) (2014-02-03)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.3.1...1.4.0)
## [1.3.1](https://github.com/wallabag/wallabag/tree/1.3.1) (2014-01-07)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.3.0...1.3.1)
## [1.3.0](https://github.com/wallabag/wallabag/tree/1.3.0) (2013-12-23)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.2.0...1.3.0)
## [1.2.0](https://github.com/wallabag/wallabag/tree/1.2.0) (2013-11-25)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.1.0...1.2.0)
## [1.1.0](https://github.com/wallabag/wallabag/tree/1.1.0) (2013-10-25)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.0.0...1.1.0)
## [1.0.0](https://github.com/wallabag/wallabag/tree/1.0.0) (2013-10-03)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.0-beta5.2...1.0.0)
## [1.0-beta5.2](https://github.com/wallabag/wallabag/tree/1.0-beta5.2) (2013-09-20)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.0-beta5.1...1.0-beta5.2)
## [1.0-beta5.1](https://github.com/wallabag/wallabag/tree/1.0-beta5.1) (2013-09-20)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.0-beta5...1.0-beta5.1)
## [1.0-beta5](https://github.com/wallabag/wallabag/tree/1.0-beta5) (2013-09-20)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.0-beta4...1.0-beta5)
## [1.0-beta4](https://github.com/wallabag/wallabag/tree/1.0-beta4) (2013-08-25)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.0-beta3...1.0-beta4)
## [1.0-beta3](https://github.com/wallabag/wallabag/tree/1.0-beta3) (2013-08-17)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.0-beta2...1.0-beta3)
## [1.0-beta2](https://github.com/wallabag/wallabag/tree/1.0-beta2) (2013-08-11)
[Full Changelog](https://github.com/wallabag/wallabag/compare/1.0-beta1...1.0-beta2)
## [1.0-beta1](https://github.com/wallabag/wallabag/tree/1.0-beta1) (2013-08-07)
[Full Changelog](https://github.com/wallabag/wallabag/compare/0.3...1.0-beta1)
## [0.3](https://github.com/wallabag/wallabag/tree/0.3) (2013-07-31)
[Full Changelog](https://github.com/wallabag/wallabag/compare/0.2.1...0.3)
## [0.2.1](https://github.com/wallabag/wallabag/tree/0.2.1) (2013-04-23)
[Full Changelog](https://github.com/wallabag/wallabag/compare/0.2...0.2.1)
## [0.2](https://github.com/wallabag/wallabag/tree/0.2) (2013-04-21)
[Full Changelog](https://github.com/wallabag/wallabag/compare/0.11...0.2)
## [0.11](https://github.com/wallabag/wallabag/tree/0.11) (2013-04-19)
[Full Changelog](https://github.com/wallabag/wallabag/compare/0.1...0.11)
## [0.1](https://github.com/wallabag/wallabag/tree/0.1) (2013-04-19)

View File

@@ -1,4 +1,4 @@
Copyright (c) 2013-2016 Nicolas Lœuillet
Copyright (c) 2013-2017 Nicolas Lœuillet
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

View File

@@ -7,6 +7,8 @@ require 'capistrano/setup'
# Include default deployment tasks
require 'capistrano/deploy'
require 'capistrano/composer'
require 'capistrano/file-permissions'
require 'capistrano/symfony'
# Load custom tasks from `lib/capistrano/tasks` if you have any defined

View File

@@ -1,5 +1,6 @@
source "https://rubygems.org"
gem 'capistrano', '~> 3.4'
gem 'capistrano-composer'
gem 'capistrano-symfony', '~> 1.0.0.rc1'
gem 'capistrano-composer', '~> 0.0.3'
gem 'capistrano-file-permissions'

View File

@@ -29,8 +29,9 @@ PLATFORMS
DEPENDENCIES
capistrano (~> 3.4)
capistrano-composer (~> 0.0.3)
capistrano-composer
capistrano-file-permissions
capistrano-symfony (~> 1.0.0.rc1)
BUNDLED WITH
1.11.2
1.13.5

52
Makefile Executable file
View File

@@ -0,0 +1,52 @@
TMP_FOLDER=/tmp
RELEASE_FOLDER=wllbg-release
ENV ?= prod
help: ## Display this help menu
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
clean: ## Clear the application cache
rm -rf var/cache/*
install: ## Install wallabag with the latest version
@sh scripts/install.sh $(ENV)
update: ## Update the wallabag installation to the latest version
@sh scripts/update.sh $(ENV)
dev: ## Install the latest dev version
@sh scripts/dev.sh
run: ## Run the wallabag built-in server
@php bin/console server:run --env=dev
build: ## Run webpack
@npm run build:$(ENV)
prepare: clean ## Prepare database for testsuite
ifdef DB
cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml
endif
-php bin/console doctrine:database:drop --force --env=test
php bin/console doctrine:database:create --env=test
php bin/console doctrine:migrations:migrate --no-interaction --env=test
fixtures: ## Load fixtures into database
php bin/console doctrine:fixtures:load --no-interaction --env=test
test: prepare fixtures ## Launch wallabag testsuite
bin/simple-phpunit -v
release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
ifndef VERSION
$(error VERSION is not set)
endif
@sh scripts/release.sh $(VERSION) $(TMP_FOLDER) $(RELEASE_FOLDER) $(ENV)
deploy: ## Deploy wallabag
@bundle exec cap staging deploy
.PHONY: help clean prepare install fixtures update build test release deploy run dev
.DEFAULT_GOAL := install

View File

@@ -1,28 +1,35 @@
[![Build Status](https://api.travis-ci.org/wallabag/wallabag.svg?branch=master)](https://travis-ci.org/wallabag/wallabag)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=master)
[![Gitter](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/wallabag/wallabag)
# What is wallabag?
wallabag is a self hostable application allowing you to not miss any content anymore.
wallabag is a self-hostable PHP application allowing you to not miss any content anymore.
Click, save and read it when you can. It extracts content so that you can read it when you have time.
More informations on our website: [wallabag.org](https://wallabag.org)
More information on our website: [wallabag.org](https://wallabag.org).
If you do not have your own server, consider [the wallabag.it hosting solution](https://wallabag.it).
![wallabag logo](https://raw.githubusercontent.com/wallabag/logo/master/_default/typo-horizontal/png/sm/logo-typo-horizontal-black-no-bg-no-border-sm.png)
# Install wallabag
Please read [the documentation to see the wallabag requirements](http://doc.wallabag.org/en/master/user/installation.html#requirements).
If you don't have it yet, please [install composer](https://getcomposer.org/download/).
Then you can install wallabag by executing the following commands:
```
git clone https://github.com/wallabag/wallabag.git
cd wallabag
git checkout 2.0.5
SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
php bin/console wallabag:install --env=prod
php bin/console server:run --env=prod
git clone https://github.com/wallabag/wallabag.git
cd wallabag && make install
```
## License
Copyright © 2013-2016 Nicolas Lœuillet <nicolas@loeuillet.org>
Now, [configure a virtual host](https://doc.wallabag.org/en/admin/installation/virtualhosts.html) to use your wallabag.
# Run on YunoHost
[![Install Wallabag with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=wallabag2)
Wallabag app for [YunoHost](https://yunohost.org). See [here](https://github.com/YunoHost-Apps/wallabag2_ynh)
# License
Copyright © 2013-2018 Nicolas Lœuillet <nicolas@loeuillet.org>
This work is free. You can redistribute it and/or modify it under the
terms of the MIT License. See the COPYING file for more details.

View File

@@ -1,47 +1,58 @@
## Definition
A release is mostly a git tag of http://github.com/wallabag/wallabag, following [semantic versioning](http://semver.org).
The last release at the time of writing is 2.0.0-alpha.2, from the v2 branch.
### Steps to release
During this documentation, we assume the release is `release-2.0.0-beta.1`.
During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE`.
#### Files to edit
- `app/config/config.yml` (`wallabag_core.version`)
- `README.md` (`composer create-project` command)
- `docs/en/user/installation.rst` and its translations (`composer create-project` command)
- `app/config/wallabag.yml` (`wallabag_core.version`)
- `CHANGELOG.md`
#### Create release on GitHub
- Run these commands to create the tag:
```
git checkout v2
git pull origin v2
git checkout -b release-2.0.0-beta.1
SYMFONY_ENV=prod composer up --no-dev
git add --force composer.lock
git add README.md
git commit -m "Release wallabag 2.0.0-beta.1"
git push origin release-2.0.0-beta.1
git checkout master
git pull origin master
git checkout -b release-$LAST_WALLABAG_RELEASE
SYMFONY_ENV=prod composer up --no-dev
```
- Create a new pull request with this title `DON'T MERGE Release wallabag 2.0.0-beta.1`. This pull request is used to launch builds on Travis-CI.
- Run these commands to create the package:
- Update `.travis.yml` file and replace the composer line with this one:
```diff
script:
- - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
+ - travis_wait composer update --no-interaction --no-progress
```
- Then continue with these commands:
```
git clone git@github.com:wallabag/wallabag.git -b release-2.0.0-beta.1 release-2.0.0-beta.1
SYMFONY_ENV=prod composer up -d=release-2.0.0-beta.1 --no-dev
tar czf wallabag-release-2.0.0-beta.1.tar.gz --exclude="var/*" --exclude=".git" release-2.0.0-beta.1
git add --force composer.lock .travis.yml
git commit -m "Release wallabag $LAST_WALLABAG_RELEASE"
git push origin release-$LAST_WALLABAG_RELEASE
```
- Create a new pull request with this title `DON'T MERGE Release wallabag $LAST_WALLABAG_RELEASE`. This pull request is used to launch builds on Travis-CI.
- Run these command to create the package:
```
make release master /tmp wllbg-release prod
```
- [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new). You have to upload on this page the package.
- Delete the `release-2.0.0-beta.1` branch and close the pull request (**DO NOT MERGE IT**).
- Update the URL shortener (used on `wllbg.org` to generate links like `http://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`)
- Delete the `release-$LAST_WALLABAG_RELEASE` branch and close the pull request (**DO NOT MERGE IT**).
- Update the URL shortener (used on `wllbg.org` to generate links like `https://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`)
- Update [the downloads page](https://github.com/wallabag/wallabag.org/blob/master/content/pages/download.md) on the website (MD5 sum, release date)
- Drink a beer!
- Update Dockerfile https://github.com/wallabag/docker (and create a new tag)
- Update wallabag.org website (downloads, releases and new blog post)
- Put the next patch version suffixed with `-dev` in `app/config/config.yml` (`wallabag_core.version`)
- Drink a :beer:!
### `composer.lock`
A release tag must contain a `composer.lock` file. It sets which dependencies were available at the time a release was done,

View File

@@ -1,7 +1,7 @@
<?php
use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\Config\Loader\LoaderInterface;
use Symfony\Component\HttpKernel\Kernel;
class AppKernel extends Kernel
{
@@ -13,7 +13,6 @@ class AppKernel extends Kernel
new Symfony\Bundle\TwigBundle\TwigBundle(),
new Symfony\Bundle\MonologBundle\MonologBundle(),
new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
new Symfony\Bundle\AsseticBundle\AsseticBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new FOS\RestBundle\FOSRestBundle(),
@@ -30,8 +29,9 @@ class AppKernel extends Kernel
new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
new Craue\ConfigBundle\CraueConfigBundle(),
new Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(),
new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
new BD\GuzzleSiteAuthenticatorBundle\BDGuzzleSiteAuthenticatorBundle(),
// wallabag bundles
new Wallabag\CoreBundle\WallabagCoreBundle(),
@@ -39,6 +39,7 @@ class AppKernel extends Kernel
new Wallabag\UserBundle\WallabagUserBundle(),
new Wallabag\ImportBundle\WallabagImportBundle(),
new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
];
if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
@@ -47,28 +48,43 @@ class AppKernel extends Kernel
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
$bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();
$bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
if ('test' === $this->getEnvironment()) {
$bundles[] = new DAMA\DoctrineTestBundle\DAMADoctrineTestBundle();
}
}
return $bundles;
}
public function getRootDir()
{
return __DIR__;
}
public function getCacheDir()
{
return dirname(__DIR__).'/var/cache/'.$this->getEnvironment();
return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
}
public function getLogDir()
{
return dirname(__DIR__).'/var/logs';
return dirname(__DIR__) . '/var/logs';
}
public function registerContainerConfiguration(LoaderInterface $loader)
{
$loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
$loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml');
$loader->load(function ($container) {
if ($container->getParameter('use_webpack_dev_server')) {
$container->loadFromExtension('framework', [
'assets' => [
'base_url' => 'http://localhost:8080/',
],
]);
} else {
$container->loadFromExtension('framework', [
'assets' => [
'base_url' => $container->getParameter('domain_name'),
],
]);
}
});
}
}

View File

@@ -0,0 +1,188 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Initial database structure.
*/
class Version20160401000000 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->skipIf($schema->hasTable($this->getTable('entry')), 'Database already initialized');
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'sqlite':
$sql = <<<SQL
CREATE TABLE {$this->getTable('craue_config_setting')} (name VARCHAR(255) NOT NULL, value VARCHAR(255) DEFAULT NULL, section VARCHAR(255) DEFAULT NULL, PRIMARY KEY(name));
CREATE UNIQUE INDEX UNIQ_5D9649505E237E06 ON {$this->getTable('craue_config_setting')} (name);
CREATE TABLE {$this->getTable('tagging_rule')} (id INTEGER NOT NULL, config_id INTEGER DEFAULT NULL, rule VARCHAR(255) NOT NULL, tags CLOB NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_2D9B3C5424DB0683 FOREIGN KEY (config_id) REFERENCES {$this->getTable('config')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
CREATE INDEX IDX_2D9B3C5424DB0683 ON {$this->getTable('tagging_rule')} (config_id);
CREATE TABLE {$this->getTable('tag')} (id INTEGER NOT NULL, label CLOB NOT NULL, slug VARCHAR(128) NOT NULL, PRIMARY KEY(id));
CREATE UNIQUE INDEX UNIQ_4CA58A8C989D9B62 ON {$this->getTable('tag')} (slug);
CREATE TABLE {$this->getTable('entry')} (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, title CLOB DEFAULT NULL, url CLOB DEFAULT NULL, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL, language CLOB DEFAULT NULL, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL, preview_picture CLOB DEFAULT NULL, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id), CONSTRAINT FK_F4D18282A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
CREATE INDEX IDX_F4D18282A76ED395 ON {$this->getTable('entry')} (user_id);
CREATE TABLE {$this->getTable('entry_tag')} (entry_id INTEGER NOT NULL, tag_id INTEGER NOT NULL, PRIMARY KEY(entry_id, tag_id), CONSTRAINT FK_C9F0DD7CBA364942 FOREIGN KEY (entry_id) REFERENCES {$this->getTable('entry')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_C9F0DD7CBAD26311 FOREIGN KEY (tag_id) REFERENCES {$this->getTable('tag')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
CREATE INDEX IDX_C9F0DD7CBA364942 ON {$this->getTable('entry_tag')} (entry_id);
CREATE INDEX IDX_C9F0DD7CBAD26311 ON {$this->getTable('entry_tag')} (tag_id);
CREATE TABLE {$this->getTable('config')} (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, theme VARCHAR(255) NOT NULL, items_per_page INTEGER NOT NULL, language VARCHAR(255) NOT NULL, rss_token VARCHAR(255) DEFAULT NULL, rss_limit INTEGER DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, PRIMARY KEY(id), CONSTRAINT FK_87E64C53A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
CREATE UNIQUE INDEX UNIQ_87E64C53A76ED395 ON {$this->getTable('config')} (user_id);
CREATE TABLE {$this->getTable('oauth2_refresh_tokens')} (id INTEGER NOT NULL, client_id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INTEGER DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id), CONSTRAINT FK_20C9FB2419EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_20C9FB24A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
CREATE UNIQUE INDEX UNIQ_20C9FB245F37A13B ON {$this->getTable('oauth2_refresh_tokens')} (token);
CREATE INDEX IDX_20C9FB2419EB6921 ON {$this->getTable('oauth2_refresh_tokens')} (client_id);
CREATE INDEX IDX_20C9FB24A76ED395 ON {$this->getTable('oauth2_refresh_tokens')} (user_id);
CREATE TABLE {$this->getTable('oauth2_access_tokens')} (id INTEGER NOT NULL, client_id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INTEGER DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id), CONSTRAINT FK_368A420919EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_368A4209A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
CREATE UNIQUE INDEX UNIQ_368A42095F37A13B ON {$this->getTable('oauth2_access_tokens')} (token);
CREATE INDEX IDX_368A420919EB6921 ON {$this->getTable('oauth2_access_tokens')} (client_id);
CREATE INDEX IDX_368A4209A76ED395 ON {$this->getTable('oauth2_access_tokens')} (user_id);
CREATE TABLE {$this->getTable('oauth2_auth_codes')} (id INTEGER NOT NULL, client_id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, token VARCHAR(255) NOT NULL, redirect_uri CLOB NOT NULL, expires_at INTEGER DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id), CONSTRAINT FK_EE52E3FA19EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_EE52E3FAA76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
CREATE UNIQUE INDEX UNIQ_EE52E3FA5F37A13B ON {$this->getTable('oauth2_auth_codes')} (token);
CREATE INDEX IDX_EE52E3FA19EB6921 ON {$this->getTable('oauth2_auth_codes')} (client_id);
CREATE INDEX IDX_EE52E3FAA76ED395 ON {$this->getTable('oauth2_auth_codes')} (user_id);
CREATE TABLE {$this->getTable('oauth2_clients')} (id INTEGER NOT NULL, random_id VARCHAR(255) NOT NULL, redirect_uris CLOB NOT NULL, secret VARCHAR(255) NOT NULL, allowed_grant_types CLOB NOT NULL, PRIMARY KEY(id));
CREATE TABLE {$this->getTable('user')} (id INTEGER NOT NULL, username VARCHAR(180) NOT NULL, username_canonical VARCHAR(180) NOT NULL, email VARCHAR(180) NOT NULL, email_canonical VARCHAR(180) NOT NULL, enabled BOOLEAN NOT NULL, salt VARCHAR(255) NOT NULL, password VARCHAR(255) NOT NULL, last_login DATETIME DEFAULT NULL, locked BOOLEAN NOT NULL, expired BOOLEAN NOT NULL, expires_at DATETIME DEFAULT NULL, confirmation_token VARCHAR(255) DEFAULT NULL, password_requested_at DATETIME DEFAULT NULL, roles CLOB NOT NULL, credentials_expired BOOLEAN NOT NULL, credentials_expire_at DATETIME DEFAULT NULL, name CLOB DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, authCode INTEGER DEFAULT NULL, twoFactorAuthentication BOOLEAN NOT NULL, trusted CLOB DEFAULT NULL, PRIMARY KEY(id));
CREATE UNIQUE INDEX UNIQ_1D63E7E592FC23A8 ON {$this->getTable('user')} (username_canonical);
CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON {$this->getTable('user')} (email_canonical);
CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON {$this->getTable('user')} (confirmation_token);
CREATE TABLE {$this->getTable('annotation')} (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, entry_id INTEGER DEFAULT NULL, text CLOB NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, quote VARCHAR(255) NOT NULL, ranges CLOB NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_A7AED006A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_A7AED006BA364942 FOREIGN KEY (entry_id) REFERENCES {$this->getTable('entry')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
CREATE INDEX IDX_A7AED006A76ED395 ON {$this->getTable('annotation')} (user_id);
CREATE INDEX IDX_A7AED006BA364942 ON {$this->getTable('annotation')} (entry_id);
SQL
;
foreach (explode("\n", $sql) as $query) {
$this->addSql($query);
}
break;
case 'mysql':
$sql = <<<SQL
CREATE TABLE {$this->getTable('craue_config_setting')} (name VARCHAR(255) NOT NULL, value VARCHAR(255) DEFAULT NULL, section VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_5D9649505E237E06 (name), PRIMARY KEY(name)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('entry')} (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, title LONGTEXT DEFAULT NULL, url LONGTEXT DEFAULT NULL, is_archived TINYINT(1) NOT NULL, is_starred TINYINT(1) NOT NULL, content LONGTEXT DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype LONGTEXT DEFAULT NULL, language LONGTEXT DEFAULT NULL, reading_time INT DEFAULT NULL, domain_name LONGTEXT DEFAULT NULL, preview_picture LONGTEXT DEFAULT NULL, is_public TINYINT(1) DEFAULT '0', INDEX IDX_F4D18282A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('entry_tag')} (entry_id INT NOT NULL, tag_id INT NOT NULL, INDEX IDX_C9F0DD7CBA364942 (entry_id), INDEX IDX_C9F0DD7CBAD26311 (tag_id), PRIMARY KEY(entry_id, tag_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('config')} (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, theme VARCHAR(255) NOT NULL, items_per_page INT NOT NULL, language VARCHAR(255) NOT NULL, rss_token VARCHAR(255) DEFAULT NULL, rss_limit INT DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, UNIQUE INDEX UNIQ_87E64C53A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('tagging_rule')} (id INT AUTO_INCREMENT NOT NULL, config_id INT DEFAULT NULL, rule VARCHAR(255) NOT NULL, tags LONGTEXT NOT NULL COMMENT '(DC2Type:simple_array)', INDEX IDX_2D9B3C5424DB0683 (config_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('tag')} (id INT AUTO_INCREMENT NOT NULL, `label` LONGTEXT NOT NULL, slug VARCHAR(128) NOT NULL, UNIQUE INDEX UNIQ_4CA58A8C989D9B62 (slug), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('oauth2_clients')} (id INT AUTO_INCREMENT NOT NULL, random_id VARCHAR(255) NOT NULL, redirect_uris LONGTEXT NOT NULL COMMENT '(DC2Type:array)', secret VARCHAR(255) NOT NULL, allowed_grant_types LONGTEXT NOT NULL COMMENT '(DC2Type:array)', PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('oauth2_access_tokens')} (id INT AUTO_INCREMENT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_368A42095F37A13B (token), INDEX IDX_368A420919EB6921 (client_id), INDEX IDX_368A4209A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('oauth2_refresh_tokens')} (id INT AUTO_INCREMENT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_20C9FB245F37A13B (token), INDEX IDX_20C9FB2419EB6921 (client_id), INDEX IDX_20C9FB24A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('oauth2_auth_codes')} (id INT AUTO_INCREMENT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, redirect_uri LONGTEXT NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_EE52E3FA5F37A13B (token), INDEX IDX_EE52E3FA19EB6921 (client_id), INDEX IDX_EE52E3FAA76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('user')} (id INT AUTO_INCREMENT NOT NULL, username VARCHAR(180) NOT NULL, username_canonical VARCHAR(180) NOT NULL, email VARCHAR(180) NOT NULL, email_canonical VARCHAR(180) NOT NULL, enabled TINYINT(1) NOT NULL, salt VARCHAR(255) NOT NULL, password VARCHAR(255) NOT NULL, last_login DATETIME DEFAULT NULL, locked TINYINT(1) NOT NULL, expired TINYINT(1) NOT NULL, expires_at DATETIME DEFAULT NULL, confirmation_token VARCHAR(255) DEFAULT NULL, password_requested_at DATETIME DEFAULT NULL, roles LONGTEXT NOT NULL COMMENT '(DC2Type:array)', credentials_expired TINYINT(1) NOT NULL, credentials_expire_at DATETIME DEFAULT NULL, name LONGTEXT DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, authCode INT DEFAULT NULL, twoFactorAuthentication TINYINT(1) NOT NULL, trusted LONGTEXT DEFAULT NULL COMMENT '(DC2Type:json_array)', UNIQUE INDEX UNIQ_1D63E7E592FC23A8 (username_canonical), UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF (email_canonical), UNIQUE INDEX UNIQ_1D63E7E5C05FB297 (confirmation_token), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
CREATE TABLE {$this->getTable('annotation')} (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, entry_id INT DEFAULT NULL, text LONGTEXT NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, quote VARCHAR(255) NOT NULL, ranges LONGTEXT NOT NULL COMMENT '(DC2Type:array)', INDEX IDX_A7AED006A76ED395 (user_id), INDEX IDX_A7AED006BA364942 (entry_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
ALTER TABLE {$this->getTable('entry')} ADD CONSTRAINT FK_F4D18282A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id);
ALTER TABLE {$this->getTable('entry_tag')} ADD CONSTRAINT FK_C9F0DD7CBA364942 FOREIGN KEY (entry_id) REFERENCES {$this->getTable('entry')} (id);
ALTER TABLE {$this->getTable('entry_tag')} ADD CONSTRAINT FK_C9F0DD7CBAD26311 FOREIGN KEY (tag_id) REFERENCES {$this->getTable('tag')} (id);
ALTER TABLE {$this->getTable('config')} ADD CONSTRAINT FK_87E64C53A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id);
ALTER TABLE {$this->getTable('tagging_rule')} ADD CONSTRAINT FK_2D9B3C5424DB0683 FOREIGN KEY (config_id) REFERENCES {$this->getTable('config')} (id);
ALTER TABLE {$this->getTable('oauth2_access_tokens')} ADD CONSTRAINT FK_368A420919EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id);
ALTER TABLE {$this->getTable('oauth2_access_tokens')} ADD CONSTRAINT FK_368A4209A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id);
ALTER TABLE {$this->getTable('oauth2_refresh_tokens')} ADD CONSTRAINT FK_20C9FB2419EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id);
ALTER TABLE {$this->getTable('oauth2_refresh_tokens')} ADD CONSTRAINT FK_20C9FB24A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id);
ALTER TABLE {$this->getTable('oauth2_auth_codes')} ADD CONSTRAINT FK_EE52E3FA19EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id);
ALTER TABLE {$this->getTable('oauth2_auth_codes')} ADD CONSTRAINT FK_EE52E3FAA76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id);
ALTER TABLE {$this->getTable('annotation')} ADD CONSTRAINT FK_A7AED006A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id);
ALTER TABLE {$this->getTable('annotation')} ADD CONSTRAINT FK_A7AED006BA364942 FOREIGN KEY (entry_id) REFERENCES {$this->getTable('entry')} (id);
SQL
;
foreach (explode("\n", $sql) as $query) {
$this->addSql($query);
}
break;
case 'postgresql':
$sql = <<<SQL
CREATE TABLE {$this->getTable('craue_config_setting')} (name VARCHAR(255) NOT NULL, value VARCHAR(255) DEFAULT NULL, section VARCHAR(255) DEFAULT NULL, PRIMARY KEY(name));
CREATE UNIQUE INDEX UNIQ_5D9649505E237E06 ON {$this->getTable('craue_config_setting')} (name);
CREATE TABLE {$this->getTable('entry')} (id INT NOT NULL, user_id INT DEFAULT NULL, title TEXT DEFAULT NULL, url TEXT DEFAULT NULL, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content TEXT DEFAULT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, mimetype TEXT DEFAULT NULL, language TEXT DEFAULT NULL, reading_time INT DEFAULT NULL, domain_name TEXT DEFAULT NULL, preview_picture TEXT DEFAULT NULL, is_public BOOLEAN DEFAULT 'false', PRIMARY KEY(id));
CREATE INDEX IDX_F4D18282A76ED395 ON {$this->getTable('entry')} (user_id);
CREATE TABLE {$this->getTable('entry_tag')} (entry_id INT NOT NULL, tag_id INT NOT NULL, PRIMARY KEY(entry_id, tag_id));
CREATE INDEX IDX_C9F0DD7CBA364942 ON {$this->getTable('entry_tag')} (entry_id);
CREATE INDEX IDX_C9F0DD7CBAD26311 ON {$this->getTable('entry_tag')} (tag_id);
CREATE TABLE {$this->getTable('config')} (id INT NOT NULL, user_id INT DEFAULT NULL, theme VARCHAR(255) NOT NULL, items_per_page INT NOT NULL, language VARCHAR(255) NOT NULL, rss_token VARCHAR(255) DEFAULT NULL, rss_limit INT DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, PRIMARY KEY(id));
CREATE UNIQUE INDEX UNIQ_87E64C53A76ED395 ON {$this->getTable('config')} (user_id);
CREATE TABLE {$this->getTable('tagging_rule')} (id INT NOT NULL, config_id INT DEFAULT NULL, rule VARCHAR(255) NOT NULL, tags TEXT NOT NULL, PRIMARY KEY(id));
CREATE INDEX IDX_2D9B3C5424DB0683 ON {$this->getTable('tagging_rule')} (config_id);
COMMENT ON COLUMN {$this->getTable('tagging_rule')}.tags IS '(DC2Type:simple_array)';
CREATE TABLE {$this->getTable('tag')} (id INT NOT NULL, label TEXT NOT NULL, slug VARCHAR(128) NOT NULL, PRIMARY KEY(id));
CREATE UNIQUE INDEX UNIQ_4CA58A8C989D9B62 ON {$this->getTable('tag')} (slug);
CREATE TABLE {$this->getTable('oauth2_clients')} (id INT NOT NULL, random_id VARCHAR(255) NOT NULL, redirect_uris TEXT NOT NULL, secret VARCHAR(255) NOT NULL, allowed_grant_types TEXT NOT NULL, PRIMARY KEY(id));
COMMENT ON COLUMN {$this->getTable('oauth2_clients')}.redirect_uris IS '(DC2Type:array)';
COMMENT ON COLUMN {$this->getTable('oauth2_clients')}.allowed_grant_types IS '(DC2Type:array)';
CREATE TABLE {$this->getTable('oauth2_access_tokens')} (id INT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id));
CREATE UNIQUE INDEX UNIQ_368A42095F37A13B ON {$this->getTable('oauth2_access_tokens')} (token);
CREATE INDEX IDX_368A420919EB6921 ON {$this->getTable('oauth2_access_tokens')} (client_id);
CREATE INDEX IDX_368A4209A76ED395 ON {$this->getTable('oauth2_access_tokens')} (user_id);
CREATE TABLE {$this->getTable('oauth2_refresh_tokens')} (id INT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id));
CREATE UNIQUE INDEX UNIQ_20C9FB245F37A13B ON {$this->getTable('oauth2_refresh_tokens')} (token);
CREATE INDEX IDX_20C9FB2419EB6921 ON {$this->getTable('oauth2_refresh_tokens')} (client_id);
CREATE INDEX IDX_20C9FB24A76ED395 ON {$this->getTable('oauth2_refresh_tokens')} (user_id);
CREATE TABLE {$this->getTable('oauth2_auth_codes')} (id INT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, redirect_uri TEXT NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id));
CREATE UNIQUE INDEX UNIQ_EE52E3FA5F37A13B ON {$this->getTable('oauth2_auth_codes')} (token);
CREATE INDEX IDX_EE52E3FA19EB6921 ON {$this->getTable('oauth2_auth_codes')} (client_id);
CREATE INDEX IDX_EE52E3FAA76ED395 ON {$this->getTable('oauth2_auth_codes')} (user_id);
CREATE TABLE {$this->getTable('user')} (id INT NOT NULL, username VARCHAR(180) NOT NULL, username_canonical VARCHAR(180) NOT NULL, email VARCHAR(180) NOT NULL, email_canonical VARCHAR(180) NOT NULL, enabled BOOLEAN NOT NULL, salt VARCHAR(255) NOT NULL, password VARCHAR(255) NOT NULL, last_login TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, locked BOOLEAN NOT NULL, expired BOOLEAN NOT NULL, expires_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, confirmation_token VARCHAR(255) DEFAULT NULL, password_requested_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, roles TEXT NOT NULL, credentials_expired BOOLEAN NOT NULL, credentials_expire_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, name TEXT DEFAULT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, authCode INT DEFAULT NULL, twoFactorAuthentication BOOLEAN NOT NULL, trusted TEXT DEFAULT NULL, PRIMARY KEY(id));
CREATE UNIQUE INDEX UNIQ_1D63E7E592FC23A8 ON {$this->getTable('user')} (username_canonical);
CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON {$this->getTable('user')} (email_canonical);
CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON {$this->getTable('user')} (confirmation_token);
COMMENT ON COLUMN {$this->getTable('user')}.roles IS '(DC2Type:array)';
COMMENT ON COLUMN {$this->getTable('user')}.trusted IS '(DC2Type:json_array)';
CREATE TABLE {$this->getTable('annotation')} (id INT NOT NULL, user_id INT DEFAULT NULL, entry_id INT DEFAULT NULL, text TEXT NOT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, quote VARCHAR(255) NOT NULL, ranges TEXT NOT NULL, PRIMARY KEY(id));
CREATE INDEX IDX_A7AED006A76ED395 ON {$this->getTable('annotation')} (user_id);
CREATE INDEX IDX_A7AED006BA364942 ON {$this->getTable('annotation')} (entry_id);
COMMENT ON COLUMN {$this->getTable('annotation')}.ranges IS '(DC2Type:array)';
CREATE SEQUENCE "entry_id_seq" INCREMENT BY 1 MINVALUE 1 START 1;
CREATE SEQUENCE "config_id_seq" INCREMENT BY 1 MINVALUE 1 START 1;
CREATE SEQUENCE "tagging_rule_id_seq" INCREMENT BY 1 MINVALUE 1 START 1;
CREATE SEQUENCE "tag_id_seq" INCREMENT BY 1 MINVALUE 1 START 1;
CREATE SEQUENCE oauth2_clients_id_seq INCREMENT BY 1 MINVALUE 1 START 1;
CREATE SEQUENCE oauth2_access_tokens_id_seq INCREMENT BY 1 MINVALUE 1 START 1;
CREATE SEQUENCE oauth2_refresh_tokens_id_seq INCREMENT BY 1 MINVALUE 1 START 1;
CREATE SEQUENCE oauth2_auth_codes_id_seq INCREMENT BY 1 MINVALUE 1 START 1;
CREATE SEQUENCE "user_id_seq" INCREMENT BY 1 MINVALUE 1 START 1;
CREATE SEQUENCE annotation_id_seq INCREMENT BY 1 MINVALUE 1 START 1;
ALTER TABLE {$this->getTable('entry')} ADD CONSTRAINT FK_F4D18282A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('entry_tag')} ADD CONSTRAINT FK_C9F0DD7CBA364942 FOREIGN KEY (entry_id) REFERENCES {$this->getTable('entry')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('entry_tag')} ADD CONSTRAINT FK_C9F0DD7CBAD26311 FOREIGN KEY (tag_id) REFERENCES {$this->getTable('tag')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('config')} ADD CONSTRAINT FK_87E64C53A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('tagging_rule')} ADD CONSTRAINT FK_2D9B3C5424DB0683 FOREIGN KEY (config_id) REFERENCES {$this->getTable('config')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('oauth2_access_tokens')} ADD CONSTRAINT FK_368A420919EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('oauth2_access_tokens')} ADD CONSTRAINT FK_368A4209A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('oauth2_refresh_tokens')} ADD CONSTRAINT FK_20C9FB2419EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('oauth2_refresh_tokens')} ADD CONSTRAINT FK_20C9FB24A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('oauth2_auth_codes')} ADD CONSTRAINT FK_EE52E3FA19EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('oauth2_auth_codes')} ADD CONSTRAINT FK_EE52E3FAA76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('annotation')} ADD CONSTRAINT FK_A7AED006A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
ALTER TABLE {$this->getTable('annotation')} ADD CONSTRAINT FK_A7AED006BA364942 FOREIGN KEY (entry_id) REFERENCES {$this->getTable('entry')} (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
SQL
;
foreach (explode("\n", $sql) as $query) {
$this->addSql($query);
}
break;
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql("DROP TABLE {$this->getTable('craue_config_setting')}");
$this->addSql("DROP TABLE {$this->getTable('tagging_rule')}");
$this->addSql("DROP TABLE {$this->getTable('config')}");
$this->addSql("DROP TABLE {$this->getTable('entry')}");
$this->addSql("DROP TABLE {$this->getTable('entry_tag')}");
$this->addSql("DROP TABLE {$this->getTable('tag')}");
$this->addSql("DROP TABLE {$this->getTable('oauth2_refresh_tokens')}");
$this->addSql("DROP TABLE {$this->getTable('oauth2_access_tokens')}");
$this->addSql("DROP TABLE {$this->getTable('oauth2_clients')}");
$this->addSql("DROP TABLE {$this->getTable('oauth2_auth_codes')}");
$this->addSql("DROP TABLE {$this->getTable('user')}");
$this->addSql("DROP TABLE {$this->getTable('annotation')}");
}
}

View File

@@ -0,0 +1,47 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added foreign keys for account resetting.
*/
class Version20160410190541 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasColumn('uid') || $entryTable->hasColumn('uuid'), 'It seems that you already played this migration.');
$entryTable->addColumn('uid', 'string', [
'notnull' => false,
'length' => 23,
]);
$sharePublic = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_public'");
if (false === $sharePublic) {
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('share_public', '1', 'entry')");
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$entryTable->dropColumn('uid');
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_public'");
}
}

View File

@@ -0,0 +1,56 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added name field on wallabag_oauth2_clients.
*/
class Version20160812120952 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
$this->skipIf($clientsTable->hasColumn('name'), 'It seems that you already played this migration.');
if ('sqlite' === $this->connection->getDatabasePlatform()->getName()) {
// Can't use $clientsTable->addColumn('name', 'blob');
// because of the error:
// SQLSTATE[HY000]: General error: 1 Cannot add a NOT NULL column with default value NULL
$databaseTablePrefix = $this->container->getParameter('database_table_prefix');
$this->addSql('CREATE TEMPORARY TABLE __temp__' . $databaseTablePrefix . 'oauth2_clients AS SELECT id, random_id, redirect_uris, secret, allowed_grant_types FROM ' . $databaseTablePrefix . 'oauth2_clients');
$this->addSql('DROP TABLE ' . $databaseTablePrefix . 'oauth2_clients');
$this->addSql('CREATE TABLE ' . $databaseTablePrefix . 'oauth2_clients (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, random_id VARCHAR(255) NOT NULL COLLATE BINARY, secret VARCHAR(255) NOT NULL COLLATE BINARY, redirect_uris CLOB NOT NULL, allowed_grant_types CLOB NOT NULL, name CLOB NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_635D765EA76ED395 FOREIGN KEY (user_id) REFERENCES "' . $databaseTablePrefix . 'user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
$this->addSql('INSERT INTO ' . $databaseTablePrefix . 'oauth2_clients (id, random_id, redirect_uris, secret, allowed_grant_types) SELECT id, random_id, redirect_uris, secret, allowed_grant_types FROM __temp__' . $databaseTablePrefix . 'oauth2_clients');
$this->addSql('DROP TABLE __temp__' . $databaseTablePrefix . 'oauth2_clients');
$this->addSql('CREATE INDEX IDX_635D765EA76ED395 ON ' . $databaseTablePrefix . 'oauth2_clients (user_id)');
} else {
$clientsTable->addColumn('name', 'blob');
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
if ('sqlite' === $this->connection->getDatabasePlatform()->getName()) {
$databaseTablePrefix = $this->container->getParameter('database_table_prefix');
$this->addSql('DROP INDEX IDX_635D765EA76ED395');
$this->addSql('CREATE TEMPORARY TABLE __temp__' . $databaseTablePrefix . 'oauth2_clients AS SELECT id, random_id, redirect_uris, secret, allowed_grant_types FROM ' . $databaseTablePrefix . 'oauth2_clients');
$this->addSql('DROP TABLE ' . $databaseTablePrefix . 'oauth2_clients');
$this->addSql('CREATE TABLE ' . $databaseTablePrefix . 'oauth2_clients (id INTEGER NOT NULL, random_id VARCHAR(255) NOT NULL, secret VARCHAR(255) NOT NULL, redirect_uris CLOB NOT NULL COLLATE BINARY, allowed_grant_types CLOB NOT NULL COLLATE BINARY, PRIMARY KEY(id))');
$this->addSql('INSERT INTO ' . $databaseTablePrefix . 'oauth2_clients (id, random_id, redirect_uris, secret, allowed_grant_types) SELECT id, random_id, redirect_uris, secret, allowed_grant_types FROM __temp__' . $databaseTablePrefix . 'oauth2_clients');
$this->addSql('DROP TABLE __temp__' . $databaseTablePrefix . 'oauth2_clients');
} else {
$clientsTable->dropColumn('name');
}
}
}

View File

@@ -0,0 +1,47 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added settings for RabbitMQ and Redis imports.
*/
class Version20160911214952 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$redis = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'import_with_redis'");
if (false === $redis) {
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('import_with_redis', 0, 'import')");
}
$rabbitmq = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'import_with_rabbitmq'");
if (false === $rabbitmq) {
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('import_with_rabbitmq', 0, 'import')");
}
$this->skipIf(false !== $rabbitmq && false !== $redis, 'It seems that you already played this migration.');
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'import_with_redis';");
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'import_with_rabbitmq';");
}
}

View File

@@ -0,0 +1,35 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added pocket_consumer_key field on wallabag_config.
*/
class Version20160916201049 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$configTable = $schema->getTable($this->getTable('config'));
$this->skipIf($configTable->hasColumn('pocket_consumer_key'), 'It seems that you already played this migration.');
$configTable->addColumn('pocket_consumer_key', 'string', ['notnull' => false]);
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'pocket_consumer_key';");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$configTable = $schema->getTable($this->getTable('config'));
$configTable->dropColumn('pocket_consumer_key');
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('pocket_consumer_key', NULL, 'import')");
}
}

View File

@@ -0,0 +1,108 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Migrations\SkipMigrationException;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added pocket_consumer_key field on wallabag_config.
*/
class Version20161001072726 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
// remove all FK from entry_tag
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'mysql':
$query = $this->connection->query("
SELECT CONSTRAINT_NAME
FROM information_schema.key_column_usage
WHERE TABLE_NAME = '" . $this->getTable('entry_tag', WallabagMigration::UN_ESCAPED_TABLE) . "' AND CONSTRAINT_NAME LIKE 'FK_%'
AND TABLE_SCHEMA = '" . $this->connection->getDatabase() . "'"
);
$query->execute();
foreach ($query->fetchAll() as $fk) {
$this->addSql('ALTER TABLE ' . $this->getTable('entry_tag') . ' DROP FOREIGN KEY ' . $fk['CONSTRAINT_NAME']);
}
break;
case 'postgresql':
// http://dba.stackexchange.com/questions/36979/retrieving-all-pk-and-fk
$query = $this->connection->query("
SELECT conrelid::regclass AS table_from
,conname
,pg_get_constraintdef(c.oid)
FROM pg_constraint c
JOIN pg_namespace n ON n.oid = c.connamespace
WHERE contype = 'f'
AND conrelid::regclass::text = '" . $this->getTable('entry_tag', WallabagMigration::UN_ESCAPED_TABLE) . "'
AND n.nspname = 'public';"
);
$query->execute();
foreach ($query->fetchAll() as $fk) {
$this->addSql('ALTER TABLE ' . $this->getTable('entry_tag') . ' DROP CONSTRAINT ' . $fk['conname']);
}
break;
}
$this->addSql('ALTER TABLE ' . $this->getTable('entry_tag') . ' ADD CONSTRAINT FK_entry_tag_entry FOREIGN KEY (entry_id) REFERENCES ' . $this->getTable('entry') . ' (id) ON DELETE CASCADE');
$this->addSql('ALTER TABLE ' . $this->getTable('entry_tag') . ' ADD CONSTRAINT FK_entry_tag_tag FOREIGN KEY (tag_id) REFERENCES ' . $this->getTable('tag') . ' (id) ON DELETE CASCADE');
// remove entry FK from annotation
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'mysql':
$query = $this->connection->query("
SELECT CONSTRAINT_NAME
FROM information_schema.key_column_usage
WHERE TABLE_NAME = '" . $this->getTable('annotation', WallabagMigration::UN_ESCAPED_TABLE) . "'
AND CONSTRAINT_NAME LIKE 'FK_%'
AND COLUMN_NAME = 'entry_id'
AND TABLE_SCHEMA = '" . $this->connection->getDatabase() . "'"
);
$query->execute();
foreach ($query->fetchAll() as $fk) {
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' DROP FOREIGN KEY ' . $fk['CONSTRAINT_NAME']);
}
break;
case 'postgresql':
// http://dba.stackexchange.com/questions/36979/retrieving-all-pk-and-fk
$query = $this->connection->query("
SELECT conrelid::regclass AS table_from
,conname
,pg_get_constraintdef(c.oid)
FROM pg_constraint c
JOIN pg_namespace n ON n.oid = c.connamespace
WHERE contype = 'f'
AND conrelid::regclass::text = '" . $this->getTable('annotation', WallabagMigration::UN_ESCAPED_TABLE) . "'
AND n.nspname = 'public'
AND pg_get_constraintdef(c.oid) LIKE '%entry_id%';"
);
$query->execute();
foreach ($query->fetchAll() as $fk) {
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' DROP CONSTRAINT ' . $fk['conname']);
}
break;
}
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' ADD CONSTRAINT FK_annotation_entry FOREIGN KEY (entry_id) REFERENCES ' . $this->getTable('entry') . ' (id) ON DELETE CASCADE');
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
throw new SkipMigrationException('Too complex ...');
}
}

View File

@@ -0,0 +1,68 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Converted database to utf8mb4 encoding (for MySQL only).
*/
class Version20161022134138 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
$this->addSql('ALTER DATABASE `' . $this->connection->getParams()['dbname'] . '` CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;');
// convert field length for utf8mb4
// http://stackoverflow.com/a/31474509/569101
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE confirmation_token confirmation_token VARCHAR(180) DEFAULT NULL;');
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE salt salt VARCHAR(180) NOT NULL;');
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE password password VARCHAR(180) NOT NULL;');
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('tag') . ' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' CHANGE `text` `text` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' CHANGE `quote` `quote` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE `title` `title` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE `content` `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('tag') . ' CHANGE `label` `label` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE `name` `name` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
$this->addSql('ALTER DATABASE `' . $this->connection->getParams()['dbname'] . '` CHARACTER SET = utf8 COLLATE = utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('tag') . ' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' CHANGE `text` `text` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' CHANGE `quote` `quote` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE `title` `title` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE `content` `content` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('tag') . ' CHANGE `label` `label` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE `name` `name` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
}
}

View File

@@ -0,0 +1,50 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added user_id column on oauth2_clients to prevent users to delete API clients from other users.
*/
class Version20161024212538 extends WallabagMigration
{
private $constraintName = 'IDX_user_oauth_client';
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
$this->skipIf($clientsTable->hasColumn('user_id'), 'It seems that you already played this migration.');
$clientsTable->addColumn('user_id', 'integer', ['notnull' => false]);
$clientsTable->addForeignKeyConstraint(
$this->getTable('user'),
['user_id'],
['id'],
['onDelete' => 'CASCADE'],
$this->constraintName
);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
$this->skipIf(!$clientsTable->hasColumn('user_id'), 'It seems that you already played this migration.');
$clientsTable->dropColumn('user_id', 'integer');
if ('sqlite' !== $this->connection->getDatabasePlatform()->getName()) {
$clientsTable->removeForeignKey($this->constraintName);
}
}
}

View File

@@ -0,0 +1,35 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added the internal setting to enable/disable downloading pictures.
*/
class Version20161031132655 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$images = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'download_images_enabled'");
$this->skipIf(false !== $images, 'It seems that you already played this migration.');
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('download_images_enabled', 0, 'misc')");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'download_images_enabled';");
}
}

View File

@@ -0,0 +1,36 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added created_at index on entry table.
*/
class Version20161104073720 extends WallabagMigration
{
private $indexName = 'IDX_entry_created_at';
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasIndex($this->indexName), 'It seems that you already played this migration.');
$entryTable->addIndex(['created_at'], $this->indexName);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(false === $entryTable->hasIndex($this->indexName), 'It seems that you already played this migration.');
$entryTable->dropIndex($this->indexName);
}
}

View File

@@ -0,0 +1,39 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added action_mark_as_read field on config table.
*/
class Version20161106113822 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$configTable = $schema->getTable($this->getTable('config'));
$this->skipIf($configTable->hasColumn('action_mark_as_read'), 'It seems that you already played this migration.');
$configTable->addColumn('action_mark_as_read', 'integer', [
'default' => 0,
'notnull' => false,
]);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$configTable = $schema->getTable($this->getTable('config'));
$this->skipIf(!$configTable->hasColumn('action_mark_as_read'), 'It seems that you already played this migration.');
$configTable->dropColumn('action_mark_as_read');
}
}

View File

@@ -0,0 +1,47 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added the internal setting to share articles to unmark.it.
*/
class Version20161117071626 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$share = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_unmark'");
if (false === $share) {
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('share_unmark', 0, 'entry')");
}
$unmark = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'unmark_url'");
if (false === $unmark) {
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry')");
}
$this->skipIf(false !== $share && false !== $unmark, 'It seems that you already played this migration.');
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_unmark';");
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'unmark_url';");
}
}

View File

@@ -0,0 +1,39 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add http_status in `entry_table`.
*/
class Version20161118134328 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasColumn('http_status'), 'It seems that you already played this migration.');
$entryTable->addColumn('http_status', 'string', [
'length' => 3,
'notnull' => false,
]);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(!$entryTable->hasColumn('http_status'), 'It seems that you already played this migration.');
$entryTable->dropColumn('http_status');
}
}

View File

@@ -0,0 +1,35 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add the restricted_access internal setting for articles with paywall.
*/
class Version20161122144743 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$access = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'restricted_access'");
$this->skipIf(false !== $access, 'It seems that you already played this migration.');
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('restricted_access', 0, 'entry')");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'restricted_access';");
}
}

View File

@@ -0,0 +1,46 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Methods and properties removed from `FOS\UserBundle\Model\User`.
*
* - `$expired`
* - `$credentialsExpired`
* - `setExpired()` (use `setExpiresAt(\DateTime::now()` instead)
* - `setCredentialsExpired()` (use `setCredentialsExpireAt(\DateTime::now()` instead)
*
* You need to drop the fields `expired` and `credentials_expired` from your database
* schema, because they aren't mapped anymore.
*/
class Version20161122203647 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$userTable = $schema->getTable($this->getTable('user'));
$this->skipIf(false === $userTable->hasColumn('expired') || false === $userTable->hasColumn('credentials_expired'), 'It seems that you already played this migration.');
$userTable->dropColumn('expired');
$userTable->dropColumn('credentials_expired');
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$userTable = $schema->getTable($this->getTable('user'));
$this->skipIf(true === $userTable->hasColumn('expired') || true === $userTable->hasColumn('credentials_expired'), 'It seems that you already played this migration.');
$userTable->addColumn('expired', 'smallint', ['notnull' => false]);
$userTable->addColumn('credentials_expired', 'smallint', ['notnull' => false]);
}
}

View File

@@ -0,0 +1,32 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added list_mode in user config.
*/
class Version20161128084725 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$configTable = $schema->getTable($this->getTable('config'));
$this->skipIf($configTable->hasColumn('list_mode'), 'It seems that you already played this migration.');
$configTable->addColumn('list_mode', 'integer', ['notnull' => false]);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$configTable = $schema->getTable($this->getTable('config'));
$configTable->dropColumn('list_mode');
}
}

View File

@@ -0,0 +1,44 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Removed locked, credentials_expire_at and expires_at.
*/
class Version20161128131503 extends WallabagMigration
{
private $fields = [
'locked' => 'smallint',
'credentials_expire_at' => 'datetime',
'expires_at' => 'datetime',
];
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$userTable = $schema->getTable($this->getTable('user'));
foreach ($this->fields as $field => $type) {
$this->skipIf(!$userTable->hasColumn($field), 'It seems that you already played this migration.');
$userTable->dropColumn($field);
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$userTable = $schema->getTable($this->getTable('user'));
foreach ($this->fields as $field => $type) {
$this->skipIf($userTable->hasColumn($field), 'It seems that you already played this migration.');
$userTable->addColumn($field, $type, ['notnull' => false]);
}
}
}

View File

@@ -0,0 +1,58 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Renamed uuid to uid in entry table.
*/
class Version20161214094402 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasColumn('uid'), 'It seems that you already played this migration.');
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'sqlite':
$this->addSql('CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM ' . $this->getTable('entry'));
$this->addSql('DROP TABLE ' . $this->getTable('entry'));
$this->addSql('CREATE TABLE ' . $this->getTable('entry') . ' (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT "0", PRIMARY KEY(id));');
$this->addSql('INSERT INTO ' . $this->getTable('entry') . ' (id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry;');
$this->addSql('DROP TABLE __temp__wallabag_entry');
break;
case 'mysql':
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE uuid uid VARCHAR(23)');
break;
case 'postgresql':
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' RENAME uuid TO uid');
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasColumn('uuid'), 'It seems that you already played this migration.');
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'sqlite':
throw new SkipMigrationException('Too complex ...');
break;
case 'mysql':
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE uid uuid VARCHAR(23)');
break;
case 'postgresql':
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' RENAME uid TO uuid');
}
}
}

View File

@@ -0,0 +1,36 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added index on wallabag_entry.uid.
*/
class Version20161214094403 extends WallabagMigration
{
private $indexName = 'IDX_entry_uid';
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasIndex($this->indexName), 'It seems that you already played this migration.');
$entryTable->addIndex(['uid'], $this->indexName);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(false === $entryTable->hasIndex($this->indexName), 'It seems that you already played this migration.');
$entryTable->dropIndex($this->indexName);
}
}

View File

@@ -0,0 +1,39 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added indexes on wallabag_entry.is_starred and wallabag_entry.is_archived.
*/
class Version20170127093841 extends WallabagMigration
{
private $indexStarredName = 'IDX_entry_starred';
private $indexArchivedName = 'IDX_entry_archived';
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasIndex($this->indexStarredName) && $entryTable->hasIndex($this->indexArchivedName), 'It seems that you already played this migration.');
$entryTable->addIndex(['is_starred'], $this->indexStarredName);
$entryTable->addIndex(['is_archived'], $this->indexArchivedName);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(false === $entryTable->hasIndex($this->indexStarredName) && false === $entryTable->hasIndex($this->indexArchivedName), 'It seems that you already played this migration.');
$entryTable->dropIndex($this->indexStarredName);
$entryTable->dropIndex($this->indexArchivedName);
}
}

View File

@@ -0,0 +1,37 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add the share_scuttle internal setting.
*/
class Version20170327194233 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$scuttle = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_scuttle'");
$this->skipIf(false !== $scuttle, 'It seems that you already played this migration.');
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('share_scuttle', '1', 'entry')");
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('scuttle_url', 'http://scuttle.org', 'entry')");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_scuttle';");
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'scuttle_url';");
}
}

View File

@@ -0,0 +1,48 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add published_at and published_by in `entry` table.
*/
class Version20170405182620 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasColumn('published_at'), 'It seems that you already played this migration.');
$entryTable->addColumn('published_at', 'datetime', [
'notnull' => false,
]);
$this->skipIf($entryTable->hasColumn('published_by'), 'It seems that you already played this migration.');
$entryTable->addColumn('published_by', 'text', [
'notnull' => false,
]);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(!$entryTable->hasColumn('published_at'), 'It seems that you already played this migration.');
$entryTable->dropColumn('published_at');
$this->skipIf(!$entryTable->hasColumn('published_by'), 'It seems that you already played this migration.');
$entryTable->dropColumn('published_by');
}
}

View File

@@ -0,0 +1,34 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Remove isPublic in Entry Table.
*/
class Version20170407200919 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(!$entryTable->hasColumn('is_public'), 'It seems that you already played this migration.');
$entryTable->dropColumn('is_public');
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasColumn('is_public'), 'It seems that you already played this migration.');
$entryTable->addColumn('is_public', 'boolean', ['notnull' => false, 'default' => 0]);
}
}

View File

@@ -0,0 +1,35 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Remove download_pictures in craue_config_setting.
*/
class Version20170420134133 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'download_pictures';");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$downloadPictures = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'download_pictures'");
$this->skipIf(false !== $downloadPictures, 'It seems that you already played this migration.');
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('download_pictures', '1', 'entry')");
}
}

View File

@@ -0,0 +1,44 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add site credential table to store username & password for some website (behind authentication or paywall).
*/
class Version20170501115751 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->skipIf($schema->hasTable($this->getTable('site_credential')), 'It seems that you already played this migration.');
$table = $schema->createTable($this->getTable('site_credential'));
$table->addColumn('id', 'integer', ['autoincrement' => true]);
$table->addColumn('user_id', 'integer');
$table->addColumn('host', 'string', ['length' => 255]);
$table->addColumn('username', 'text');
$table->addColumn('password', 'text');
$table->addColumn('createdAt', 'datetime');
$table->addIndex(['user_id'], 'idx_user');
$table->setPrimaryKey(['id']);
$table->addForeignKeyConstraint($this->getTable('user'), ['user_id'], ['id'], [], 'fk_user');
if ('postgresql' === $this->connection->getDatabasePlatform()->getName()) {
$schema->dropSequence('site_credential_id_seq');
$schema->createSequence('site_credential_id_seq');
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$schema->dropTable($this->getTable('site_credential'));
}
}

View File

@@ -0,0 +1,43 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Changed length for username, username_canonical, email and email_canonical fields in wallabag_user table.
*/
class Version20170510082609 extends WallabagMigration
{
private $fields = [
'username',
'username_canonical',
'email',
'email_canonical',
];
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
foreach ($this->fields as $field) {
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE ' . $field . ' ' . $field . ' VARCHAR(180) NOT NULL;');
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
foreach ($this->fields as $field) {
$this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE ' . $field . ' ' . $field . ' VARCHAR(255) NOT NULL;');
}
}
}

View File

@@ -0,0 +1,38 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Added `headers` field in entry table.
*/
class Version20170511115400 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasColumn('headers'), 'It seems that you already played this migration.');
$entryTable->addColumn('headers', 'text', [
'notnull' => false,
]);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(!$entryTable->hasColumn('headers'), 'It seems that you already played this migration.');
$entryTable->dropColumn('headers');
}
}

View File

@@ -0,0 +1,79 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Migrations\SkipMigrationException;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Increase the length of the "quote" column of "annotation" table.
*/
class Version20170511211659 extends WallabagMigration
{
public function up(Schema $schema)
{
$tableName = $this->getTable('annotation');
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'sqlite':
$this->addSql(<<<EOD
CREATE TEMPORARY TABLE __temp__wallabag_annotation AS
SELECT id, user_id, entry_id, text, created_at, updated_at, quote, ranges
FROM ${tableName}
EOD
);
$this->addSql('DROP TABLE ' . $tableName);
$this->addSql(<<<EOD
CREATE TABLE ${tableName}
(
id INTEGER PRIMARY KEY NOT NULL,
user_id INTEGER DEFAULT NULL,
entry_id INTEGER DEFAULT NULL,
text CLOB NOT NULL,
created_at DATETIME NOT NULL,
updated_at DATETIME NOT NULL,
quote CLOB NOT NULL,
ranges CLOB NOT NULL,
CONSTRAINT FK_A7AED006A76ED395 FOREIGN KEY (user_id) REFERENCES wallabag_user (id),
CONSTRAINT FK_A7AED006BA364942 FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE
);
CREATE INDEX IDX_A7AED006A76ED395 ON wallabag_annotation (user_id);
CREATE INDEX IDX_A7AED006BA364942 ON wallabag_annotation (entry_id);
EOD
);
$this->addSql(<<<EOD
INSERT INTO ${tableName} (id, user_id, entry_id, text, created_at, updated_at, quote, ranges)
SELECT id, user_id, entry_id, text, created_at, updated_at, quote, ranges
FROM __temp__wallabag_annotation;
EOD
);
$this->addSql('DROP TABLE __temp__wallabag_annotation');
break;
case 'mysql':
$this->addSql('ALTER TABLE ' . $tableName . ' MODIFY quote TEXT NOT NULL');
break;
case 'postgresql':
$this->addSql('ALTER TABLE ' . $tableName . ' ALTER COLUMN quote TYPE TEXT');
break;
}
}
public function down(Schema $schema)
{
$tableName = $this->getTable('annotation');
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'sqlite':
throw new SkipMigrationException('Too complex ...');
break;
case 'mysql':
$this->addSql('ALTER TABLE ' . $tableName . ' MODIFY quote VARCHAR(255) NOT NULL');
break;
case 'postgresql':
$this->addSql('ALTER TABLE ' . $tableName . ' ALTER COLUMN quote TYPE VARCHAR(255)');
break;
}
}
}

View File

@@ -0,0 +1,35 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add api_user_registration in craue_config_setting.
*/
class Version20170602075214 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$apiUserRegistration = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'api_user_registration'");
$this->skipIf(false !== $apiUserRegistration, 'It seems that you already played this migration.');
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('api_user_registration', '0', 'api')");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'api_user_registration';");
}
}

View File

@@ -0,0 +1,36 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Remove wallabag_url from craue_config_setting.
* It has been moved into the parameters.yml.
*/
class Version20170606155640 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$apiUserRegistration = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'wallabag_url'");
$this->skipIf(false === $apiUserRegistration, 'It seems that you already played this migration.');
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'wallabag_url'");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('wallabag_url', 'wallabag.me', 'misc')");
}
}

View File

@@ -0,0 +1,99 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Changed tags to lowercase.
*/
class Version20170719231144 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
// Find tags which need to be merged
$dupTags = $this->connection->query('
SELECT LOWER(label) AS lower_label
FROM ' . $this->getTable('tag') . '
GROUP BY LOWER(label)
HAVING COUNT(*) > 1'
);
$dupTags->execute();
foreach ($dupTags->fetchAll() as $duplicates) {
$label = $duplicates['lower_label'];
// Retrieve all duplicate tags for a given tag
$tags = $this->connection->executeQuery('
SELECT id
FROM ' . $this->getTable('tag') . '
WHERE LOWER(label) = :label
ORDER BY id ASC',
[
'label' => $label,
]
);
$first = true;
$newId = null;
$ids = [];
foreach ($tags->fetchAll() as $tag) {
// Ignore the first tag as we use it as the new reference tag
if ($first) {
$first = false;
$newId = $tag['id'];
} else {
$ids[] = $tag['id'];
}
}
// Just in case...
if (\count($ids) > 0) {
// Merge tags
$this->addSql('
UPDATE ' . $this->getTable('entry_tag') . '
SET tag_id = ' . $newId . '
WHERE tag_id IN (' . implode(',', $ids) . ')
AND entry_id NOT IN (
SELECT entry_id
FROM (SELECT * FROM ' . $this->getTable('entry_tag') . ') AS _entry_tag
WHERE tag_id = ' . $newId . '
)'
);
// Delete links to unused tags
$this->addSql('
DELETE FROM ' . $this->getTable('entry_tag') . '
WHERE tag_id IN (' . implode(',', $ids) . ')'
);
// Delete unused tags
$this->addSql('
DELETE FROM ' . $this->getTable('tag') . '
WHERE id IN (' . implode(',', $ids) . ')'
);
}
}
// Iterate over all tags to lowercase them
$this->addSql('
UPDATE ' . $this->getTable('tag') . '
SET label = LOWER(label)'
);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
throw new SkipMigrationException('Too complex ...');
}
}

View File

@@ -0,0 +1,51 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add starred_at column and set its value to updated_at for is_starred entries.
*/
class Version20170824113337 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasColumn('starred_at'), 'It seems that you already played this migration.');
$entryTable->addColumn('starred_at', 'datetime', [
'notnull' => false,
]);
}
public function postUp(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(!$entryTable->hasColumn('starred_at'), 'Unable to add starred_at colum');
$this->connection->executeQuery(
'UPDATE ' . $this->getTable('entry') . ' SET starred_at = updated_at WHERE is_starred = :is_starred',
[
'is_starred' => true,
]
);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(!$entryTable->hasColumn('starred_at'), 'It seems that you already played this migration.');
$entryTable->dropColumn('starred_at');
}
}

View File

@@ -0,0 +1,48 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Changed reading_time field to prevent null value.
*/
class Version20171008195606 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'mysql':
$this->addSql('UPDATE ' . $this->getTable('entry') . ' SET reading_time = 0 WHERE reading_time IS NULL;');
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE reading_time reading_time INT(11) NOT NULL;');
break;
case 'postgresql':
$this->addSql('UPDATE ' . $this->getTable('entry') . ' SET reading_time = 0 WHERE reading_time IS NULL;');
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' ALTER COLUMN reading_time SET NOT NULL;');
break;
}
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'mysql':
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE reading_time reading_time INT(11);');
break;
case 'postgresql':
$this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' ALTER COLUMN reading_time DROP NOT NULL;');
break;
}
}
}

View File

@@ -0,0 +1,38 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add origin_url column.
*/
class Version20171105202000 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf($entryTable->hasColumn('origin_url'), 'It seems that you already played this migration.');
$entryTable->addColumn('origin_url', 'text', [
'notnull' => false,
]);
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$entryTable = $schema->getTable($this->getTable('entry'));
$this->skipIf(!$entryTable->hasColumn('origin_url'), 'It seems that you already played this migration.');
$entryTable->dropColumn('origin_url');
}
}

View File

@@ -0,0 +1,35 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add store_article_headers in craue_config_setting.
*/
class Version20171120163128 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$storeArticleHeaders = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'store_article_headers'");
$this->skipIf(false !== $storeArticleHeaders, 'It seems that you already played this migration.');
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('store_article_headers', '0', 'entry')");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'store_article_headers';");
}
}

View File

@@ -0,0 +1,35 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Add shaarli_share_origin_url in craue_config_setting.
*/
class Version20171125164500 extends WallabagMigration
{
/**
* @param Schema $schema
*/
public function up(Schema $schema)
{
$shaarliShareOriginUrl = $this->container
->get('doctrine.orm.default_entity_manager')
->getConnection()
->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'shaarli_share_origin_url'");
$this->skipIf(false !== $shaarliShareOriginUrl, 'It seems that you already played this migration.');
$this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('shaarli_share_origin_url', '0', 'entry')");
}
/**
* @param Schema $schema
*/
public function down(Schema $schema)
{
$this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'shaarli_share_origin_url';");
}
}

View File

@@ -1,3 +1,4 @@
# settings_changed: Configuration updated
download_pictures: Download billeder på din server
carrot: Aktiver deling til Carrot
diaspora_url: Diaspora URL, hvis tjenesten er aktiv
@@ -8,22 +9,32 @@ export_csv: Aktiver eksport til CSV
export_json: Aktiver eksport til JSON
export_txt: Aktiver eksport til TXT
export_xml: Aktiver eksport til XML
pocket_consumer_key: Brugers nøgle til Pocket for at importere materialer (https://getpocket.com/developer/docs/authentication)
# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
# import_with_redis: Enable Redis to import data asynchronously
shaarli_url: Shaarli-URL, hvis tjenesten er aktiv
scuttle_url: Scuttle-URL, hvis tjenesten er aktiv
unmark_url: Unmark-URL, hvis tjenesten er aktiv
share_diaspora: Aktiver deling til Diaspora
share_mail: Aktiver deling med email
share_shaarli: Aktiver deling gennem Shaarli
share_scuttle: Aktiver deling gennem Scuttle
share_twitter: Aktiver deling gennem Twitter
share_unmark: Aktiver deling gennem Unmark.it
show_printlink: Vis et link til print-indhold
wallabag_support_url: Support-URL for wallabag
wallabag_url: URL for *sin* wallabag-installation
entry: "artikel"
export: "eksport"
import: "import"
misc: "misc"
modify_settings: "Gem ændring"
piwik_host: Hosting af din side hos Piwik
piwik_host: Hosting af din side hos Piwik (uden http:// eller https://)
piwik_site_id: ID for din side hos Piwik
piwik_enabled: Aktiver Piwik
demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)"
demo_mode_username: "Demobruger"
# share_public: Allow public url for entries
# download_images_enabled: Download images locally
# restricted_access: Enable authentication for websites with paywall
# api_user_registration: Enable user to be registered using the API
# store_article_headers: Enable if wallabag stores HTTP headers for each article
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@@ -1,29 +1,40 @@
download_pictures: Bilder auf den Server herunterladen
carrot: Teilen zu Carrot aktivieren
diaspora_url: Diaspora-URL, sofern der Service aktiviert ist
export_epub: ePUB-Export aktivieren
export_mobi: .mobi-Export aktivieren
export_pdf: PDF-Export aktivieren
export_csv: CSV-Export aktivieren
export_json: JSON-Export aktivieren
export_txt: TXT-Export aktivieren
export_xml: XML-Export aktivieren
pocket_consumer_key: Consumer-Key für Pocket, um Inhalte zu importieren (https://getpocket.com/developer/docs/authentication)
shaarli_url: Shaarli-URL, sofern der Service aktiviert ist
share_diaspora: Teilen zu Diaspora aktiveren
share_mail: Teilen via E-Mail aktiveren
share_shaarli: Teilen zu Shaarli aktiveren
share_twitter: Teilen zu Twitter aktiveren
show_printlink: Link anzeigen, um den Inhalt auszudrucken
wallabag_support_url: Support-URL für wallabag
wallabag_url: URL von *deiner* wallabag-Instanz
entry: "Artikel"
export: "Export"
import: "Import"
misc: "Verschiedenes"
modify_settings: "Übernehmen"
piwik_host: Host deiner Webseite in Piwik
piwik_site_id: ID deiner Webseite in Piwik
piwik_enabled: Piwik aktivieren
demo_mode_enabled: "Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)"
demo_mode_username: "Test-Benutzer"
settings_changed: 'Konfiguration aktualisiert'
download_pictures: 'Bilder auf den Server herunterladen'
carrot: 'Teilen zu Carrot aktivieren'
diaspora_url: 'Diaspora-URL, sofern der Service aktiviert ist'
export_epub: 'ePUB-Export aktivieren'
export_mobi: 'mobi-Export aktivieren'
export_pdf: 'PDF-Export aktivieren'
export_csv: 'CSV-Export aktivieren'
export_json: 'JSON-Export aktivieren'
export_txt: 'TXT-Export aktivieren'
export_xml: 'XML-Export aktivieren'
import_with_rabbitmq: 'Aktiviere RabbitMQ, um Artikel asynchron zu importieren'
import_with_redis: 'Aktiviere Redis, um Artikel asynchron zu importieren'
shaarli_url: 'Shaarli-URL, sofern der Service aktiviert ist'
scuttle_url: 'Scuttle-URL, sofern der Service aktiviert ist'
unmark_url: 'Unmark-URL, sofern der Service aktiviert ist'
share_diaspora: 'Teilen zu Diaspora aktiveren'
share_mail: 'Teilen via E-Mail aktiveren'
share_shaarli: 'Teilen zu Shaarli aktiveren'
share_twitter: 'Teilen zu Twitter aktiveren'
share_unmark: 'Teilen zu Unmark.it aktiveren'
show_printlink: 'Link anzeigen, um den Inhalt auszudrucken'
wallabag_support_url: 'Support-URL für wallabag'
wallabag_url: 'URL von *deiner* wallabag-Instanz'
entry: 'Artikel'
export: 'Export'
import: 'Import'
misc: 'Verschiedenes'
modify_settings: 'Übernehmen'
piwik_host: 'Host deiner Webseite in Piwik (ohne http:// oder https://)'
piwik_site_id: 'ID deiner Webseite in Piwik'
piwik_enabled: 'Piwik aktivieren'
demo_mode_enabled: 'Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)'
demo_mode_username: 'Test-Benutzer'
share_public: 'Erlaube eine öffentliche URL für Einträge'
download_images_enabled: 'Bilder lokal herunterladen'
restricted_access: 'Authentifizierung für Webseiten mit Paywall aktivieren'
api_user_registration: 'Registrierung eines Benutzers über die API ermöglichen'
store_article_headers: 'Speichern von HTTP-Headern für jeden Artikel aktivieren'
shaarli_share_origin_url: 'Original-URL mit Shaarli teilen, wenn der Service aktiviert ist'

View File

@@ -1,6 +1,7 @@
settings_changed: Configuration updated
download_pictures: Download pictures on your server
carrot: Enable share to Carrot
diaspora_url: Diaspora URL, if the service is enabled
diaspora_url: diaspora* URL, if the service is enabled
export_epub: Enable ePub export
export_mobi: Enable .mobi export
export_pdf: Enable PDF export
@@ -8,22 +9,32 @@ export_csv: Enable CSV export
export_json: Enable JSON export
export_txt: Enable TXT export
export_xml: Enable XML export
pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication)
import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
import_with_redis: Enable Redis to import data asynchronously
shaarli_url: Shaarli URL, if the service is enabled
share_diaspora: Enable share to Diaspora
share_mail: Enable share by email
share_shaarli: Enable share to Shaarli
share_twitter: Enable share to Twitter
scuttle_url: Scuttle URL, if the service is enabled
unmark_url: Unmark URL, if the service is enabled
share_diaspora: Enable share to diaspora*
share_mail: Enable share by e-mail
share_shaarli: Enable sharing to Shaarli
share_scuttle: Enable sharing to Scuttle
share_twitter: Enable sharing to Twitter
share_unmark: Enable sharing to Unmark.it
show_printlink: Display a link to print content
wallabag_support_url: Support URL for wallabag
wallabag_url: URL of *your* wallabag instance
entry: "article"
export: "export"
import: "import"
misc: "misc"
modify_settings: "apply"
piwik_host: Host of your website in Piwik
piwik_host: Host of your website in Piwik (without http:// or https://)
piwik_site_id: ID of your website in Piwik
piwik_enabled: Enable Piwik
demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
demo_mode_enabled: "Enable demo mode? (Only used for the public wallabag demo)"
demo_mode_username: "Demo user"
share_public: Allow public URL for entries
download_images_enabled: Download images locally
restricted_access: Enable authentication for paywalled websites
api_user_registration: Enable user to be registered using the API
store_article_headers: Enable if wallabag stores HTTP headers for each article
shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@@ -1,6 +1,7 @@
download_pictures: Descargar imágenes
settings_changed: Configuración actualizada
download_pictures: Descargar imágenes en el servidor
carrot: Activar compartir con Carrot
diaspora_url: Diaspora URL, si el servicio está activado
diaspora_url: URL de Diaspora, si el servicio está activado
export_epub: Activar exportación a ePub
export_mobi: Activar exportación a .mobi
export_pdf: Activar exportación a PDF
@@ -8,22 +9,32 @@ export_csv: Activar exportación a CSV
export_json: Activar exportación a JSON
export_txt: Activar exportación a TXT
export_xml: Activar exportación a XML
pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication)
shaarli_url: Shaarli URL, si el servicio está activado
import_with_rabbitmq: Activar RabbitMQ para importar datos de forma asíncrona
import_with_redis: Activar Redis para importar datos de forma asíncrona
shaarli_url: URL de Shaarli, si el servicio está activado
scuttle_url: URL de Scuttle, si el servicio está activado
unmark_url: URL de Unmark, si el servicio está activado
share_diaspora: Activar compartir con Diaspora
share_mail: Activar compartir con email
share_mail: Activar compartir con Email
share_shaarli: Activar compartir con Shaarli
share_scuttle: Activar compartir con Scuttle
share_twitter: Activar compartir con Twitter
share_unmark: Activar compartir con Unmark.it
show_printlink: Mostrar un enlace para imprimir contenido
wallabag_support_url: URL de soporte de wallabag
wallabag_url: URL de *tu* instancia de wallabag
entry: "artículo"
export: "exportar"
import: "importar"
misc: "misc"
modify_settings: "modificar configuración"
piwik_host: Host de tu website de Piwik
piwik_site_id: ID de tu website de Piwik
modify_settings: "guardar"
piwik_host: Host de tu website en Piwik (sin http:// o https://)
piwik_site_id: ID de tu website en Piwik
piwik_enabled: Activar Piwik
demo_mode_enabled: "Activar modo demo (sólo usado para la demo de wallabag)"
demo_mode_enabled: "Activar modo demo (sólo usado en la demo pública de wallabag)"
demo_mode_username: "Nombre de usuario demo"
share_public: Permitir URL pública para los artículos
download_images_enabled: Descargar imágenes localmente
restricted_access: Activar autenticación para websites con paywall
# api_user_registration: Enable user to be registered using the API
# store_article_headers: Enable if wallabag stores HTTP headers for each article
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@@ -1,3 +1,4 @@
# settings_changed: Configuration updated
download_pictures: تصاویر را در کارگزار خودتان باربگیرید
carrot: فعال‌سازی هم‌رسانی به Carrot
diaspora_url: نشانی Diaspora، اگر فعال بود
@@ -8,17 +9,32 @@ export_csv: فعال‌سازی برون‌سپاری به CSV
export_json: فعال‌سازی برون‌سپاری به JSON
export_txt: فعال‌سازی برون‌سپاری به TXT
export_xml: فعال‌سازی برون‌سپاری به XML
pocket_consumer_key: کلید کاربری Pocket برای درون‌ریزی مطالب (https://getpocket.com/developer/docs/authentication)
# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
# import_with_redis: Enable Redis to import data asynchronously
shaarli_url: نشانی Shaarli، اگر فعال بود
scuttle_url: نشانی Scuttle، اگر فعال بود
unmark_url: نشانی Unmark، اگر فعال بود
share_diaspora: فعال‌سازی هم‌رسانی به Diaspora
share_mail: فعال‌سازی هم‌رسانی با ایمیل
share_shaarli: فعال‌سازی هم‌رسانی به Shaarli
share_scuttle: فعال‌سازی هم‌رسانی به Scuttle
share_twitter: فعال‌سازی هم‌رسانی به Twitter
share_unmark: فعال‌سازی هم‌رسانی به Unmark.it
show_printlink: نمایش پیوندی برای چاپ مطلب
wallabag_support_url: نشانی صفحهٔ پشتیبانی wallabag
wallabag_url: نشانی صفحهٔ wallabag *شما*
entry: "مقاله"
export: "برون‌سپاری"
import: "درون‌ریزی"
misc: "غیره"
modify_settings: "اعمال"
# piwik_host: Host of your website in Piwik (without http:// or https://)
# piwik_site_id: ID of your website in Piwik
# piwik_enabled: Enable Piwik
# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
# demo_mode_username: "Demo user"
# share_public: Allow public url for entries
# download_images_enabled: Download images locally
# restricted_access: Enable authentication for websites with paywall
# api_user_registration: Enable user to be registered using the API
# store_article_headers: Enable if wallabag stores HTTP headers for each article
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@@ -1,3 +1,4 @@
settings_changed: Configuration mise à jour
download_pictures: Télécharger les images sur le serveur
carrot: Activer le partage vers Carrot
diaspora_url: URL de Diaspora, si le service Diaspora est activé
@@ -8,22 +9,32 @@ export_csv: Activer l'export CSV
export_json: Activer l'export JSON
export_txt: Activer l'export TXT
export_xml: Activer l'export XML
pocket_consumer_key: Clé d'authentification Pocket pour importer les données (https://getpocket.com/developer/docs/authentication)
import_with_rabbitmq: Activer RabbitMQ pour gérer les imports de façon asynchrone
import_with_redis: Activer Redis pour gérer les imports de façon asynchrone
shaarli_url: URL de Shaarli, si le service Shaarli est activé
scuttle_url: URL de Scuttle, si le service Scuttle est activé
unmark_url: URL de Unmark, si le service Unmark est activé
share_diaspora: Activer le partage vers Diaspora
share_mail: Activer le partage par email
share_shaarli: Activer le partage vers Shaarli
share_scuttle: Activer le partage vers Scuttle
share_twitter: Activer le partage vers Twitter
share_unmark: Activer le partage vers Unmark.it
show_printlink: Afficher un lien pour imprimer
wallabag_support_url: URL de support de wallabag
wallabag_url: URL de *votre* instance de wallabag
entry: "article"
export: "export"
import: "import"
misc: "divers"
modify_settings: "appliquer"
piwik_host: URL de votre site dans Piwik
piwik_host: URL de votre site dans Piwik (sans http:// ou https://)
piwik_site_id: ID de votre site dans Piwik
piwik_enabled: Activer Piwik
demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)"
demo_mode_username: "Utilisateur de la démo"
share_public: Autoriser une URL publique pour les articles
download_images_enabled: Télécharger les images en local
restricted_access: Activer l'authentification pour les articles derrière un paywall
api_user_registration: Activer la création de compte depuis l'API
store_article_headers: Activer le stockage des en-têtes HTTP de chaque article
shaarli_share_origin_url: Activer le partage de l'adresse d'origine vers Shaarli, si le service est activé

View File

@@ -1,3 +1,4 @@
# settings_changed: Configuration updated
download_pictures: Scarica le immagini sul tuo server
carrot: Abilita la condivisione con Carrot
diaspora_url: Diaspora URL, se il servizio è abilitato
@@ -8,22 +9,32 @@ export_csv: Abilita esportazione CSV
export_json: Abilita esportazione JSON
export_txt: Abilita esportazione TXT
export_xml: Abilita esportazione XML
pocket_consumer_key: Consumer key per Pocket per importare i contenuti (https://getpocket.com/developer/docs/authentication)
# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
# import_with_redis: Enable Redis to import data asynchronously
shaarli_url: Shaarli URL, se il servizio è abilitato
scuttle_url: Scuttle URL, se il servizio è abilitato
unmark_url: Unmark URL, se il servizio è abilitato
share_diaspora: Abilita la condivisione con Diaspora
share_mail: Abilita la condivisione per email
share_shaarli: Abilita la condivisione con Shaarli
share_scuttle: Abilita la condivisione con Scuttle
share_twitter: Abilita la condivisione con Twitter
share_unmark: Abilita la condivisione con Unmark.it
show_printlink: Mostra un collegamento per stampare il contenuto
wallabag_support_url: URL di supporto per wallabag
wallabag_url: URL della *tua* installazione di wallabag
entry: "contenuto"
export: "esporta"
import: "importa"
misc: "misc"
modify_settings: "applica"
piwik_host: Host del tuo sito in Piwik
piwik_host: Host del tuo sito in Piwik (senza http:// o https://)
piwik_site_id: ID del tuo sito in Piwik
piwik_enabled: Abilita Piwik
demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)"
demo_mode_username: "Utente Demo"
# share_public: Allow public url for entries
# download_images_enabled: Download images locally
# restricted_access: Enable authentication for websites with paywall
api_user_registration: Abilita la registrazione dell'utente attraverso l'API
# store_article_headers: Enable if wallabag stores HTTP headers for each article
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@@ -1,3 +1,4 @@
settings_changed: Configuracion mesa a jorn
download_pictures: Telecargar los imatges sul servidor
carrot: Activar lo partatge cap a Carrot
diaspora_url: URL de Diaspora, se lo servici Diaspora es activat
@@ -8,22 +9,32 @@ export_csv: Activar l'expòrt CSV
export_json: Activar l'expòrt JSON
export_txt: Activar l'expòrt TXT
export_xml: Activar l'expòrt XML
pocket_consumer_key: Clau d'autentificacion Pocket per importar las donadas (https://getpocket.com/developer/docs/authentication)
import_with_rabbitmq: Activar RabbitMQ per importar de donadas de manièra asincròna
import_with_redis: Activar Redis per importar de donadas de manièra asincròna
shaarli_url: URL de Shaarli, se lo servici Shaarli es activat
share_diaspora: Activar lo partatge cap a Diaspora
scuttle_url: URL de Scuttle, se lo servici Scuttle es activat
unmark_url: URL de Unmark, se lo servici Scuttle es activat
share_diaspora: Activar lo partatge cap a Diaspora*
share_mail: Activar lo partatge per corrièl
share_shaarli: Activar lo partatge cap a Shaarli
share_scuttle: Activar lo partatge cap a Scuttle
share_twitter: Activar lo partatge cap a Twitter
share_unmark: Activar lo partatge cap a Unmark.it
show_printlink: Afichar un ligam per imprimir
wallabag_support_url: URL d'assisténcia de wallabag
wallabag_url: URL de *vòstra* instància de wallabag
entry: "article"
export: "expòrt"
import: "impòrt"
misc: "divèrs"
modify_settings: "aplicar"
piwik_host: URL de vòstre site dins Piwik
piwik_host: URL de vòstre site dins Piwik (sense http:// o https://)
piwik_site_id: ID de vòstre site dins Piwik
piwik_enabled: Activar Piwik
demo_mode_enabled: "Activar lo mode demostracion ? (utilizar solament per la demostracion publica de wallabag)"
demo_mode_username: "Utilizaire de la demostracion"
share_public: Autorizar una URL publica pels articles
download_images_enabled: Telecargar los imatges en local
restricted_access: Activar l'autenticacion pels sites amb peatge
api_user_registration: Autorizar los utilizaires a se marcar amb l'API
store_article_headers: Activar se wallabag garda las entèstas HTTP per cada article
shaarli_share_origin_url: Activar lo partatge de lurl amb Shaarli, se lo servici es activat

View File

@@ -1,3 +1,4 @@
settings_changed: Konfiguracja zaktualizowana
download_pictures: Pobierz obrazy na swój serwer
carrot: Włącz udostępnianie dla Carrot
diaspora_url: Adres URL Diaspora, jeżeli usługa jest włączona
@@ -8,17 +9,31 @@ export_csv: Włącz eksport do CSV
export_json: Włącz eksport do JSON
export_txt: Włącz eksport do TXT
export_xml: Włącz eksport do XML
pocket_consumer_key: Klucz klienta Pocket do importu zawartości (https://getpocket.com/developer/docs/authentication)
import_with_rabbitmq: Włącz RabbitMQ dla asynchronicznego importu danych
import_with_redis: Włącz Redis dla asynchronicznego importu danych
shaarli_url: Adress URL Shaarli, jeżeli usługa jest włączona
scuttle_url: Adress URL Scuttle, jeżeli usługa jest włączona
share_diaspora: Włącz udostępnianie dla Diaspora
share_mail: Włącz udostępnianie przez email
share_shaarli: Włącz udostępnianie dla Shaarli
share_scuttle: Włącz udostępnianie dla Scuttle
share_twitter: Włącz udostępnianie dla Twitter
share_unmark: Włącz udostępnianie dla Unmark.it
show_printlink: Pokaż link do wydrukowania zawartości
wallabag_support_url: Adres URL wsparcia dla wallabag
wallabag_url: Adres *twojej* instacji wallabag
entry: "artykuł"
export: "eksport"
import: "import"
misc: "różne"
modify_settings: "zatwierdz"
modify_settings: "zatwierdź"
piwik_host: Host twojej strony Piwik (bez http:// lub https://)
piwik_site_id: ID twojej strony Piwik
piwik_enabled: Włacz Piwik
demo_mode_enabled: "Włacz tryb demo? (używany wyłącznie dla publicznej demonstracji Wallabag)"
demo_mode_username: "Użytkownik Demonstracyjny"
share_public: Zezwalaj na publiczny adres url dla wpisow
download_images_enabled: Pobierz obrazy lokalnie
restricted_access: Włącz autoryzację dla stron z paywallem
api_user_registration: Włącz rejestrację użytkownika przy użyciu API
# store_article_headers: Enable if wallabag stores HTTP headers for each article
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@@ -0,0 +1,41 @@
# settings_changed: Configuration updated
download_pictures: Download imagens no seu servidor
carrot: Habilitar compartilhamento para o Carrot
diaspora_url: URL Diaspora caso o serviço esteja habilitado
export_epub: Habilita exportação para ePub
export_mobi: Habilita exportação para .mobi
export_pdf: Habilita exportação para PDF
export_csv: Habilita exportação para CSV
export_json: Habilita exportação para JSON
export_txt: Habilita exportação para TXT
export_xml: Habilita exportação para XML
# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
# import_with_redis: Enable Redis to import data asynchronously
shaarli_url: URL Shaarli caso o serviço esteja habilitado
scuttle_url: URL Scuttle caso o serviço esteja habilitado
unmark_url: URL Unmark caso o serviço esteja habilitado
pocket_consumer_key: Chave de consumidor do Pocket para importar conteúdo (https://getpocket.com/developer/docs/authentication)
share_diaspora: Habilitar compartilhamento para o Diaspora
share_mail: Habilitar compartilhamento por e-mail
share_shaarli: Habilitar compartilhamento para o Shaarli
share_scuttle: Habilitar compartilhamento para o Scuttle
share_twitter: Habilitar compartilhamento para o Twitter
share_unmark: Habilitar compartilhamento para o Unmark.it
show_printlink: Mostrar um link para imprimir o conteúdo
wallabag_support_url: URL de Suporte do wallabag
entry: "artigo"
export: "exportar"
import: "importar"
misc: "misc"
modify_settings: "aplicar"
piwik_host: Host de seu website Piwik
piwik_site_id: ID de seu website Piwik
piwik_enabled: Habilitar Piwik
demo_mode_enabled: "Habilitar modo demo? (somente usado para o demo público do wallabag)"
demo_mode_username: "Usuário demo"
# share_public: Allow public url for entries
# download_images_enabled: Download images locally
# restricted_access: Enable authentication for websites with paywall
# api_user_registration: Enable user to be registered using the API
# store_article_headers: Enable if wallabag stores HTTP headers for each article
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@@ -1,3 +1,4 @@
# settings_changed: Configuration updated
download_pictures: Descarcă poze pe server
carrot: Permite share către Carrot
diaspora_url: Diaspora URL, dacă serviciul este permis
@@ -8,17 +9,32 @@ export_csv: Permite exportare CSV
export_json: Permite exportare JSON
export_txt: Permite exportare TXT
export_xml: Permite exportare XML
pocket_consumer_key: Cheie consumator pentru importarea contentului din Pocket (https://getpocket.com/developer/docs/authentication)
# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
# import_with_redis: Enable Redis to import data asynchronously
shaarli_url: Shaarli URL, dacă serviciul este permis
scuttle_url: Scuttle URL, dacă serviciul este permis
unmark_url: Unmark URL, dacă serviciul este permis
share_diaspora: Permite share către Diaspora
share_mail: Permite share prin email
share_shaarli: Permite share către Shaarli
share_scuttle: Permite share către Scuttle
share_twitter: Permite share către Twitter
share_unmark: Permite share către Unmark.it
show_printlink: Afișează un link pentru a printa content-ul
wallabag_support_url: URL-ul de suport pentru wallabag
wallabag_url: URL-ul instanței tale wallabag
entry: "alticol"
export: "exportă"
import: "importă"
misc: "diverse"
modify_settings: "aplică"
# piwik_host: Host of your website in Piwik (without http:// or https://)
# piwik_site_id: ID of your website in Piwik
# piwik_enabled: Enable Piwik
# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
# demo_mode_username: "Demo user"
# share_public: Allow public url for entries
# download_images_enabled: Download images locally
# restricted_access: Enable authentication for websites with paywall
# api_user_registration: Enable user to be registered using the API
# store_article_headers: Enable if wallabag stores HTTP headers for each article
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@@ -0,0 +1,40 @@
settings_changed: "Настройки обновлены"
download_pictures: "Скачивать картинки на Ваш сервер"
carrot: "Включить возможность отслеживания событий через Carrot"
diaspora_url: "Diaspora URL, если сервис включен"
export_epub: "Включить ePub экспорт"
export_mobi: "Включить .mobi экспорт"
export_pdf: "Включить PDF экспорт"
export_csv: "Включить CSV экспорт"
export_json: "Включить JSON экспорт"
export_txt: "Включить TXT экспорт"
export_xml: "Включить XML экспорт"
import_with_rabbitmq: "Включить RabbitMQ для импорта данных(асинхронно)"
import_with_redis: "Включить Redis для импорта данных(асинхронно)"
shaarli_url: "Shaarli URL, если сервис включен"
scuttle_url: "Scuttle URL, если сервис включен"
unmark_url: "Unmark URL, если сервис включен"
share_diaspora: "Включить возможность поделиться в соц.сети Diaspora"
share_mail: "Включить возможность поделиться по email"
share_shaarli: "Включить возможность поделиться в Shaarli"
share_twitter: "Включить возможность поделиться в Twitter"
share_unmark: "Включить возможность поделиться в Unmark.it"
show_printlink: "Отображать ссылки в версии для печати"
wallabag_support_url: "Поддержка URL для wallabag"
wallabag_url: "URL *вашего* wallabag сервиса"
entry: "запись"
export: "экспорт"
import: "импорт"
misc: "разное"
modify_settings: "применить"
piwik_host: "Ссылка на Ваш сайт на Piwik (с http:// или https://)"
piwik_site_id: "ID Вашего сайта на Piwik"
piwik_enabled: "Включить Piwik"
demo_mode_enabled: "Включить демо режим ? (только для публичной демонстрации wallabag)"
demo_mode_username: "Демо пользователь"
share_public: "Разрешить публичные ссылки на записи"
download_images_enabled: "Скачивать изображения локально"
restricted_access: "Включить авторизацию на сайте с помощью paywall"
# api_user_registration: Enable user to be registered using the API
# store_article_headers: Enable if wallabag stores HTTP headers for each article
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@@ -0,0 +1,37 @@
settings_changed: ปรับปรุงองค์ประกอบ
download_pictures: ดาวน์โหลดรูปภาพผ่านเซิฟเวอร์ของคุณ
carrot: เปิดการแชร์ Carrot
diaspora_url: Diaspora-URL, ถ้าเซิฟเวอร์ถูกเปิดใช้งาน
export_epub: เปิดใช้งานการนำเข้าข้อมูลแบบ ePub
export_mobi: เปิดใช้งานการนำเข้าข้อมูลแบบ .mobi
export_pdf: เปิดใช้งานการนำเข้าข้อมูลแบบ PDF
export_csv: เปิดใช้งานการนำเข้าข้อมูลแบบ CSV
export_json: เปิดใช้งานการนำเข้าข้อมูลแบบ JSON
export_txt: เปิดใช้งานการนำเข้าข้อมูลแบบ TXT
export_xml: เปิดใช้งานการนำเข้าข้อมูลแบบ XML
import_with_rabbitmq: เปิดใช้งาน RabbitMQ เพื่อดึงข้อมูลแบบ asynchronous
import_with_redis: เปิดใช้งาน Redis เพื่อดึงข้อมูลแบบ asynchronous
shaarli_url: Shaarli-URL, ถ้าเซิฟเวอร์ถูกเปิดใช้งาน
share_diaspora: เปิดการแชร์ Diaspora
share_mail: เปิดการแชร์ผ่าน email
share_shaarli: เปิดการแชร์ Shaarli
share_scuttle: เปิดการแชร์ Scuttle
share_twitter: เปิดการแชร์ Twitter
share_unmark: เปิดการแชร์ Unmark.it
show_printlink: แสดงลิงค์เพื่อปรินท์เนื้อหา
wallabag_support_url: URL ที่สนับสนุนจาก wallabag
entry: "บทความ"
export: "นำข้อมูลออก"
import: "นำเข้าข้อมูล"
misc: "เบ็ดเตล็ด"
modify_settings: "ปรับใช้"
piwik_host: โฮสบนเว็บไซต์ของคุณใน Piwik (ยกเว้น http:// หรือ https://)
piwik_site_id: ไอดีบนเว็บไซต์ของคุณใน Piwik
piwik_enabled: เปิดการใช้ Piwik
demo_mode_enabled: "เปิดการใช้งานโหมดเดโม ? (เฉพาะการใช้สำหรับเดโมสาธารณะของ wallabag)"
demo_mode_username: "ผู้ใช้ส่วนเดโม"
share_public: ยอมรับ URL สาธารณะจากการเข้าถึงข้อมูล
download_images_enabled: ดาวน์โหลดรูปภาพเฉพาะ
restricted_access: เปิดใช้งานการรองรับบนเว็บไซต์กับ paywall
api_user_registration: เปิดใช้งานให้ผู้ใช้ลงทะเบียนการใช้ API
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@@ -0,0 +1,41 @@
# settings_changed: Configuration updated
# download_pictures: Download pictures on your server
# carrot: Enable share to Carrot
# diaspora_url: Diaspora URL, if the service is enabled
# export_epub: Enable ePub export
# export_mobi: Enable .mobi export
# export_pdf: Enable PDF export
# export_csv: Enable CSV export
# export_json: Enable JSON export
# export_txt: Enable TXT export
# export_xml: Enable XML export
# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
# import_with_redis: Enable Redis to import data asynchronously
# shaarli_url: Shaarli URL, if the service is enabled
# scuttle_url: Scuttle URL, if the service is enabled
# unmark_url: Unmark URL, if the service is enabled
# share_diaspora: Enable share to Diaspora
# share_mail: Enable share by email
# share_shaarli: Enable share to Shaarli
# share_scuttle: Enable share to Scuttle
# share_twitter: Enable share to Twitter
# share_unmark: Enable share to Unmark.it
# show_printlink: Display a link to print content
# wallabag_support_url: Support URL for wallabag
# wallabag_url: URL of *your* wallabag instance
# entry: "article"
# export: "export"
# import: "import"
# misc: "misc"
# modify_settings: "apply"
# piwik_host: Host of your website in Piwik (without http:// or https://)
# piwik_site_id: ID of your website in Piwik
# piwik_enabled: Enable Piwik
# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
# demo_mode_username: "Demo user"
# share_public: Allow public url for entries
# download_images_enabled: Download images locally
# restricted_access: Enable authentication for websites with paywall
# api_user_registration: Enable user to be registered using the API
# store_article_headers: Enable if wallabag stores HTTP headers for each article
# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled

View File

@@ -1,6 +1,6 @@
{% extends "WallabagCoreBundle::layout.html.twig" %}
{% block title %}{% trans %}internal settings{% endtrans %}{% endblock %}
{% block title %}{{ 'menu.left.internal_settings'|trans }}{% endblock %}
{% block content %}
<div class="row">
@@ -13,19 +13,17 @@
<div class="div_tabs col s12">
<ul class="tabs">
{% for section in sections | craue_sortSections %}
<li class="tab col s3"><a href="#set-{{ section }}">{{ section | trans({}, 'CraueConfigBundle') }}</a></li>
<li class="tab col s12 m6 l3"><a href="#set-{{ section }}">{{ section | trans({}, 'CraueConfigBundle') }}</a></li>
{% endfor %}
</ul>
</div>
{% for section in sections | craue_sortSections %}
<div id="set-{{ section }}" class="col s12">
{% for setting in form.settings if setting.section.vars.value == section %}
{{ form_row(setting.name) }}
{{ form_row(setting.section) }}
{{ form_row(setting.value, {
'label': setting.name.vars.value | trans({}, 'CraueConfigBundle'),
}) }}
{% for setting in form.settings if setting.vars.value.section == section %}
{{ form_row(setting.value, {
'label': setting.vars.value.name | trans({}, 'CraueConfigBundle'),
}) }}
{% endfor %}
</div>
{% endfor %}
@@ -35,8 +33,7 @@
{{ 'modify_settings' | trans({}, 'CraueConfigBundle') }}
</button>
{{ form_rest(form) }}
{{ form_end(form) }}
{{ form_widget(form._token) }}
</div>
</div>
</div>

View File

@@ -1,2 +0,0 @@
Login: "Log ind"
Enter your email address below and we'll send you password reset instructions.: "Indtast din emailadresse nedenfor, så sender vi dig instrukser til at nulstille din adgangskode."

View File

@@ -1,2 +0,0 @@
Login: "Anmelden"
Enter your email address below and we'll send you password reset instructions.: "Tippe deine E-Mail-Adresse unten ein und wir senden dir die Anweisungen, wie du dein Kennwort zurücksetzen kannst."

View File

@@ -1,2 +0,0 @@
Login: "Logearse"
Enter your email address below and we'll send you password reset instructions.: "Introduzca su dirección de email y le enviaremos las instrucciones para resetear su contraseña."

View File

@@ -1,2 +0,0 @@
Login: "Se connecter"
Enter your email address below and we'll send you password reset instructions.: "Renseignez votre adresse email, nous vous enverrons les instructions pour réinitialiser votre mot de passe."

View File

@@ -1,2 +0,0 @@
Login: "Se connectar"
Enter your email address below and we'll send you password reset instructions.: "Picatz vòstra adreça de corrièl çai-jos, vos mandarem las instruccions per reïnicializar vòstre senhal."

View File

@@ -1,2 +0,0 @@
Login: "Logowanie"
Enter your email address below and we'll send you password reset instructions.: "Wpisz poniżej swój adres email, abyśmy mogli wysłać ci instrukcję resetowania hasła."

View File

@@ -0,0 +1,13 @@
/* Rules for sizing the icon. */
.material-icons.md-18 { font-size: 18px; }
.material-icons.md-24 { font-size: 24px; }
.material-icons.md-36 { font-size: 36px; }
.material-icons.md-48 { font-size: 48px; }
/* Rules for using icons as black on a light background. */
.material-icons.md-dark { color: rgba(0, 0, 0, 0.54); }
.material-icons.md-dark.md-inactive { color: rgba(0, 0, 0, 0.26); }
/* Rules for using icons as white on a dark background. */
.material-icons.md-light { color: rgba(255, 255, 255, 1); }
.material-icons.md-light.md-inactive { color: rgba(255, 255, 255, 0.3); }

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -0,0 +1,334 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="800"
height="770"
id="svg4004"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="New document 11">
<defs
id="defs4006" />
<sodipodi:namedview
id="base"
pagecolor="#000"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.7"
inkscape:cx="359.23155"
inkscape:cy="349.10374"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="1631"
inkscape:window-height="1026"
inkscape:window-x="49"
inkscape:window-y="24"
inkscape:window-maximized="1" />
<metadata
id="metadata4009">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(21.42857,-101.6479)">
<image
y="101.6479"
x="-21.42857"
id="image4071"
xlink:href="data:image/png;base64,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
"
height="770"
width="800" />
<path
style="fill:#FFF"
d="m 482.45517,806.8979 c -21.575,-30.1125 -55.23748,-77.12866 -74.80551,-104.48035 -19.98598,-27.9359 -36.2457,-49.73896 -37.10125,-49.75 -0.87914,-0.0113 -32.32337,42.25713 -74.37706,99.98035 -40.06973,55 -73.18741,100 -73.59485,100 -1.1396,0 -144.46068,-100.94983 -144.829571,-102.01235 -0.178476,-0.51406 32.221521,-48.07611 72.000001,-105.69344 39.77847,-57.61732 72.3245,-105.66675 72.3245,-106.77649 0,-1.78957 -12.89022,-6.31508 -114,-40.0232 -62.7,-20.90302 -114.613999,-38.24519 -115.364443,-38.53815 -1.043816,-0.4075 4.925559,-20.38013 25.402971,-84.99452 14.722078,-46.45402 27.100359,-84.84113 27.507293,-85.3047 0.406933,-0.46357 54.900599,16.97442 121.097029,38.75107 66.19643,21.77666 120.91108,39.59345 121.5881,39.59285 0.67702,-5.9e-4 1.44284,-1.01357 1.70181,-2.25107 0.25898,-1.2375 0.83006,-57.6 1.26906,-125.25 0.439,-67.65 1.16224,-123.5625 1.6072,-124.25 0.63709,-0.98436 19.23178,-1.24675 87.5,-1.23469 47.68004,0.008 87.18776,0.34593 87.79493,0.75 0.76529,0.50931 2.07325,37.70117 4.26357,121.23469 3.5965,137.16189 3.67401,139 5.86123,139 0.84816,0 53.3106,-17.56056 116.58321,-39.02347 63.2726,-21.46291 115.34958,-38.67541 115.72663,-38.25 1.27822,1.44219 53.1745,170.39371 52.53554,171.03267 -0.34901,0.34901 -53.15524,18.43347 -117.34717,40.18769 -88.30357,29.92548 -116.78951,39.96068 -117.02855,41.22754 -0.17651,0.93542 30.19001,46.31568 68.80279,102.8201 38.0153,55.63011 68.97925,101.56053 68.80877,102.06759 -0.39157,1.16463 -142.63129,105.93788 -143.82081,105.93788 -0.48298,0 -18.53042,-24.6375 -40.10542,-54.75 z"
id="path4093"
inkscape:connector-curvature="0" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 926 B

View File

Before

Width:  |  Height:  |  Size: 201 B

After

Width:  |  Height:  |  Size: 201 B

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200"><path fill="none" d="M0 0h200v200H0z"/><path d="M75.899 72.438c1.597-.981 10.207-5.556 24.098.178 14.289 5.897 23.154.776 24.253.079-3.454-5.678-7.562-10.62-12.104-13.943.303-.083.612-.167.939-.263 6.023-1.742 7.553-6.842 7.875-11.21.364-4.954.616-5.03 1.692-9.487 1.032-4.281-.119-5.137-1.181-4.273-.572.465-5.552 1.616-8.505 3.919-4.768 3.72-7.707 10.794-9.039 14.706-.025.06-.205.604-.265.792-.621 1.498-1.857 1.494-1.857 1.494v.001c-.6-.065-1.202-.1-1.809-.1-.54 0-1.079.029-1.616.081-.012.002-.019 0-.031.001-1.581.233-2.45-1.697-2.632-2.157-1.847-5.304-6.816-15.763-17.984-18.577 0 0-2.028-1.554-1.41 1.074.588 2.511 1.804 5.049 1.534 8.741-.124 1.704-1.181 10.442 6.85 14.99.763.432 1.441.795 2.051 1.101-4.042 3.235-7.716 7.74-10.859 12.853zM128.626 152.353c-9.842-6.098-13.153-8.242-12.946-10.575 0 0 .002-.379.099-.957.239-1.236.995-3.348 3.407-4.552.079-.039.146-.084.208-.129 7.668-4.45 13.27-11.614 15.246-20.56-1.99 4.941-16.735 8.78-34.645 8.78-17.903 0-32.651-3.839-34.641-8.78.442 2.008 1.073 3.923 1.864 5.742.666 3.745 1.562 12.563-2.673 20.282-3.731 6.8-22.15 16.069-49.485 10.748 0 0-1.096-.766-1.428-.136-.491.932 1.517 1.685 3.583 2.229 19.031 5.04 47.756 2.989 56.777-4.443 4.116-3.388 5.704-7.953 6.107-12.865l.003.008s.11-1.287 1.719-.32c.461.277 2.125 1.36 2.39 2.585.232 1.743.248 3.883-.652 5.382-1.287 2.144-1.301 2.452.393 3.662 1.04.742 5.287 3.864 11.198 7.415.015.01.023.019.038.027 1.25.753 2.987 2.597 2.987 2.597 2.662 3.079 8.452 9.275 10.972 8.108 1.19-.551-.051-3.032-.051-3.032s1.98 2.571 3.043 1.694c.809-.668-.473-3.229-.473-3.229s1.729 1.499 2.757.944c1.258-.679-.187-4.614-10.079-10.627-9.896-6.018-12.578-6.94-12.814-9.626 0 0-.004-.135.004-.366.077-.593.414-1.847 1.852-1.712 2.141.346 4.348.531 6.608.531 2.587 0 5.107-.237 7.536-.69l.001.003s.127-.025.164-.031c.284-.036.838-.018.84.671-.09.873-.331 1.751-.845 2.519-1.447 2.168-.972 2.466.54 3.859.933.859 5.211 4.622 11.07 8.264.012.009.017.016.031.023 1.249.752 3.41 2.816 3.41 2.816v-.001c2.428 2.466 6.894 6.596 9.327 6.347 1.646-.168.306-3.002.306-3.002s2.078 2.006 3.099 1.416c1.142-.659-.474-2.755-.474-2.755s1.338.708 2.283.473c.948-.236 1.185-2.644-8.656-8.737z"/><path d="M117.631 83.452c-1.181 0-2.161.355-2.912 1.057-.76.71-1.144 1.531-1.144 2.438v16.056c0 2.154-.382 3.742-1.135 4.721-.728.946-1.892 1.406-3.556 1.406-1.703 0-2.863-.457-3.549-1.396-.716-.979-1.078-2.571-1.078-4.731V86.884c0-1.098-.5-1.996-1.448-2.596-1.289-.812-2.57-1.105-4.129-.587-.476.159-.924.366-1.333.615-.435.265-.802.597-1.093.985-.322.432-.486.901-.486 1.396v16.307c0 2.158-.363 3.75-1.079 4.73-.688.939-1.849 1.396-3.548 1.396-1.705 0-2.877-.459-3.584-1.401-.734-.979-1.107-2.57-1.107-4.726V86.947c0-.908-.384-1.728-1.145-2.438-.751-.702-1.751-1.057-2.973-1.057-1.258 0-2.296.352-3.085 1.045-.811.71-1.222 1.535-1.222 2.45v15.806c0 1.988.194 3.869.575 5.588.393 1.758 1.077 3.3 2.035 4.586.968 1.299 2.282 2.323 3.906 3.05 1.607.716 3.617 1.079 5.975 1.079 2.457 0 4.515-.455 6.115-1.354 1.342-.754 2.473-1.744 3.371-2.951.866 1.207 1.971 2.197 3.294 2.95 1.58.899 3.669 1.354 6.211 1.354 2.357 0 4.359-.364 5.947-1.081 1.601-.726 2.902-1.751 3.872-3.048.96-1.29 1.645-2.833 2.034-4.586.381-1.719.575-3.6.575-5.588V86.947c0-.911-.398-1.733-1.184-2.445-.767-.697-1.818-1.05-3.12-1.05z"/></svg>

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 9.2 KiB

Some files were not shown because too many files have changed in this diff Show More