Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Save changes | Thomas Citharel | 2017-05-30 | 10 | -7/+298 |
| | | | | | | | | | | | | | | | | | | PHP CS Fixed Events on changes Renamed field First draft for migration (create table Change) Added setter for tag in EntryTaggedEvent Fixed migration for Change table Added API route for entry history Removed deletion history | ||||
* | Merge pull request #3147 from wallabag/delete-confirm | Jérémy Benoist | 2017-05-30 | 17 | -20/+65 |
|\ | | | | | Add some deletion confirmation to avoid mistake | ||||
| * | Update messages.pl.yml | Mateusz Rumiński | 2017-05-29 | 1 | -8/+8 |
| | | | | | | add missing translation | ||||
| * | update :de: messages.de.yml | Sven Fischer | 2017-05-29 | 1 | -8/+8 |
| | | |||||
| * | Add some deletion confirmation to avoid mistake | Jeremy Benoist | 2017-05-24 | 17 | -8/+53 |
| | | |||||
* | | CS | Thomas Citharel | 2017-05-28 | 4 | -5/+1 |
| | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | Move Tags assigner to a separate file | Thomas Citharel | 2017-05-27 | 11 | -64/+105 |
|/ | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-19 | 18 | -28/+47 |
|\ | |||||
| * | 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 |
| | | | | | | | | This fixes #2967 | ||||
| * | Fixed documentation URL | Nicolas Lœuillet | 2017-05-17 | 3 | -9/+10 |
| | | |||||
| * | 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 | 1 | -4/+13 |
| |\ | | | | | | | Create a new entry via API even when its content can't be retrieved | ||||
| | * | Create a new entry via API even when its content can't be retrieved | adev | 2017-05-08 | 1 | -4/+13 |
| | | | | | | | | | | | | Fix #2988 | ||||
| * | | Merge pull request #3076 from wallabag/hotfix/2979 | Nicolas Lœuillet | 2017-05-09 | 1 | -1/+10 |
| |\ \ | | | | | | | | | Disable negative numbers in filters | ||||
| | * | | Add some tests | Jeremy Benoist | 2017-05-09 | 1 | -3/+9 |
| | | | | |||||
| | * | | 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 ". | ||||
* | | | | Added logger when we match Tagging rules | Nicolas Lœuillet | 2017-05-12 | 2 | -1/+9 |
| | | | | |||||
* | | | | Replaced json_array with array | Nicolas Lœuillet | 2017-05-11 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | And fixed failing test due to @j0k3r :trollface: | ||||
* | | | | Added headers field in Entry | Nicolas Lœuillet | 2017-05-11 | 2 | -1/+34 |
| | | | | |||||
* | | | | Merge pull request #3101 from wallabag/credentials-new-extrafields | Jérémy Benoist | 2017-05-10 | 3 | -9/+31 |
|\ \ \ \ | | | | | | | | | | | Skip auth when no credentials are found | ||||
| * | | | | Handle empty configuration | Jeremy Benoist | 2017-05-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Skip auth when no credentials are found | Jeremy Benoist | 2017-05-09 | 3 | -9/+31 |
| | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | Retrieve tag / tags value from query or request | Jeremy Benoist | 2017-05-09 | 1 | -2/+2 |
|/ / / / | | | | | | | | | | | | | | | | | 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 #2751 from bdunogier/2.2-guzzle_subscribers_improvement | Jérémy Benoist | 2017-05-09 | 3 | -11/+48 |
|\ \ \ \ | | | | | | | | | | | 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 | 1 | -1/+27 |
| | | | | | |||||
| * | | | | 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 | 6 | -5/+15 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Update graby* licenses | Jérémy Benoist | 2017-05-09 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fix API pagination is broken if perPage is custom value | adev | 2017-05-08 | 1 | -1/+2 |
| | |_|/ | |/| | | | | | | | | | | Fix #2720 | ||||
| * | | | Translate error message in login page | adev | 2017-05-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Fix #2933 | ||||
| * | | | 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 #3022 from wallabag/webpack | Thomas Citharel | 2017-05-09 | 8 | -75/+77 |
|\ \ \ | | | | | | | | | Adds Webpack support and remove Grunt | ||||
| * | | | Fix review again | Thomas Citharel | 2017-05-07 | 1 | -36/+38 |
| | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | | Fix reviews | Aline | 2017-05-07 | 3 | -8/+7 |
| | | | | | | | | | | | | | | | | Signed-off-by: Aline <chetta.aline@gmail.com> | ||||
| * | | | Fix according to review | Thomas Citharel | 2017-05-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix theme changes | Thomas Citharel | 2017-05-04 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | | Adds Webpack support and removes the use for Grunt | Thomas Citharel | 2017-05-04 | 6 | -25/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | Merge pull request #3088 from wallabag/execute-migrations-after-install | Jérémy Benoist | 2017-05-05 | 1 | -7/+16 |
|\ \ \ \ | | | | | | | | | | | Added migrations execution after fresh install | ||||
| * | | | | Added migrations execution after fresh install | Nicolas Lœuillet | 2017-05-05 | 1 | -7/+16 |
| | | | | | |||||
* | | | | | Merge pull request #2920 from wallabag/cleanduplicatescommand | Jérémy Benoist | 2017-05-05 | 2 | -0/+149 |
|\ \ \ \ \ | |/ / / / |/| | | | | Clean Duplicates Command | ||||
| * | | | | Fixed @j0k3r review | Nicolas Lœuillet | 2017-05-05 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | Added test for deduplication | Nicolas Lœuillet | 2017-05-05 | 1 | -0/+19 |
| | | | | | |||||
| * | | | | Add Clean Duplicates Command | Thomas Citharel | 2017-05-01 | 2 | -0/+132 |
| | | | | | |||||
* | | | | | Merge pull request #3053 from wallabag/api-bulk-add | Nicolas Lœuillet | 2017-05-05 | 3 | -76/+179 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Added API endpoint to handle a list of URL | ||||
| * | | | | Little refacto and send 400 on reaching urls limit | Jeremy Benoist | 2017-05-05 | 1 | -102/+94 |
| | | | | | |||||
| * | | | | Added limit | Nicolas Lœuillet | 2017-05-01 | 3 | -0/+13 |
| | | | | | |||||
| * | | | | Fix tests | Jeremy Benoist | 2017-05-01 | 1 | -1/+0 |
| | | | | |