Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2683 from wallabag/credentials-in-db | Jérémy Benoist | 2017-06-20 | 9 | -10/+328 |
|\ | | | | | Store credentials in DB | ||||
| * | Get rid of masked value in listing | Jeremy Benoist | 2017-06-20 | 2 | -6/+0 |
| | | |||||
| * | Fix reviews | Thomas Citharel | 2017-06-20 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | Encrypt username too Redirect to list after saving credentials Fix typos Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | Add menu access to site credentials CRUD | Jeremy Benoist | 2017-06-20 | 5 | -4/+12 |
| | | |||||
| * | Update route & user verification | Jeremy Benoist | 2017-06-20 | 3 | -4/+4 |
| | | |||||
| * | Add CRUD for site credentials | Jeremy Benoist | 2017-06-20 | 7 | -10/+324 |
| | | |||||
* | | Add isPublic filter on entries | Jeremy Benoist | 2017-06-10 | 2 | -0/+16 |
|/ | |||||
* | Fix tags count in tags list on baggy | Jeremy Benoist | 2017-06-10 | 1 | -1/+1 |
| | |||||
* | Create a client when creating a user using the api | Jeremy Benoist | 2017-06-07 | 1 | -1/+1 |
| | | | | | | | | While creating a new user using the API, we also create a new client for the current user. So the app which just create the user can use its newly created client to configure the app. That new client is only return after creating the user. When calling the endpoint /api/user to get user information, the new client information won’t be return. | ||||
* | Add some flex magic | Thomas Citharel | 2017-05-31 | 1 | -18/+16 |
| | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | Fixed tags display on grid view | Nicolas Lœuillet | 2017-05-31 | 2 | -23/+28 |
| | |||||
* | Added tags on list view | Nicolas Lœuillet | 2017-05-30 | 1 | -1/+8 |
| | |||||
* | Add some deletion confirmation to avoid mistake | Jeremy Benoist | 2017-05-24 | 5 | -8/+17 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-19 | 4 | -11/+12 |
|\ | |||||
| * | modify key name as well | Cedric Girard | 2017-05-18 | 1 | -1/+1 |
| | | |||||
| * | 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 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 |
| | | |||||
* | | 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 #3047 from wallabag/add-notmatches-operator | Nicolas Lœuillet | 2017-05-03 | 1 | -2/+2 |
|\ \ | | | | | | | Added notmatches operator for tagging rule | ||||
| * | | Added notmatches operator for tagging rule | Nicolas Lœuillet | 2017-04-20 | 1 | -2/+2 |
| | | | |||||
* | | | Fixed sandwich menu position in entry view (material theme) | Nicolas Lœuillet | 2017-05-02 | 1 | -5/+5 |
|/ / | |||||
* | | Merge pull request #3024 from wallabag/store-date | Nicolas Lœuillet | 2017-04-18 | 2 | -3/+31 |
|\ \ | | | | | | | Added publication date and author | ||||
| * | | Added author of article | Nicolas Lœuillet | 2017-04-09 | 2 | -2/+18 |
| | | | |||||
| * | | Added publication date | Nicolas Lœuillet | 2017-04-05 | 2 | -3/+15 |
| | | | |||||
* | | | Removed is_public in Entry edit form | Nicolas Lœuillet | 2017-04-13 | 1 | -5/+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 | 1 | -0/+3 |
| | | | | | | | | | | | | 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 |
|/ | |||||
* | 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> | ||||
* | | Show active list in the left menu during search | Kevin Decherf | 2017-02-05 | 1 | -4/+16 |
|/ | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2017-01-26 | 8 | -21/+21 |
|\ | |||||
| * | Fixed possible JS injection via the title edition | Nicolas Lœuillet | 2017-01-17 | 8 | -21/+21 |
| | | |||||
* | | Fix double overlay on expanded right sidenav | Simounet | 2016-12-30 | 2 | -4/+4 |
| | | |||||
* | | Merge pull request #2725 from lapineige/master | Nicolas Lœuillet | 2016-12-30 | 2 | -2/+2 |
|\ \ | | | | | | | Share to Shaarli - Include tags | ||||
| * | | Share tags to Shaarli - Material theme | lapineige | 2016-12-28 | 1 | -1/+1 |
| | | | |||||
| * | | Share tags to Shaarli - Baggy theme | lapineige | 2016-12-28 | 1 | -1/+1 |
| |/ | |||||
* | | Access to search, filters, export on mobile | Simounet | 2016-12-29 | 1 | -24/+22 |
| | | |||||
* | | Fix entry reading time | Simounet | 2016-12-27 | 3 | -10/+9 |
| | | |||||
* | | Moved total messages from import | Nicolas Lœuillet | 2016-12-08 | 1 | -2/+0 |
| | | |||||
* | | Updated addons links | Nicolas Lœuillet | 2016-12-01 | 1 | -1/+2 |
| | | |||||
* | | Added floating button on entry view for mobile | Nicolas Lœuillet | 2016-11-30 | 1 | -0/+11 |
| | | |||||
* | | Renamed view_mode by list_mode and hide excerpt | Nicolas Lœuillet | 2016-11-28 | 3 | -13/+17 |
| | |