Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | Move Tags assigner to a separate file | Thomas Citharel | 2017-05-27 | 1 | -1/+5 |
|/ | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-19 | 16 | -23/+24 |
|\ | |||||
| * | 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 | ||||
* | | 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 | 1 | -0/+1 |
| | | |||||
* | | Skip auth when no credentials are found | Jeremy Benoist | 2017-05-09 | 1 | -0/+3 |
| | | | | | | | | 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 #2751 from bdunogier/2.2-guzzle_subscribers_improvement | Jérémy Benoist | 2017-05-09 | 1 | -1/+2 |
|\ \ | | | | | | | Improved Guzzle subscribers extensibility | ||||
| * | | Improved Guzzle subscribers extensibility | Bertrand Dunogier | 2017-05-04 | 1 | -1/+2 |
| | | | | | | | | | | | | 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 | 1 | -2/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Update graby* licenses | Jérémy Benoist | 2017-05-09 | 1 | -2/+2 |
| | | | |||||
* | | | 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 #3060 from wallabag/search-users | Thomas Citharel | 2017-05-04 | 12 | -69/+93 |
|\ \ \ | |/ / |/| | | Search & paginate users | ||||
| * | | Merged list and search methods | Nicolas Lœuillet | 2017-05-02 | 12 | -82/+70 |
| | | | |||||
| * | | Add filter to users management page | Thomas Citharel | 2017-05-02 | 12 | -0/+36 |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | | Merge pull request #3047 from wallabag/add-notmatches-operator | Nicolas Lœuillet | 2017-05-03 | 14 | -3/+24 |
|\ \ \ | | | | | | | | | Added notmatches operator for tagging rule | ||||
| * | | | Added notmatches operator for tagging rule | Nicolas Lœuillet | 2017-04-20 | 14 | -3/+24 |
| | | | | |||||
* | | | | Fixed sandwich menu position in entry view (material theme) | Nicolas Lœuillet | 2017-05-02 | 1 | -5/+5 |
| |/ / |/| | | |||||
* | | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-01 | 1 | -1/+1 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Correct create_application en string | Éric Gillet | 2017-04-29 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3024 from wallabag/store-date | Nicolas Lœuillet | 2017-04-18 | 14 | -3/+55 |
|\ \ | | | | | | | Added publication date and author | ||||
| * | | Added author of article | Nicolas Lœuillet | 2017-04-09 | 14 | -2/+30 |
| | | | |||||
| * | | Added publication date | Nicolas Lœuillet | 2017-04-05 | 14 | -3/+27 |
| | | | |||||
* | | | Removed is_public in Entry edit form | Nicolas Lœuillet | 2017-04-13 | 13 | -17/+0 |
|/ / | |||||
* | | Added delete button on Baggy theme | Nicolas Lœuillet | 2017-03-31 | 1 | -0/+5 |
| | | |||||
* | | Allow to remove all archived entries | Thomas Citharel | 2017-03-31 | 13 | -0/+27 |
| | | | | | | | | | | | | Since we still support fucking SQLite, we need to retrieve all tags & annotations for archived entries before deleting them. Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | Scuttle sharing | FrenchHope | 2017-03-28 | 2 | -0/+9 |
|/ | |||||
* | remove language on html-tag | Christoph Doblander | 2017-03-06 | 1 | -1/+1 |
| | |||||
* | Update Spanish translation | ngosang | 2017-02-20 | 1 | -161/+161 |
| | |||||
* | Merge pull request #2830 from Kdecherf/striptags-title | Nicolas Lœuillet | 2017-02-17 | 5 | -19/+19 |
|\ | | | | | Fix rendering of entry title in Twig views | ||||
| * | views: cosmetic in share links href | Kevin Decherf | 2017-02-16 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Fix rendering of entry title in Twig views | Kevin Decherf | 2017-02-02 | 5 | -19/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit provides some improvements on the rendering of entry title on entries list and entry views and refactors filter calls: - Remove escape filter from apparent title, striptags is enough - Move raw filter to the end of apparent title as it's ignored if not placed as the last filter - Replace raw filter with e('html_attr') for title used in attributes, fixing possible issue and/or glitch - Add striptags to entry.title used for link sharing to respect the apparent title Fixes #2802 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | Update Spanish translation | ngosang | 2017-02-15 | 1 | -113/+113 |
| | | |||||
* | | Merge pull request #2879 from matteocoder/matteocoder-patch-1 | Nicolas Lœuillet | 2017-02-14 | 1 | -1/+1 |
|\ \ | | | | | | | Fixed typo in "first_steps" | ||||
| * | | Fixed typo in "first_steps" | matteocoder | 2017-01-24 | 1 | -1/+1 |
| | | | | | | | | | Changed "Pimi passi" to "Primi passi | ||||
* | | | Log restricted access value | Jeremy Benoist | 2017-02-13 | 1 | -0/+1 |
| | | | | | | | | | | | | It might help to figure out if we have enabled it or not | ||||
* | | | fix misspells in polish translation | Mateusz Rumiński | 2017-02-06 | 1 | -6/+6 |
| | | | |||||
* | | | Merge pull request #2842 from K-Phoen/update-rulerz | Jeremy Benoist | 2017-02-06 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | Update RulerZ | ||||
| * | | | Update RulerZ | Kévin Gomez | 2017-02-05 | 1 | -2/+2 |
| | | | |