aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3120 from aaa2000/fix-delete-annotation-userJérémy Benoist2017-05-153-2/+7
|\ | | | | Fix delete annotation when username is defined
| * Fix delete annotation when username is definedadev2017-05-143-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-craueJérémy Benoist2017-05-155-13/+14
|\ \ | | | | | | Upgraded CraueConfigBundle to 2.0
| * | Upgraded CraueConfigBundle to 2.0Nicolas Lœuillet2017-05-125-13/+14
| |/
* | Merge pull request #3110 from wallabag/add-logger-matching-rulesNicolas Lœuillet2017-05-123-2/+35
|\ \ | |/ |/| Added logger when we match Tagging rules
| * Added tests on logs recordsNicolas Lœuillet2017-05-121-3/+22
| |
| * Fixed testsNicolas Lœuillet2017-05-121-1/+7
| |
| * Added logger when we match Tagging rulesNicolas Lœuillet2017-05-122-1/+9
|/
* Merge pull request #3108 from wallabag/store-headersNicolas Lœuillet2017-05-114-4/+93
|\ | | | | Added headers field in Entry
| * Replaced json_array with arrayNicolas Lœuillet2017-05-112-5/+5
| | | | | | | | And fixed failing test due to @j0k3r :trollface:
| * Added headers field in EntryNicolas Lœuillet2017-05-114-1/+90
|/
* Merge pull request #3104 from wallabag/migration-username-lengthJérémy Benoist2017-05-101-0/+60
|\ | | | | Added migration to change length for user fields
| * Added migration to change length for user fieldsNicolas Lœuillet2017-05-101-0/+60
| |
* | Merge pull request #3101 from wallabag/credentials-new-extrafieldsJérémy Benoist2017-05-104-22/+58
|\ \ | |/ |/| Skip auth when no credentials are found
| * Handle empty configurationJeremy Benoist2017-05-101-1/+1
| |
| * Update composer.jsonJérémy Benoist2017-05-101-1/+1
| |
| * Skip auth when no credentials are foundJeremy Benoist2017-05-095-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-queryJérémy Benoist2017-05-102-6/+28
|\ \ | | | | | | Retrieve tag / tags value from query or request
| * | Retrieve tag / tags value from query or requestJeremy Benoist2017-05-092-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-yarnJérémy Benoist2017-05-101-0/+1
|\ \ | |/ |/| Cache yarn cache in Travis
| * Cache yarn cache in TravisJeremy Benoist2017-05-091-0/+1
|/
* Merge pull request #2751 from bdunogier/2.2-guzzle_subscribers_improvementJérémy Benoist2017-05-094-12/+49
|\ | | | | Improved Guzzle subscribers extensibility
| * CSJeremy Benoist2017-05-091-1/+1
| |
| * Changed parsing of login_extra_fields in guzzle authBertrand Dunogier2017-05-042-2/+28
| |
| * Improved Guzzle subscribers extensibilityBertrand Dunogier2017-05-042-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.3Jeremy Benoist2017-05-0913-11/+37
|\ \
| * \ Merge pull request #3097 from wallabag/update-licenseJérémy Benoist2017-05-091-2/+2
| |\ \ | | | | | | | | Update graby* licenses
| | * | Update graby* licensesJérémy Benoist2017-05-091-2/+2
| |/ /
| * | Merge pull request #3096 from aaa2000/fix-api-entries-pagination-with-perpageJérémy Benoist2017-05-092-1/+18
| |\ \ | | | | | | | | Fix API pagination is broken if perPage is custom value
| | * | Fix API pagination is broken if perPage is custom valueadev2017-05-082-1/+18
| |/ / | | | | | | | | | Fix #2720
| * | Merge pull request #3090 from aaa2000/translate-login-page-errorNicolas Lœuillet2017-05-071-1/+1
| |\ \ | | | | | | | | Translate error message in login page
| | * | Translate error message in login pageadev2017-05-061-1/+1
| |/ / | | | | | | | | | Fix #2933
| * | Merge pull request #3082 from aaa2000/fix-form-errors-displayJérémy Benoist2017-05-054-1/+11
| |\ \ | | | | | | | | Fix display the form errors correctly
| | * | Fix display the form errors correctlyadev2017-05-054-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/3061Nicolas Lœuillet2017-05-026-6/+6
| |\ \ \ | | |/ / | |/| | Small typo in documentation fix #3061
| | * | Small typo in documentation fix #3061Maxime Marinel2017-05-026-6/+6
| |/ /
* | | Merge pull request #3022 from wallabag/webpackThomas Citharel2017-05-09202-132081/+8809
|\ \ \ | | | | | | | | Adds Webpack support and remove Grunt
| * | | icon mail a bit betterThomas Citharel2017-05-092-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | fix 3-dots menu positionThomas Citharel2017-05-081-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | Fix review againThomas Citharel2017-05-074-51/+57
| | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | Fix reviewsAline2017-05-0710-9/+33
| | | | | | | | | | | | | | | | Signed-off-by: Aline <chetta.aline@gmail.com>
| * | | fixed margin on sidebar menuThomas Citharel2017-05-052-2/+2
| | | |
| * | | Fix according to reviewThomas Citharel2017-05-047-1054/+41
| | | |
| * | | rebaseThomas Citharel2017-05-042-1/+6
| | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | Use npm script instead of direct webpack callThomas Citharel2017-05-041-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | fix travisThomas Citharel2017-05-041-4/+3
| | | |
| * | | fix theme changesThomas Citharel2017-05-041-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | add comment to config.yml to explain live reload featureThomas Citharel2017-05-041-0/+1
| | | |
| * | | disable default dev serverThomas Citharel2017-05-041-1/+1
| | | |
| * | | Adds Webpack support and removes the use for GruntThomas Citharel2017-05-04197-131003/+8709
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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