| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | Merge pull request #3153 from wallabag/content-proxy-refactor | Thomas Citharel | 2017-05-28 | 20 | -202/+266 |
|\ \ \
| |/ /
|/| | |
|
| * | | CS | Thomas Citharel | 2017-05-28 | 1 | -6/+0 |
| * | | CS | Thomas Citharel | 2017-05-28 | 4 | -5/+1 |
| * | | Move Tags assigner to a separate file | Thomas Citharel | 2017-05-27 | 20 | -200/+274 |
|/ / |
|
* | | Merge pull request #3145 from wallabag/fix-so | Jérémy Benoist | 2017-05-24 | 1 | -4/+4 |
|\ \ |
|
| * | | Fix SO tests | Jeremy Benoist | 2017-05-24 | 1 | -4/+4 |
|/ / |
|
* | | Switch back to latest guzzle-site-authenticator | Jeremy Benoist | 2017-05-24 | 1 | -1/+1 |
* | | Merge pull request #3133 from wallabag/testing-travis-failure | Jérémy Benoist | 2017-05-19 | 3 | -37/+29 |
|\ \ |
|
| * | | Ensure download_images_enabled is disabled | Jeremy Benoist | 2017-05-19 | 1 | -1/+20 |
| * | | Fold migrations & fixtures command on Travis | Jeremy Benoist | 2017-05-19 | 2 | -36/+9 |
|/ / |
|
* | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-19 | 23 | -630/+753 |
|\| |
|
| * | Merge pull request #3130 from X-dark/master | Jérémy Benoist | 2017-05-19 | 13 | -13/+13 |
| |\ |
|
| | * | modify key name as well | Cedric Girard | 2017-05-18 | 13 | -13/+13 |
| | * | unify Download/Export wording. | Cedric Girard | 2017-05-18 | 9 | -9/+9 |
| |/ |
|
| * | Merge pull request #3125 from wallabag/prepare-222 | Jérémy Benoist | 2017-05-17 | 2 | -601/+651 |
| |\ |
|
| | * | Prepare wallabag 2.2.3 | Nicolas Lœuillet | 2017-05-17 | 2 | -601/+651 |
| |/ |
|
| * | Merge pull request #3117 from wallabag/fix-doc | Nicolas Lœuillet | 2017-05-17 | 3 | -9/+10 |
| |\ |
|
| | * | Fixed documentation URL | Nicolas Lœuillet | 2017-05-17 | 3 | -9/+10 |
| |/ |
|
| * | Merge pull request #3124 from wallabag/lock-guzzle-auth | Nicolas Lœuillet | 2017-05-17 | 2 | -7/+1 |
| |\ |
|
| | * | Lock guzzle-site-authenticator to avoid error | Jeremy Benoist | 2017-05-16 | 2 | -7/+1 |
| |/ |
|
| * | Merge pull request #3123 from X-dark/master | Jérémy Benoist | 2017-05-16 | 1 | -1/+1 |
| |\ |
|
| | * | reorder contrib strings in about page | Cedric Girard | 2017-05-16 | 1 | -1/+1 |
| |/ |
|
| * | Merge pull request #3095 from aaa2000/api-error-on-fail-fetch-content | Thomas Citharel | 2017-05-10 | 2 | -4/+47 |
| |\ |
|
| | * | Remove the created entry to avoid side effects on other tests | adev | 2017-05-09 | 1 | -8/+18 |
| | * | Create a new entry via API even when its content can't be retrieved | adev | 2017-05-08 | 2 | -4/+37 |
| * | | Merge pull request #3076 from wallabag/hotfix/2979 | Nicolas Lœuillet | 2017-05-09 | 2 | -1/+30 |
| |\ \ |
|
| | * | | Add some tests | Jeremy Benoist | 2017-05-09 | 2 | -3/+29 |
| | * | | Disable negative numbers in filters | Maxime Marinel | 2017-05-03 | 1 | -0/+3 |
* | | | | Update of the oc version of CoreBundle | Quent-in | 2017-05-18 | 1 | -13/+13 |
* | | | | Merge pull request #3122 from wallabag/delete-doc | Thomas Citharel | 2017-05-17 | 143 | -11106/+0 |
|\ \ \ \ |
|
| * | | | | Removed embedded documentation | Nicolas Lœuillet | 2017-05-16 | 143 | -11106/+0 |
|/ / / / |
|
* | | | | Merge pull request #3120 from aaa2000/fix-delete-annotation-user | Jérémy Benoist | 2017-05-15 | 3 | -2/+7 |
|\ \ \ \ |
|
| * | | | | Fix delete annotation when username is defined | adev | 2017-05-14 | 3 | -2/+7 |
* | | | | | Merge pull request #3113 from wallabag/upgrade-craue | Jérémy Benoist | 2017-05-15 | 5 | -13/+14 |
|\ \ \ \ \ |
|
| * | | | | | Upgraded CraueConfigBundle to 2.0 | Nicolas Lœuillet | 2017-05-12 | 5 | -13/+14 |
| |/ / / / |
|
* | | | | | Merge pull request #3110 from wallabag/add-logger-matching-rules | Nicolas Lœuillet | 2017-05-12 | 3 | -2/+35 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Added tests on logs records | Nicolas Lœuillet | 2017-05-12 | 1 | -3/+22 |
| * | | | | Fixed tests | Nicolas Lœuillet | 2017-05-12 | 1 | -1/+7 |
| * | | | | Added logger when we match Tagging rules | Nicolas Lœuillet | 2017-05-12 | 2 | -1/+9 |
|/ / / / |
|
* | | | | Merge pull request #3108 from wallabag/store-headers | Nicolas Lœuillet | 2017-05-11 | 4 | -4/+93 |
|\ \ \ \ |
|
| * | | | | Replaced json_array with array | Nicolas Lœuillet | 2017-05-11 | 2 | -5/+5 |
| * | | | | Added headers field in Entry | Nicolas Lœuillet | 2017-05-11 | 4 | -1/+90 |
|/ / / / |
|
* | | | | Merge pull request #3104 from wallabag/migration-username-length | Jérémy Benoist | 2017-05-10 | 1 | -0/+60 |
|\ \ \ \ |
|
| * | | | | Added migration to change length for user fields | Nicolas Lœuillet | 2017-05-10 | 1 | -0/+60 |
* | | | | | Merge pull request #3101 from wallabag/credentials-new-extrafields | Jérémy Benoist | 2017-05-10 | 4 | -22/+58 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Handle empty configuration | Jeremy Benoist | 2017-05-10 | 1 | -1/+1 |
| * | | | | Update composer.json | Jérémy Benoist | 2017-05-10 | 1 | -1/+1 |
| * | | | | Skip auth when no credentials are found | Jeremy Benoist | 2017-05-09 | 5 | -23/+59 |
* | | | | | Merge pull request #3103 from wallabag/api-delete-tag-query | Jérémy Benoist | 2017-05-10 | 2 | -6/+28 |
|\ \ \ \ \ |
|
| * | | | | | Retrieve tag / tags value from query or request | Jeremy Benoist | 2017-05-09 | 2 | -6/+28 |
| |/ / / / |
|