mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-06-29 02:20:47 +00:00
Code Issues Projects Releases Wiki Activity
3910 commits 13 branches 99 tags 148 MiB
Commit graph

3910 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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