Commit graph

3915 commits

Author SHA1 Message Date
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