aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | Merge pull request #2784 from matteocoder/patch-1Nicolas Lœuillet2017-02-141-17/+0
|\ \ \ \ | |/ / / |/| | | Doc: share.rst already integrated inside articles.rst
| * | | share.rst already integrated inside articles.rstmatteocoder2017-02-141-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-itaNicolas Lœuillet2017-02-1422-0/+1878
|\ \ \ | | | | | | | | Italian documentation added
| * | | Italian documentation addedmatteocoder2017-02-1422-0/+1878
| | | | | | | | | | | | There are some missing links in various articles. Please let me know how I can fix this :)
* | | | Merge pull request #2879 from matteocoder/matteocoder-patch-1Nicolas Lœuillet2017-02-141-1/+1
|\ \ \ \ | | | | | | | | | | Fixed typo in "first_steps"
| * | | | Fixed typo in "first_steps"matteocoder2017-01-241-1/+1
| |/ / / | | | | | | | | Changed "Pimi passi" to "Primi passi
* | | | Merge pull request #2860 from wallabag/docs-update-3rd-party-appsNicolas Lœuillet2017-02-143-8/+11
|\ \ \ \ | |_|/ / |/| | | docs 3rd party tools: update java wrapper, add cmd tool to add article
| * | | docs: add 3rd party app wallabako for Kobo readersSven Fischer2017-02-143-2/+5
| | | |
| * | | docs 3rd party tools: update java wrapper, add cmd tool to add articleSven Fischer2017-02-113-6/+6
| | | |
* | | | Merge pull request #2874 from kgaut/patch-2Nicolas Lœuillet2017-02-141-0/+17
|\ \ \ \ | | | | | | | | | | Add informations about Apache 2.4
| * | | | Add informations about Apache 2.4Kevin Gautreau2017-02-141-0/+17
|/ / / /
* | | | Merge pull request #2869 from wallabag/log-restricted-accessThomas Citharel2017-02-132-2/+9
|\ \ \ \ | |/ / / |/| | | Log restricted access value
| * | | Log restricted access valueJeremy Benoist2017-02-132-2/+9
|/ / / | | | | | | | | | It might help to figure out if we have enabled it or not
* | | Merge pull request #2846 from wallabag/mruminski-patch-1Jeremy Benoist2017-02-061-6/+6
|\ \ \ | | | | | | | | fix misspells in polish translation
| * | | fix misspells in polish translationMateusz Rumiński2017-02-061-6/+6
|/ / /
* | | Merge pull request #2842 from K-Phoen/update-rulerzJeremy Benoist2017-02-063-5/+4
|\ \ \ | | | | | | | | Update RulerZ
| * | | Update RulerZKévin Gomez2017-02-053-5/+4
| | | |
* | | | Merge pull request #2841 from Kdecherf/active-menu-searchJeremy Benoist2017-02-051-4/+16
|\ \ \ \ | |/ / / |/| | | Show active list in the left menu during search
| * | | Show active list in the left menu during searchKevin Decherf2017-02-051-4/+16
| | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | | Merge pull request #2788 from Zettt/masterJeremy Benoist2017-02-051-0/+13
|\ \ \ \ | | | | | | | | | | Documentation on how to configure mobile apps to work with wallabag.it
| * | | | Added configuration documentation for mobile appsAndreas Zeitler2017-02-051-0/+13
| | | | |
* | | | | Merge pull request #2839 from foxmask/masterJeremy Benoist2017-02-051-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | scripts/update.sh: 18: scripts/update.sh: composer.phar: not found
| * | | | scripts/update.sh: 18: scripts/update.sh: composer.phar: not foundFoxMaSk2017-02-041-1/+1
| | | | | | | | | | | | | | | when composer.phar is not globally installed, we should add "./" in front of "composer.phar" to run it from the current folder.
* | | | | Merge pull request #2838 from wallabag/Quent-in-patch-1Jeremy Benoist2017-02-041-60/+60
|\ \ \ \ \ | | | | | | | | | | | | Update Oc version
| * | | | | Update Oc versionQuent-in2017-02-041-60/+60
| |/ / / / | | | | | | | | | | I'll be ready for next train