]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
6 years agoMerge remote-tracking branch 'origin/master' into 2.3
Jeremy Benoist [Fri, 19 May 2017 09:25:19 +0000 (11:25 +0200)] 
Merge remote-tracking branch 'origin/master' into 2.3

6 years agoMerge pull request #3130 from X-dark/master
Jérémy Benoist [Fri, 19 May 2017 08:07:01 +0000 (10:07 +0200)] 
Merge pull request #3130 from X-dark/master

unify Download/Export wording.

6 years agomodify key name as well 3130/head
Cedric Girard [Thu, 18 May 2017 15:17:21 +0000 (17:17 +0200)] 
modify key name as well

6 years agounify Download/Export wording.
Cedric Girard [Thu, 18 May 2017 13:23:48 +0000 (15:23 +0200)] 
unify Download/Export wording.

This fixes #2967

6 years agoUpdate of the oc version of CoreBundle
Quent-in [Thu, 18 May 2017 08:44:15 +0000 (10:44 +0200)] 
Update of the oc version of CoreBundle

I hope I didn't break everything with the ' and ".

6 years agoMerge pull request #3125 from wallabag/prepare-222
Jérémy Benoist [Wed, 17 May 2017 15:48:51 +0000 (17:48 +0200)] 
Merge pull request #3125 from wallabag/prepare-222

Prepare wallabag 2.2.3

6 years agoPrepare wallabag 2.2.3 3125/head
Nicolas Lœuillet [Wed, 17 May 2017 12:43:17 +0000 (14:43 +0200)] 
Prepare wallabag 2.2.3

6 years agoMerge pull request #3122 from wallabag/delete-doc
Thomas Citharel [Wed, 17 May 2017 09:57:28 +0000 (11:57 +0200)] 
Merge pull request #3122 from wallabag/delete-doc

Removed embedded documentation

6 years agoMerge pull request #3117 from wallabag/fix-doc
Nicolas Lœuillet [Wed, 17 May 2017 08:40:35 +0000 (10:40 +0200)] 
Merge pull request #3117 from wallabag/fix-doc

Fixed documentation URL

6 years agoFixed documentation URL 3117/head
Nicolas Lœuillet [Sat, 13 May 2017 07:33:19 +0000 (09:33 +0200)] 
Fixed documentation URL

6 years agoMerge pull request #3124 from wallabag/lock-guzzle-auth
Nicolas Lœuillet [Wed, 17 May 2017 07:02:22 +0000 (09:02 +0200)] 
Merge pull request #3124 from wallabag/lock-guzzle-auth

Lock guzzle-site-authenticator to avoid errors

6 years agoLock guzzle-site-authenticator to avoid error 3124/head
Jeremy Benoist [Tue, 16 May 2017 21:34:42 +0000 (23:34 +0200)] 
Lock guzzle-site-authenticator to avoid error

6 years agoMerge pull request #3123 from X-dark/master
Jérémy Benoist [Tue, 16 May 2017 12:50:25 +0000 (14:50 +0200)] 
Merge pull request #3123 from X-dark/master

reorder contrib strings in about page

6 years agoreorder contrib strings in about page 3123/head
Cedric Girard [Tue, 16 May 2017 12:17:13 +0000 (14:17 +0200)] 
reorder contrib strings in about page

this fixes #2891

6 years agoRemoved embedded documentation 3122/head
Nicolas Lœuillet [Tue, 16 May 2017 11:09:40 +0000 (13:09 +0200)] 
Removed embedded documentation

6 years agoMerge pull request #3120 from aaa2000/fix-delete-annotation-user
Jérémy Benoist [Mon, 15 May 2017 09:42:05 +0000 (11:42 +0200)] 
Merge pull request #3120 from aaa2000/fix-delete-annotation-user

Fix delete annotation when username is defined

6 years agoMerge pull request #3113 from wallabag/upgrade-craue
Jérémy Benoist [Mon, 15 May 2017 07:05:08 +0000 (09:05 +0200)] 
Merge pull request #3113 from wallabag/upgrade-craue

Upgraded CraueConfigBundle to 2.0

6 years agoFix delete annotation when username is defined 3120/head
adev [Sun, 14 May 2017 09:38:02 +0000 (11:38 +0200)] 
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

6 years agoUpgraded CraueConfigBundle to 2.0 3113/head
Nicolas Lœuillet [Fri, 12 May 2017 14:33:12 +0000 (16:33 +0200)] 
Upgraded CraueConfigBundle to 2.0

6 years agoMerge pull request #3110 from wallabag/add-logger-matching-rules
Nicolas Lœuillet [Fri, 12 May 2017 14:17:48 +0000 (16:17 +0200)] 
Merge pull request #3110 from wallabag/add-logger-matching-rules

Added logger when we match Tagging rules

7 years agoAdded tests on logs records 3110/head
Nicolas Lœuillet [Fri, 12 May 2017 13:01:18 +0000 (15:01 +0200)] 
Added tests on logs records

7 years agoFixed tests
Nicolas Lœuillet [Fri, 12 May 2017 11:47:53 +0000 (13:47 +0200)] 
Fixed tests

7 years agoAdded logger when we match Tagging rules
Nicolas Lœuillet [Fri, 12 May 2017 11:13:19 +0000 (13:13 +0200)] 
Added logger when we match Tagging rules

7 years agoMerge pull request #3108 from wallabag/store-headers
Nicolas Lœuillet [Thu, 11 May 2017 15:39:21 +0000 (17:39 +0200)] 
Merge pull request #3108 from wallabag/store-headers

Added headers field in Entry

7 years agoReplaced json_array with array 3108/head
Nicolas Lœuillet [Thu, 11 May 2017 12:53:56 +0000 (14:53 +0200)] 
Replaced json_array with array
And fixed failing test due to @j0k3r :trollface:

7 years agoAdded headers field in Entry
Nicolas Lœuillet [Thu, 11 May 2017 12:18:21 +0000 (14:18 +0200)] 
Added headers field in Entry

7 years agoMerge pull request #3104 from wallabag/migration-username-length
Jérémy Benoist [Wed, 10 May 2017 09:24:59 +0000 (11:24 +0200)] 
Merge pull request #3104 from wallabag/migration-username-length

Added migration to change length for user fields

7 years agoMerge pull request #3101 from wallabag/credentials-new-extrafields
Jérémy Benoist [Wed, 10 May 2017 08:58:19 +0000 (10:58 +0200)] 
Merge pull request #3101 from wallabag/credentials-new-extrafields

Skip auth when no credentials are found

7 years agoAdded migration to change length for user fields 3104/head
Nicolas Lœuillet [Wed, 10 May 2017 08:46:32 +0000 (10:46 +0200)] 
Added migration to change length for user fields

7 years agoHandle empty configuration 3101/head
Jeremy Benoist [Wed, 10 May 2017 08:37:53 +0000 (10:37 +0200)] 
Handle empty configuration

7 years agoUpdate composer.json
Jérémy Benoist [Wed, 10 May 2017 08:23:08 +0000 (10:23 +0200)] 
Update composer.json

7 years agoMerge pull request #3095 from aaa2000/api-error-on-fail-fetch-content
Thomas Citharel [Wed, 10 May 2017 07:38:55 +0000 (09:38 +0200)] 
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

7 years agoMerge pull request #3103 from wallabag/api-delete-tag-query
Jérémy Benoist [Wed, 10 May 2017 07:32:27 +0000 (09:32 +0200)] 
Merge pull request #3103 from wallabag/api-delete-tag-query

Retrieve tag / tags value from query or request

7 years agoMerge pull request #3102 from wallabag/cache-yarn
Jérémy Benoist [Wed, 10 May 2017 06:53:04 +0000 (08:53 +0200)] 
Merge pull request #3102 from wallabag/cache-yarn

Cache yarn cache in Travis

7 years agoRemove the created entry to avoid side effects on other tests 3095/head
adev [Tue, 9 May 2017 21:19:24 +0000 (23:19 +0200)] 
Remove the created entry to avoid side effects on other tests

7 years agoRetrieve tag / tags value from query or request 3103/head
Jeremy Benoist [Tue, 9 May 2017 21:15:25 +0000 (23:15 +0200)] 
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)

7 years agoSkip auth when no credentials are found
Jeremy Benoist [Tue, 9 May 2017 20:25:18 +0000 (22:25 +0200)] 
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.

7 years agoCache yarn cache in Travis 3102/head
Jeremy Benoist [Tue, 9 May 2017 20:53:01 +0000 (22:53 +0200)] 
Cache yarn cache in Travis

7 years agoMerge pull request #2751 from bdunogier/2.2-guzzle_subscribers_improvement
Jérémy Benoist [Tue, 9 May 2017 15:10:03 +0000 (17:10 +0200)] 
Merge pull request #2751 from bdunogier/2.2-guzzle_subscribers_improvement

Improved Guzzle subscribers extensibility

7 years agoMerge pull request #3076 from wallabag/hotfix/2979
Nicolas Lœuillet [Tue, 9 May 2017 11:56:44 +0000 (13:56 +0200)] 
Merge pull request #3076 from wallabag/hotfix/2979

Disable negative numbers in filters

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 agoAdd some tests 3076/head
Jeremy Benoist [Tue, 9 May 2017 10:12:23 +0000 (12:12 +0200)] 
Add some tests

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 agoCS 2751/head
Jeremy Benoist [Tue, 9 May 2017 09:17:09 +0000 (11:17 +0200)] 
CS

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 agoCreate a new entry via API even when its content can't be retrieved
adev [Mon, 8 May 2017 10:35:02 +0000 (12:35 +0200)] 
Create a new entry via API even when its content can't be retrieved

Fix #2988

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 agoChanged parsing of login_extra_fields in guzzle auth
Bertrand Dunogier [Sat, 21 Jan 2017 23:42:05 +0000 (00:42 +0100)] 
Changed parsing of login_extra_fields in guzzle auth

7 years agoImproved Guzzle subscribers extensibility
Bertrand Dunogier [Sat, 14 Jan 2017 15:42:03 +0000 (16:42 +0100)] 
Improved Guzzle subscribers extensibility

Allows 3rd parties to register new guzzle subscribers by adding extra calls to the http_client_factory service.

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 agoDisable negative numbers in filters
Maxime Marinel [Wed, 3 May 2017 09:08:56 +0000 (11:08 +0200)] 
Disable negative numbers in filters

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