Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge pull request #2985 from etiess/patch-2 | Nicolas Lœuillet | 2017-03-23 | 1 | -3/+12 | |
|\ | | | | | Update paywall.rst (more details and clear cache) | |||||
| * | Update paywall.rst (more details and clear cache) | etiess | 2017-02-22 | 1 | -3/+12 | |
| | | ||||||
* | | Merge pull request #2968 from chrido/master | Nicolas Lœuillet | 2017-03-13 | 1 | -1/+1 | |
|\ \ | | | | | | | remove language on html tag | |||||
| * | | remove language on html-tag | Christoph Doblander | 2017-03-06 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #2971 from etiess/patch-3 | Jérémy Benoist | 2017-03-09 | 1 | -3/+12 | |
|\ \ \ | |/ / |/| | | Update paywall.rst (EN) with details + clear cache | |||||
| * | | Update paywall.rst (EN) with details + clear cache | etiess | 2017-02-23 | 1 | -3/+12 | |
| |/ | ||||||
* | | Merge pull request #2954 from wallabag/update-version | Nicolas Lœuillet | 2017-03-02 | 1 | -1/+1 | |
|\ \ | | | | | | | Changed wallabag version | |||||
| * | | Changed wallabag version | Nicolas Lœuillet | 2017-03-02 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #2916 from wallabag/update-changelog | Nicolas Lœuillet | 2017-03-02 | 1 | -0/+21 | |
|\ \ | | | | | | | Updated CHANGELOG with latest changes | |||||
| * | | Updated CHANGELOG with latest changes | Nicolas Lœuillet | 2017-03-02 | 1 | -0/+21 | |
|/ / | ||||||
* | | Merge pull request #2950 from wallabag/fix-symlinks | Nicolas Lœuillet | 2017-03-02 | 1 | -0/+1 | |
|\ \ | | | | | | | Fixed symlinks issue during release creation | |||||
| * | | Fixed symlinks issue during release creation | Nicolas Lœuillet | 2017-03-01 | 1 | -0/+1 | |
| | | | ||||||
* | | | Merge pull request #2926 from qtheuret/master | Nicolas Lœuillet | 2017-03-01 | 4 | -0/+24 | |
|\ \ \ | |/ / |/| | | Add activation of 'rewrite' mod of Apache | |||||
| * | | Added german and italian translation | Nicolas Lœuillet | 2017-02-28 | 2 | -0/+12 | |
| | | | ||||||
| * | | Activate 'rewrite' mod of Apache | Quentin THEURET | 2017-02-23 | 1 | -0/+6 | |
| | | | ||||||
| * | | Ajout du mod 'rewrite' de Apache | Quentin THEURET | 2017-02-23 | 1 | -0/+6 | |
| |/ | ||||||
* | | Merge pull request #2932 from wallabag/mruminski-patch-1 | Nicolas Lœuillet | 2017-02-25 | 1 | -4/+4 | |
|\ \ | | | | | | | Update Polish translation | |||||
| * | | Update Polish translation | Mateusz Rumiński | 2017-02-24 | 1 | -4/+4 | |
|/ / | | | | | add missing translation | |||||
* | | Merge pull request #2931 from wallabag/php-7.1 | Jeremy Benoist | 2017-02-24 | 2 | -2/+1 | |
|\ \ | |/ |/| | Use wallabag/tcpdf | |||||
| * | Use wallabag/tcpdf | Jeremy Benoist | 2017-02-24 | 2 | -2/+1 | |
|/ | | | | It should restore the PHP 7.1 compatibility | |||||
* | Merge pull request #2917 from ngosang/feature/es_translation_2 | Jeremy Benoist | 2017-02-20 | 1 | -161/+161 | |
|\ | | | | | Update Spanish translation | |||||
| * | Update Spanish translation | ngosang | 2017-02-20 | 1 | -161/+161 | |
|/ | ||||||
* | Merge pull request #2915 from wallabag/import-drop-msg-user-null | Nicolas Lœuillet | 2017-02-20 | 3 | -3/+6 | |
|\ | | | | | Import: we now skip messages when user is null | |||||
| * | Import: we now skip messages when user is null | Nicolas Lœuillet | 2017-02-20 | 3 | -3/+6 | |
|/ | ||||||
* | Merge pull request #2905 from nicofrand/patch-1 | Nicolas Lœuillet | 2017-02-20 | 4 | -9/+14 | |
|\ | | | | | Alert that 2FA must be authorized in app/config/parameters.yml | |||||
| * | Alert that 2FA must be authorized in app/config/parameters.yml | Nicolas Frandeboeuf | 2017-02-20 | 4 | -9/+14 | |
| | | ||||||
* | | Merge pull request #2913 from wallabag/add-wllbgit-readme | Nicolas Lœuillet | 2017-02-20 | 1 | -0/+2 | |
|\ \ | |/ |/| | Added wallabag.it link in README | |||||
| * | Added wallabag.it link in README | Nicolas Lœuillet | 2017-02-18 | 1 | -0/+2 | |
| | | ||||||
* | | Merge pull request #2832 from Kdecherf/search-domain | Jeremy Benoist | 2017-02-19 | 2 | -1/+26 | |
|\ \ | |/ |/| | Search by term: extend to entries url | |||||
| * | Search by term: extend to entries url | Kevin Decherf | 2017-02-16 | 2 | -1/+26 | |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | |||||
* | | Merge pull request #2911 from wallabag/jlnostr-patch-1 | Nicolas Lœuillet | 2017-02-17 | 1 | -1/+1 | |
|\ \ | | | | | | | Remove word repetition from german translation | |||||
| * | | Remove word repetition from german translation | Julian Oster | 2017-02-17 | 1 | -1/+1 | |
|/ / | | | | | see https://github.com/wallabag/wallabag/pull/2882#discussion_r101806434 | |||||
* | | Merge pull request #2908 from wallabag/move-it-documentatin | Nicolas Lœuillet | 2017-02-17 | 24 | -13/+12 | |
|\ \ | | | | | | | Moved :it: documentation into it folder | |||||
| * | | Moved :it: documentation into it folder | Nicolas Lœuillet | 2017-02-17 | 24 | -13/+12 | |
|/ / | ||||||
* | | 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> | |||||
* | | Merge pull request #2882 from wallabag/add-translations-doc-mobile-apps | Nicolas Lœuillet | 2017-02-17 | 8 | -7/+48 | |
|\ \ | | | | | | | Doc: translated mobile apps configuration in french | |||||
| * | | Some changes to :de: translation | Julian Oster | 2017-02-16 | 1 | -5/+4 | |
| | | | ||||||
| * | | add :de: doc user/configuring_mobile | Sven Fischer | 2017-02-15 | 1 | -9/+9 | |
| | | | ||||||
| * | | Doc: translated mobile apps configuration in french | Nicolas Lœuillet | 2017-02-14 | 8 | -7/+49 | |
| | | | ||||||
* | | | Merge pull request #2892 from ngosang/feature/es_translation | Jeremy Benoist | 2017-02-16 | 3 | -127/+138 | |
|\ \ \ | | | | | | | | | Update Spanish translation | |||||
| * | | | Update Spanish translation | ngosang | 2017-02-15 | 3 | -127/+138 | |
|/ / / | ||||||
* | | | Merge pull request #2875 from kgaut/patch-3 | Nicolas Lœuillet | 2017-02-14 | 1 | -0/+18 | |
|\ \ \ | | | | | | | | | Doc - information about Apache 2.4 | |||||
| * | | | Doc - informations about Apache 2.4 | Kevin Gautreau | 2017-02-14 | 1 | -0/+18 | |
| | | | | ||||||
* | | | | Merge pull request #2785 from matteocoder/patch-2 | Nicolas Lœuillet | 2017-02-14 | 1 | -66/+0 | |
|\ \ \ \ | | | | | | | | | | | first_article.rst already inside articles.rst | |||||
| * | | | | first_article.rst already inside articles.rst | matteocoder | 2017-02-14 | 1 | -66/+0 | |
| | |/ / | |/| | | | | | | The file is a duplicate of a section already present in articles.rst | |||||
* | | | | Merge pull request #2784 from matteocoder/patch-1 | Nicolas Lœuillet | 2017-02-14 | 1 | -17/+0 | |
|\ \ \ \ | |/ / / |/| | | | Doc: share.rst already integrated inside articles.rst | |||||
| * | | | share.rst already integrated inside articles.rst | matteocoder | 2017-02-14 | 1 | -17/+0 | |
|/ / / | | | | | | | The share.rst file is just a duplicate of a section already present in another file. | |||||
* | | | Merge pull request #2878 from matteocoder/wallabag-docs-ita | Nicolas Lœuillet | 2017-02-14 | 22 | -0/+1878 | |
|\ \ \ | | | | | | | | | Italian documentation added |