aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2861 from wallabag/2.3-droping-5.5Jérémy Benoist2017-03-285-6/+5
|\ | | | | Dropping PHP 5.5
| * Updated requirements in documentationNicolas Lœuillet2017-03-283-3/+3
| |
| * Dropping PHP 5.5Jeremy Benoist2017-02-112-3/+2
| |
* | Merge pull request #2985 from etiess/patch-2Nicolas Lœuillet2017-03-231-3/+12
|\ \ | | | | | | Update paywall.rst (more details and clear cache)
| * | Update paywall.rst (more details and clear cache)etiess2017-02-221-3/+12
| | |
* | | Merge pull request #2968 from chrido/masterNicolas Lœuillet2017-03-131-1/+1
|\ \ \ | | | | | | | | remove language on html tag
| * | | remove language on html-tagChristoph Doblander2017-03-061-1/+1
| | | |
* | | | Merge pull request #2971 from etiess/patch-3Jérémy Benoist2017-03-091-3/+12
|\ \ \ \ | |/ / / |/| | | Update paywall.rst (EN) with details + clear cache
| * | | Update paywall.rst (EN) with details + clear cacheetiess2017-02-231-3/+12
| |/ /
* | | Merge pull request #2954 from wallabag/update-versionNicolas Lœuillet2017-03-021-1/+1
|\ \ \ | | | | | | | | Changed wallabag version
| * | | Changed wallabag versionNicolas Lœuillet2017-03-021-1/+1
|/ / /
* | | Merge pull request #2916 from wallabag/update-changelogNicolas Lœuillet2017-03-021-0/+21
|\ \ \ | | | | | | | | Updated CHANGELOG with latest changes
| * | | Updated CHANGELOG with latest changesNicolas Lœuillet2017-03-021-0/+21
|/ / /
* | | Merge pull request #2950 from wallabag/fix-symlinksNicolas Lœuillet2017-03-021-0/+1
|\ \ \ | | | | | | | | Fixed symlinks issue during release creation
| * | | Fixed symlinks issue during release creationNicolas Lœuillet2017-03-011-0/+1
| | | |
* | | | Merge pull request #2926 from qtheuret/masterNicolas Lœuillet2017-03-014-0/+24
|\ \ \ \ | |/ / / |/| | | Add activation of 'rewrite' mod of Apache
| * | | Added german and italian translationNicolas Lœuillet2017-02-282-0/+12
| | | |
| * | | Activate 'rewrite' mod of ApacheQuentin THEURET2017-02-231-0/+6
| | | |
| * | | Ajout du mod 'rewrite' de ApacheQuentin THEURET2017-02-231-0/+6
| |/ /
* | | Merge pull request #2932 from wallabag/mruminski-patch-1Nicolas Lœuillet2017-02-251-4/+4
|\ \ \ | | | | | | | | Update Polish translation
| * | | Update Polish translationMateusz Rumiński2017-02-241-4/+4
|/ / / | | | | | | add missing translation
* | | Merge pull request #2931 from wallabag/php-7.1Jeremy Benoist2017-02-242-2/+1
|\ \ \ | |/ / |/| | Use wallabag/tcpdf
| * | Use wallabag/tcpdfJeremy Benoist2017-02-242-2/+1
|/ / | | | | | | It should restore the PHP 7.1 compatibility
* | Merge pull request #2917 from ngosang/feature/es_translation_2Jeremy Benoist2017-02-201-161/+161
|\ \ | | | | | | Update Spanish translation
| * | Update Spanish translationngosang2017-02-201-161/+161
|/ /
* | Merge pull request #2915 from wallabag/import-drop-msg-user-nullNicolas Lœuillet2017-02-203-3/+6
|\ \ | | | | | | Import: we now skip messages when user is null
| * | Import: we now skip messages when user is nullNicolas Lœuillet2017-02-203-3/+6
|/ /
* | Merge pull request #2905 from nicofrand/patch-1Nicolas Lœuillet2017-02-204-9/+14
|\ \ | | | | | | Alert that 2FA must be authorized in app/config/parameters.yml
| * | Alert that 2FA must be authorized in app/config/parameters.ymlNicolas Frandeboeuf2017-02-204-9/+14
| | |
* | | Merge pull request #2913 from wallabag/add-wllbgit-readmeNicolas Lœuillet2017-02-201-0/+2
|\ \ \ | |/ / |/| | Added wallabag.it link in README
| * | Added wallabag.it link in READMENicolas Lœuillet2017-02-181-0/+2
| | |
* | | Merge pull request #2832 from Kdecherf/search-domainJeremy Benoist2017-02-192-1/+26
|\ \ \ | |/ / |/| | Search by term: extend to entries url
| * | Search by term: extend to entries urlKevin Decherf2017-02-162-1/+26
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | Merge pull request #2911 from wallabag/jlnostr-patch-1Nicolas Lœuillet2017-02-171-1/+1
|\ \ \ | | | | | | | | Remove word repetition from german translation
| * | | Remove word repetition from german translationJulian Oster2017-02-171-1/+1
|/ / / | | | | | | see https://github.com/wallabag/wallabag/pull/2882#discussion_r101806434
* | | Merge pull request #2908 from wallabag/move-it-documentatinNicolas Lœuillet2017-02-1724-13/+12
|\ \ \ | | | | | | | | Moved :it: documentation into it folder
| * | | Moved :it: documentation into it folderNicolas Lœuillet2017-02-1724-13/+12
|/ / /
* | | Merge pull request #2830 from Kdecherf/striptags-titleNicolas Lœuillet2017-02-175-19/+19
|\ \ \ | | | | | | | | Fix rendering of entry title in Twig views
| * | | views: cosmetic in share links hrefKevin Decherf2017-02-161-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | | Fix rendering of entry title in Twig viewsKevin Decherf2017-02-025-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-appsNicolas Lœuillet2017-02-178-7/+48
|\ \ \ | | | | | | | | Doc: translated mobile apps configuration in french
| * | | Some changes to :de: translationJulian Oster2017-02-161-5/+4
| | | |
| * | | add :de: doc user/configuring_mobileSven Fischer2017-02-151-9/+9
| | | |
| * | | Doc: translated mobile apps configuration in frenchNicolas Lœuillet2017-02-148-7/+49
| | | |
* | | | Merge pull request #2892 from ngosang/feature/es_translationJeremy Benoist2017-02-163-127/+138
|\ \ \ \ | | | | | | | | | | Update Spanish translation
| * | | | Update Spanish translationngosang2017-02-153-127/+138
|/ / / /
* | | | Merge pull request #2875 from kgaut/patch-3Nicolas Lœuillet2017-02-141-0/+18
|\ \ \ \ | | | | | | | | | | Doc - information about Apache 2.4
| * | | | Doc - informations about Apache 2.4Kevin Gautreau2017-02-141-0/+18
| | | | |
* | | | | Merge pull request #2785 from matteocoder/patch-2Nicolas Lœuillet2017-02-141-66/+0
|\ \ \ \ \ | | | | | | | | | | | | first_article.rst already inside articles.rst
| * | | | | first_article.rst already inside articles.rstmatteocoder2017-02-141-66/+0
| | |/ / / | |/| | | | | | | | The file is a duplicate of a section already present in articles.rst