]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
7 years agoMerge remote-tracking branch 'origin/master' into 2.3
Jeremy Benoist [Tue, 9 May 2017 11:55:31 +0000 (13:55 +0200)] 
Merge remote-tracking branch 'origin/master' into 2.3

7 years agoMerge pull request #3022 from wallabag/webpack
Thomas Citharel [Tue, 9 May 2017 09:43:48 +0000 (11:43 +0200)] 
Merge pull request #3022 from wallabag/webpack

Adds Webpack support and remove Grunt

7 years agoicon mail a bit better 3022/head
Thomas Citharel [Tue, 9 May 2017 09:04:02 +0000 (11:04 +0200)] 
icon mail a bit better

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
7 years agoMerge pull request #3097 from wallabag/update-license
Jérémy Benoist [Tue, 9 May 2017 07:47:20 +0000 (09:47 +0200)] 
Merge pull request #3097 from wallabag/update-license

Update graby* licenses

7 years agoUpdate graby* licenses 3097/head
Jérémy Benoist [Tue, 9 May 2017 07:22:50 +0000 (09:22 +0200)] 
Update graby* licenses

7 years agoMerge pull request #3096 from aaa2000/fix-api-entries-pagination-with-perpage
Jérémy Benoist [Tue, 9 May 2017 07:12:15 +0000 (09:12 +0200)] 
Merge pull request #3096 from aaa2000/fix-api-entries-pagination-with-perpage

Fix API pagination is broken if perPage is custom value

7 years agoFix API pagination is broken if perPage is custom value 3096/head
adev [Mon, 8 May 2017 14:27:16 +0000 (16:27 +0200)] 
Fix API pagination is broken if perPage is custom value

Fix #2720

7 years agofix 3-dots menu position
Thomas Citharel [Mon, 8 May 2017 10:32:20 +0000 (12:32 +0200)] 
fix 3-dots menu position

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
7 years agoFix review again
Thomas Citharel [Sun, 7 May 2017 15:13:08 +0000 (17:13 +0200)] 
Fix review again

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
7 years agoFix reviews
Aline [Sun, 7 May 2017 13:07:50 +0000 (15:07 +0200)] 
Fix reviews

Signed-off-by: Aline <chetta.aline@gmail.com>
7 years agoMerge pull request #3090 from aaa2000/translate-login-page-error
Nicolas Lœuillet [Sun, 7 May 2017 12:00:41 +0000 (14:00 +0200)] 
Merge pull request #3090 from aaa2000/translate-login-page-error

Translate error message in login page

7 years agoTranslate error message in login page 3090/head
adev [Sat, 6 May 2017 20:21:04 +0000 (22:21 +0200)] 
Translate error message in login page

Fix #2933

7 years agoMerge pull request #3088 from wallabag/execute-migrations-after-install
Jérémy Benoist [Fri, 5 May 2017 15:42:42 +0000 (17:42 +0200)] 
Merge pull request #3088 from wallabag/execute-migrations-after-install

Added migrations execution after fresh install

7 years agoMerge pull request #2920 from wallabag/cleanduplicatescommand
Jérémy Benoist [Fri, 5 May 2017 15:42:18 +0000 (17:42 +0200)] 
Merge pull request #2920 from wallabag/cleanduplicatescommand

Clean Duplicates Command

7 years agoFixed test 2920/head
Nicolas Lœuillet [Fri, 5 May 2017 13:20:58 +0000 (15:20 +0200)] 
Fixed test

7 years agoAdded migrations execution after fresh install 3088/head
Nicolas Lœuillet [Fri, 5 May 2017 13:14:58 +0000 (15:14 +0200)] 
Added migrations execution after fresh install

7 years agoFixed @j0k3r review
Nicolas Lœuillet [Fri, 5 May 2017 12:54:03 +0000 (14:54 +0200)] 
Fixed @j0k3r review

7 years agoAdded test for deduplication
Nicolas Lœuillet [Fri, 5 May 2017 12:33:36 +0000 (14:33 +0200)] 
Added test for deduplication

7 years agoMerge pull request #3053 from wallabag/api-bulk-add
Nicolas Lœuillet [Fri, 5 May 2017 11:56:34 +0000 (13:56 +0200)] 
Merge pull request #3053 from wallabag/api-bulk-add

Added API endpoint to handle a list of URL

7 years agoLittle refacto and send 400 on reaching urls limit 3053/head
Jeremy Benoist [Fri, 5 May 2017 10:05:50 +0000 (12:05 +0200)] 
Little refacto and send 400 on reaching urls limit

7 years agofixed margin on sidebar menu
Thomas Citharel [Fri, 5 May 2017 07:19:56 +0000 (09:19 +0200)] 
fixed margin on sidebar menu

7 years agoMerge pull request #3082 from aaa2000/fix-form-errors-display
Jérémy Benoist [Fri, 5 May 2017 05:01:28 +0000 (07:01 +0200)] 
Merge pull request #3082 from aaa2000/fix-form-errors-display

Fix display the form errors correctly

7 years agoFix display the form errors correctly 3082/head
adev [Thu, 4 May 2017 22:12:16 +0000 (00:12 +0200)] 
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

7 years agoFix according to review
Thomas Citharel [Thu, 4 May 2017 15:44:42 +0000 (17:44 +0200)] 
Fix according to review

7 years agoMerge pull request #3080 from wallabag/use-username-to-import
Nicolas Lœuillet [Thu, 4 May 2017 13:19:16 +0000 (15:19 +0200)] 
Merge pull request #3080 from wallabag/use-username-to-import

Use username to import

7 years agorebase
Thomas Citharel [Thu, 4 May 2017 12:56:52 +0000 (14:56 +0200)] 
rebase

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
7 years agoUse npm script instead of direct webpack call
Thomas Citharel [Mon, 1 May 2017 10:43:20 +0000 (12:43 +0200)] 
Use npm script instead of direct webpack call

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
7 years agofix travis
Thomas Citharel [Sat, 29 Apr 2017 18:27:36 +0000 (20:27 +0200)] 
fix travis

7 years agofix theme changes
Thomas Citharel [Sat, 29 Apr 2017 18:04:54 +0000 (20:04 +0200)] 
fix theme changes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
7 years agoadd comment to config.yml to explain live reload feature
Thomas Citharel [Sat, 29 Apr 2017 17:44:27 +0000 (19:44 +0200)] 
add comment to config.yml to explain live reload feature

7 years agodisable default dev server
Thomas Citharel [Thu, 27 Apr 2017 11:28:57 +0000 (13:28 +0200)] 
disable default dev server

7 years agoAdds Webpack support and removes the use for Grunt
Thomas Citharel [Fri, 31 Mar 2017 18:21:41 +0000 (20:21 +0200)] 
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

7 years agoUse username to import 3080/head
Thomas Citharel [Thu, 4 May 2017 09:53:44 +0000 (11:53 +0200)] 
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>
7 years agoMerge pull request #3060 from wallabag/search-users
Thomas Citharel [Thu, 4 May 2017 12:35:14 +0000 (14:35 +0200)] 
Merge pull request #3060 from wallabag/search-users

Search & paginate users

7 years agoMerge pull request #3079 from wallabag/update-doc
Jérémy Benoist [Thu, 4 May 2017 05:07:20 +0000 (07:07 +0200)] 
Merge pull request #3079 from wallabag/update-doc

Fixed old links in documentation

7 years agoUpdated documentation version 3079/head
Nicolas Lœuillet [Wed, 3 May 2017 13:58:36 +0000 (15:58 +0200)] 
Updated documentation version

7 years agoFixed old links in documentation
Nicolas Lœuillet [Wed, 3 May 2017 13:54:56 +0000 (15:54 +0200)] 
Fixed old links in documentation

7 years agoMerge pull request #3047 from wallabag/add-notmatches-operator
Nicolas Lœuillet [Wed, 3 May 2017 09:53:01 +0000 (11:53 +0200)] 
Merge pull request #3047 from wallabag/add-notmatches-operator

Added notmatches operator for tagging rule

7 years agoChanged export test 3047/head
Nicolas Lœuillet [Wed, 3 May 2017 08:53:10 +0000 (10:53 +0200)] 
Changed export test

7 years agoMerge pull request #3075 from wallabag/disable-shortcuts-login
Nicolas Lœuillet [Tue, 2 May 2017 14:59:49 +0000 (16:59 +0200)] 
Merge pull request #3075 from wallabag/disable-shortcuts-login

Disabled shortcuts on login/register page

7 years agoMerge pull request #3073 from wallabag/fix-sandwich
Nicolas Lœuillet [Tue, 2 May 2017 14:42:26 +0000 (16:42 +0200)] 
Merge pull request #3073 from wallabag/fix-sandwich

Fixed sandwich menu position in entry view (material theme)

7 years agoDisabled shortcuts on login/register page 3075/head
Nicolas Lœuillet [Tue, 2 May 2017 14:21:06 +0000 (16:21 +0200)] 
Disabled shortcuts on login/register page

7 years agoMerge pull request #3072 from wallabag/hotfix/3061
Nicolas Lœuillet [Tue, 2 May 2017 13:46:45 +0000 (15:46 +0200)] 
Merge pull request #3072 from wallabag/hotfix/3061

Small typo in documentation fix #3061

7 years agoFixed sandwich menu position in entry view (material theme) 3073/head
Nicolas Lœuillet [Tue, 2 May 2017 13:40:15 +0000 (15:40 +0200)] 
Fixed sandwich menu position in entry view (material theme)

7 years agoMerged list and search methods 3060/head
Nicolas Lœuillet [Tue, 2 May 2017 13:27:58 +0000 (15:27 +0200)] 
Merged list and search methods

7 years agorename index to list
Thomas Citharel [Sat, 29 Apr 2017 17:39:51 +0000 (19:39 +0200)] 
rename index to list

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
7 years agoFix tests
Thomas Citharel [Thu, 27 Apr 2017 14:40:18 +0000 (16:40 +0200)] 
Fix tests

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
7 years agoAdd pagination
Thomas Citharel [Thu, 27 Apr 2017 14:23:54 +0000 (16:23 +0200)] 
Add pagination

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
7 years agoAdd filter to users management page
Thomas Citharel [Thu, 27 Apr 2017 13:58:32 +0000 (15:58 +0200)] 
Add filter to users management page

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
7 years agoSmall typo in documentation fix #3061 3072/head
Maxime Marinel [Tue, 2 May 2017 09:51:23 +0000 (11:51 +0200)] 
Small typo in documentation fix #3061

7 years agoMerge remote-tracking branch 'origin/master' into 2.3
Jeremy Benoist [Mon, 1 May 2017 20:15:46 +0000 (22:15 +0200)] 
Merge remote-tracking branch 'origin/master' into 2.3

7 years agoAdd docs for cli commands
Thomas Citharel [Mon, 1 May 2017 11:30:00 +0000 (13:30 +0200)] 
Add docs for cli commands

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
7 years agoAdd basic tests
Thomas Citharel [Thu, 30 Mar 2017 15:02:10 +0000 (17:02 +0200)] 
Add basic tests

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
7 years agoAdd Clean Duplicates Command
Thomas Citharel [Fri, 24 Feb 2017 10:27:03 +0000 (11:27 +0100)] 
Add Clean Duplicates Command

7 years agoAdded limit
Nicolas Lœuillet [Mon, 1 May 2017 07:21:59 +0000 (09:21 +0200)] 
Added limit

7 years agoFix tests (for real this time)
Jeremy Benoist [Sat, 29 Apr 2017 10:32:26 +0000 (12:32 +0200)] 
Fix tests (for real this time)

7 years agoFix tests
Jeremy Benoist [Sat, 29 Apr 2017 10:24:27 +0000 (12:24 +0200)] 
Fix tests

7 years agoSplitted the endpoint in two
Nicolas Lœuillet [Mon, 24 Apr 2017 09:31:00 +0000 (11:31 +0200)] 
Splitted the endpoint in two

7 years agoAdded API endpoint to handle a list of URL
Nicolas Lœuillet [Mon, 24 Apr 2017 08:22:57 +0000 (10:22 +0200)] 
Added API endpoint to handle a list of URL
By passing an array, you can add / delete URL in mass (bulk request)

7 years agoMerge pull request #3055 from wallabag/api-bulk-add-tags
Nicolas Lœuillet [Mon, 1 May 2017 07:04:41 +0000 (09:04 +0200)] 
Merge pull request #3055 from wallabag/api-bulk-add-tags

Added API endpoint to handle a list of URL and to add/delete tags

7 years agoMerge pull request #3066 from wallabag/ignore-tests-exported-files
Jérémy Benoist [Sat, 29 Apr 2017 20:51:32 +0000 (22:51 +0200)] 
Merge pull request #3066 from wallabag/ignore-tests-exported-files

Ignore tests exported files

7 years agoIgnore tests exported files 3066/head
Thomas Citharel [Sat, 29 Apr 2017 17:41:14 +0000 (19:41 +0200)] 
Ignore tests exported files

7 years agoMerge pull request #3064 from gileri/master
Jérémy Benoist [Sat, 29 Apr 2017 13:43:42 +0000 (15:43 +0200)] 
Merge pull request #3064 from gileri/master

Correct create_application en string

7 years agoFix tests 3055/head
Jeremy Benoist [Sat, 29 Apr 2017 10:58:39 +0000 (12:58 +0200)] 
Fix tests

7 years agoCorrect create_application en string 3064/head
Éric Gillet [Sat, 29 Apr 2017 09:37:59 +0000 (11:37 +0200)] 
Correct create_application en string

7 years agoMerge pull request #3057 from raf64flo/patch-1
Jérémy Benoist [Wed, 26 Apr 2017 07:10:28 +0000 (09:10 +0200)] 
Merge pull request #3057 from raf64flo/patch-1

Use up-to-date Firefox extension and add F-Droid link for Android app.

7 years agoFix IT translation #3057 3057/head
Raphaël Flores [Tue, 25 Apr 2017 14:52:02 +0000 (16:52 +0200)] 
Fix IT translation #3057

7 years agoFix typos. Fix #3057
Raphaël Flores [Tue, 25 Apr 2017 13:52:51 +0000 (15:52 +0200)] 
Fix typos. Fix #3057

7 years agoFix documentation for DE/IT/FR language, even if not sure for ED/IT. Fix #3057.
Raphaël Flores [Tue, 25 Apr 2017 13:35:51 +0000 (15:35 +0200)] 
Fix documentation for DE/IT/FR language, even if not sure for ED/IT. Fix #3057.

7 years agoRemove 'fr' from Firefox extension URL
Raphaël Flores [Tue, 25 Apr 2017 13:17:08 +0000 (15:17 +0200)] 
Remove 'fr' from Firefox extension URL

7 years agoUpdate Firefox extension and Android links
Raphaël Flores [Tue, 25 Apr 2017 13:11:53 +0000 (15:11 +0200)] 
Update Firefox extension and Android links

Use up-to-date Firefox extension and add F-Droid link for Android app.

7 years agoMerge pull request #3052 from shtrom/fix-relative-symlinks
Jérémy Benoist [Tue, 25 Apr 2017 12:15:01 +0000 (14:15 +0200)] 
Merge pull request #3052 from shtrom/fix-relative-symlinks

Make symfony-assets-install use `relative` symlinks

7 years agoAdded endpoint to handle URL list to add/delete tags
Nicolas Lœuillet [Mon, 24 Apr 2017 10:24:17 +0000 (12:24 +0200)] 
Added endpoint to handle URL list to add/delete tags

7 years agoAdded API endpoint to handle a list of URL and to add/delete tags
Nicolas Lœuillet [Mon, 24 Apr 2017 09:12:41 +0000 (11:12 +0200)] 
Added API endpoint to handle a list of URL and to add/delete tags

7 years agoMake symfony-assets-install use `relative` symlinks 3052/head
Olivier Mehani [Sat, 22 Apr 2017 11:45:28 +0000 (21:45 +1000)] 
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>
7 years agoMerge pull request #3048 from wallabag/remove-download-pictures
Nicolas Lœuillet [Sat, 22 Apr 2017 11:20:44 +0000 (13:20 +0200)] 
Merge pull request #3048 from wallabag/remove-download-pictures

Cleaned craue_config_setting by removing useless download_pictures setting

7 years agoFixed @j0k3r review
Nicolas Lœuillet [Sat, 22 Apr 2017 11:14:34 +0000 (13:14 +0200)] 
Fixed @j0k3r review

7 years agoCleaned craue_config_setting by removing useless download_pictures setting 3048/head
Nicolas Lœuillet [Thu, 20 Apr 2017 13:45:43 +0000 (15:45 +0200)] 
Cleaned craue_config_setting by removing useless download_pictures setting

7 years agoAdded notmatches operator for tagging rule
Nicolas Lœuillet [Thu, 20 Apr 2017 12:58:20 +0000 (14:58 +0200)] 
Added notmatches operator for tagging rule

7 years agoMerge pull request #3024 from wallabag/store-date
Nicolas Lœuillet [Tue, 18 Apr 2017 11:12:28 +0000 (13:12 +0200)] 
Merge pull request #3024 from wallabag/store-date

Added publication date and author

7 years agoMerge pull request #3044 from wallabag/fos-user-2.0
Jérémy Benoist [Tue, 18 Apr 2017 07:49:59 +0000 (09:49 +0200)] 
Merge pull request #3044 from wallabag/fos-user-2.0

Remove dev FOSUserBundle

7 years agoRemove dev FOSUserBundle 3044/head
Jeremy Benoist [Tue, 18 Apr 2017 06:08:26 +0000 (08:08 +0200)] 
Remove dev FOSUserBundle

7 years agoMerge pull request #3030 from wallabag/remove-isPublic-from-entry
Jérémy Benoist [Fri, 14 Apr 2017 12:56:26 +0000 (14:56 +0200)] 
Merge pull request #3030 from wallabag/remove-isPublic-from-entry

Remove isPublic from Entry entity fix #2598

7 years agoRemoved is_public in Entry edit form 3030/head
Nicolas Lœuillet [Thu, 13 Apr 2017 10:57:31 +0000 (12:57 +0200)] 
Removed is_public in Entry edit form

7 years agoRemove isPublic from Entry entity fix #2598
Maxime [Fri, 7 Apr 2017 20:23:20 +0000 (22:23 +0200)] 
Remove isPublic from Entry entity fix #2598

7 years agoMerge branch 'master' into 2.3
Nicolas Lœuillet [Thu, 13 Apr 2017 11:07:06 +0000 (13:07 +0200)] 
Merge branch 'master' into 2.3

7 years agoAdded test for multiple authors 3024/head
Nicolas Lœuillet [Mon, 10 Apr 2017 15:58:27 +0000 (17:58 +0200)] 
Added test for multiple authors

7 years agoFixed migrations
Nicolas Lœuillet [Mon, 10 Apr 2017 07:26:08 +0000 (09:26 +0200)] 
Fixed migrations

7 years agoAdded author of article
Nicolas Lœuillet [Thu, 6 Apr 2017 07:36:20 +0000 (09:36 +0200)] 
Added author of article

7 years agoAdded publication date
Nicolas Lœuillet [Wed, 5 Apr 2017 20:22:16 +0000 (22:22 +0200)] 
Added publication date

7 years agoMerge pull request #3023 from mart-e/epub-notice-at-the-end
Jérémy Benoist [Wed, 5 Apr 2017 08:20:19 +0000 (10:20 +0200)] 
Merge pull request #3023 from mart-e/epub-notice-at-the-end

Add export notice at the end of the epub

7 years agoAdd export notice at the end of the epub 3023/head
Martin Trigaux [Wed, 5 Apr 2017 07:24:48 +0000 (09:24 +0200)] 
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.

7 years agoMerge pull request #3020 from wallabag/add-remove-archived-entries
Nicolas Lœuillet [Fri, 31 Mar 2017 15:28:54 +0000 (17:28 +0200)] 
Merge pull request #3020 from wallabag/add-remove-archived-entries

Allow to remove all archived entries

7 years agoRenamed methods 3020/head
Nicolas Lœuillet [Fri, 31 Mar 2017 15:03:08 +0000 (17:03 +0200)] 
Renamed methods

7 years agoRefactored code
Nicolas Lœuillet [Fri, 31 Mar 2017 09:04:18 +0000 (11:04 +0200)] 
Refactored code

7 years agoAdded delete button on Baggy theme
Nicolas Lœuillet [Fri, 31 Mar 2017 08:53:23 +0000 (10:53 +0200)] 
Added delete button on Baggy theme

7 years agoRenamed countAllEntriesByUsername method
Nicolas Lœuillet [Fri, 31 Mar 2017 08:46:47 +0000 (10:46 +0200)] 
Renamed countAllEntriesByUsername method

7 years agoAllow to remove all archived entries
Thomas Citharel [Thu, 30 Mar 2017 14:24:59 +0000 (16:24 +0200)] 
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>
7 years agoMerge pull request #3021 from wallabag/rename-method
Jérémy Benoist [Thu, 30 Mar 2017 14:40:18 +0000 (16:40 +0200)] 
Merge pull request #3021 from wallabag/rename-method

Rename method

7 years agoMerge pull request #3014 from wallabag/change-default-value-listmode
Thomas Citharel [Thu, 30 Mar 2017 14:12:11 +0000 (16:12 +0200)] 
Merge pull request #3014 from wallabag/change-default-value-listmode

Changed default value for list mode (grid instead of list)