Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-03-28 | 13 | -291/+311 |
|\ | |||||
| * | remove language on html-tag | Christoph Doblander | 2017-03-06 | 1 | -1/+1 |
| | | |||||
| * | Update Spanish translation | ngosang | 2017-02-20 | 1 | -161/+161 |
| | | |||||
| * | Import: we now skip messages when user is null | Nicolas Lœuillet | 2017-02-20 | 1 | -1/+2 |
| | | |||||
| * | Merge pull request #2832 from Kdecherf/search-domain | Jeremy Benoist | 2017-02-19 | 1 | -1/+2 |
| |\ | | | | | | | Search by term: extend to entries url | ||||
| | * | Search by term: extend to entries url | Kevin Decherf | 2017-02-16 | 1 | -1/+2 |
| | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | 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 | 2 | -113/+124 |
| | | | |||||
| * | | 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 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | It might help to figure out if we have enabled it or not | ||||
* | | | | return id of article instead of true if entry exists | Thomas Citharel | 2017-02-24 | 1 | -2/+2 |
|/ / / | |||||
* | | | 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 |
| | | | | |||||
* | | | | 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> | ||||
* | / | Update Oc version | Quent-in | 2017-02-04 | 1 | -60/+60 |
| |/ |/| | | | I'll be ready for next train | ||||
* | | Merge pull request #2824 from wallabag/simplify-strings | Nicolas Lœuillet | 2017-02-02 | 12 | -71/+71 |
|\ \ | | | | | | | Renamed Developer section to API client management | ||||
| * | | Update polish strings | Mateusz Rumiński | 2017-02-01 | 1 | -5/+5 |
| | | | | | | | | | update missing polish strings | ||||
| * | | Update german strings. | Julian Oster | 2017-02-01 | 1 | -5/+5 |
| | | | |||||
| * | | Renamed Developer section to API client management | Nicolas Lœuillet | 2017-02-01 | 12 | -71/+71 |
| | | | |||||
* | | | Translate missing strings for de-DE. | Julian Oster | 2017-02-01 | 1 | -40/+40 |
|/ / | |||||
* | | 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 phpcs and tests | Thomas Citharel | 2017-01-24 | 1 | -14/+9 |
| | | |||||
* | | add filepath test | Thomas Citharel | 2017-01-22 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | add cli export | Thomas Citharel | 2017-01-22 | 2 | -0/+87 |
| | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | Order tags by slug | Jan Losinski | 2017-01-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | This adds an orderBy clause to findAllTags(). This makes the list of tags more useful, as the tags appear in alphanumerical order instead of somehow random. Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de> | ||||
* | | Avoid false preview image | Jeremy Benoist | 2017-01-10 | 1 | -1/+1 |
| | | | | | | | | | | If the website doesn't provide an og_image, the value will be false and so it'll be saved like that in the database. We prefer to leave it as null instead of false. | ||||
* | | Merge pull request #2735 from wallabag/remove-small-readingtime | Nicolas Lœuillet | 2016-12-30 | 12 | -24/+24 |
|\ \ | | | | | | | Removed the small element on reading time | ||||
| * | | Removed the small element on reading time | Nicolas Lœuillet | 2016-12-30 | 12 | -24/+24 |
| | | | |||||
* | | | 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 |
| |/ | |||||
* | | Firefox add-on URL updated | Simounet | 2016-12-30 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2730 from Simounet/feature/all-actions-on-mobile | Nicolas Lœuillet | 2016-12-30 | 1 | -24/+22 |
|\ \ | | | | | | | Access to search, filters, export on mobile | ||||
| * | | Access to search, filters, export on mobile | Simounet | 2016-12-29 | 1 | -24/+22 |
| | | | |||||
* | | | Merge pull request #2731 from llune/patch-2 | Nicolas Lœuillet | 2016-12-30 | 1 | -4/+4 |
|\ \ \ | |/ / |/| | | Minor typo fix | ||||
| * | | Minor typo fix | llune | 2016-12-30 | 1 | -4/+4 |
| |/ | |||||
* | | Merge pull request #2702 from wallabag/add-index-uuid | Nicolas Lœuillet | 2016-12-29 | 2 | -18/+21 |
|\ \ | | | | | | | Added index on entry.uuid | ||||
| * | | Renamed uuid to uid | Nicolas Lœuillet | 2016-12-29 | 2 | -18/+18 |
| | | | |||||
| * | | Changed uuid type in database | Nicolas Lœuillet | 2016-12-25 | 2 | -4/+1 |
| | | | |||||
| * | | Fixed index on entry.uuid and changed uuid field type | Nicolas Lœuillet | 2016-12-25 | 2 | -3/+8 |
| | | | |||||
| * | | Added index on table creation | Nicolas Lœuillet | 2016-12-23 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #2724 from Simounet/fix/reading-time | Thomas Citharel | 2016-12-28 | 3 | -10/+9 |
|\ \ \ | | | | | | | | | Fix entry reading time | ||||
| * | | | Fix entry reading time | Simounet | 2016-12-27 | 3 | -10/+9 |
| |/ / | |||||
* / / | Fixed export by tags with a tag which contains space | Nicolas Lœuillet | 2016-12-27 | 2 | -2/+2 |
|/ / |