Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge pull request #3123 from X-dark/master | Jérémy Benoist | 2017-05-16 | 1 | -1/+1 | |
| |\ | | | | | | | reorder contrib strings in about page | |||||
| | * | reorder contrib strings in about page | Cedric Girard | 2017-05-16 | 1 | -1/+1 | |
| |/ | | | | | | | this fixes #2891 | |||||
| * | Merge pull request #3095 from aaa2000/api-error-on-fail-fetch-content | Thomas Citharel | 2017-05-10 | 2 | -4/+47 | |
| |\ | | | | | | | Create a new entry via API even when its content can't be retrieved | |||||
| | * | 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 | |
| | | | | | | | | | | | | Fix #2988 | |||||
| * | | Merge pull request #3076 from wallabag/hotfix/2979 | Nicolas Lœuillet | 2017-05-09 | 2 | -1/+30 | |
| |\ \ | | | | | | | | | Disable negative numbers in filters | |||||
| | * | | 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 | |
| | | | | | | | | | | | | I hope I didn't break everything with the ' and ". | |||||
* | | | | Merge pull request #3122 from wallabag/delete-doc | Thomas Citharel | 2017-05-17 | 143 | -11106/+0 | |
|\ \ \ \ | | | | | | | | | | | Removed embedded documentation | |||||
| * | | | | 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 | |||||
| * | | | | Fix delete annotation when username is defined | adev | 2017-05-14 | 3 | -2/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an user set his name in "Config" > "User Information", he can't delete or update an annotation Fix #2382 | |||||
* | | | | | Merge pull request #3113 from wallabag/upgrade-craue | Jérémy Benoist | 2017-05-15 | 5 | -13/+14 | |
|\ \ \ \ \ | | | | | | | | | | | | | Upgraded CraueConfigBundle to 2.0 | |||||
| * | | | | | 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 logger when we match Tagging rules | |||||
| * | | | | 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 | |
|\ \ \ \ | | | | | | | | | | | Added headers field in Entry | |||||
| * | | | | Replaced json_array with array | Nicolas Lœuillet | 2017-05-11 | 2 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | And fixed failing test due to @j0k3r :trollface: | |||||
| * | | | | 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 | |||||
| * | | | | 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 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Skip auth when no credentials are found | |||||
| * | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | | | | 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 | |||||
| * | | | | | Retrieve tag / tags value from query or request | Jeremy Benoist | 2017-05-09 | 2 | -6/+28 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | 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) | |||||
* | | | | | Merge pull request #3102 from wallabag/cache-yarn | Jérémy Benoist | 2017-05-10 | 1 | -0/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Cache yarn cache in Travis | |||||
| * | | | | Cache yarn cache in Travis | Jeremy Benoist | 2017-05-09 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #2751 from bdunogier/2.2-guzzle_subscribers_improvement | Jérémy Benoist | 2017-05-09 | 4 | -12/+49 | |
|\ \ \ \ | | | | | | | | | | | Improved Guzzle subscribers extensibility | |||||
| * | | | | CS | Jeremy Benoist | 2017-05-09 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Changed parsing of login_extra_fields in guzzle auth | Bertrand Dunogier | 2017-05-04 | 2 | -2/+28 | |
| | | | | | ||||||
| * | | | | Improved Guzzle subscribers extensibility | Bertrand Dunogier | 2017-05-04 | 2 | -9/+20 | |
| | | | | | | | | | | | | | | | | | | | | Allows 3rd parties to register new guzzle subscribers by adding extra calls to the http_client_factory service. | |||||
* | | | | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-09 | 13 | -11/+37 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Merge pull request #3097 from wallabag/update-license | Jérémy Benoist | 2017-05-09 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | | | Update graby* licenses | |||||
| | * | | | | Update graby* licenses | Jérémy Benoist | 2017-05-09 | 1 | -2/+2 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #3096 from aaa2000/fix-api-entries-pagination-with-perpage | Jérémy Benoist | 2017-05-09 | 2 | -1/+18 | |
| |\ \ \ \ | | |_|_|/ | |/| | | | Fix API pagination is broken if perPage is custom value | |||||
| | * | | | Fix API pagination is broken if perPage is custom value | adev | 2017-05-08 | 2 | -1/+18 | |
| |/ / / | | | | | | | | | | | | | Fix #2720 | |||||
| * | | | Merge pull request #3090 from aaa2000/translate-login-page-error | Nicolas Lœuillet | 2017-05-07 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | Translate error message in login page | |||||
| | * | | | Translate error message in login page | adev | 2017-05-06 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | | | | | Fix #2933 | |||||
| * | | | Merge pull request #3082 from aaa2000/fix-form-errors-display | Jérémy Benoist | 2017-05-05 | 4 | -1/+11 | |
| |\ \ \ | | |_|/ | |/| | | Fix display the form errors correctly | |||||
| | * | | Fix display the form errors correctly | adev | 2017-05-05 | 4 | -1/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | Merge pull request #3072 from wallabag/hotfix/3061 | Nicolas Lœuillet | 2017-05-02 | 6 | -6/+6 | |
| |\ \ \ | | |/ / | |/| | | Small typo in documentation fix #3061 | |||||
| | * | | Small typo in documentation fix #3061 | Maxime Marinel | 2017-05-02 | 6 | -6/+6 | |
| |/ / | ||||||
* | | | Merge pull request #3022 from wallabag/webpack | Thomas Citharel | 2017-05-09 | 202 | -132081/+8809 | |
|\ \ \ | | | | | | | | | Adds Webpack support and remove Grunt | |||||
| * | | | icon mail a bit better | Thomas Citharel | 2017-05-09 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | |||||
| * | | | fix 3-dots menu position | Thomas Citharel | 2017-05-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> |