aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3021 from wallabag/rename-methodJérémy Benoist2017-03-303-4/+4
|\
| * Rename method from *username to *userThomas Citharel2017-03-303-4/+4
* | Merge pull request #3014 from wallabag/change-default-value-listmodeThomas Citharel2017-03-301-1/+1
|\ \
| * | Changed default value for list mode (grid instead of list)Nicolas Lœuillet2017-03-291-1/+1
|/ /
* | Merge pull request #3000 from cloudron-io/masterNicolas Lœuillet2017-03-294-9/+40
|\ \
| * | Added :de: translation for CloudronJohannes Zellner2017-03-291-4/+4
| * | Added :fr: and :it: translations for CloudronNicolas Lœuillet2017-03-294-11/+34
| * | Add Cloudron as installation methodJohannes Zellner2017-03-201-0/+8
* | | Merge pull request #2999 from FrenchHope/masterNicolas Lœuillet2017-03-2828-5/+118
|\ \ \
| * | | Added migration for Scuttle sharingNicolas Lœuillet2017-03-289-10/+64
| * | | Scuttle sharingFrenchHope2017-03-2824-2/+61
|/ / /
* | | Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-03-2866-427/+2415
|\ \ \
| * \ \ Merge pull request #2861 from wallabag/2.3-droping-5.5Jérémy Benoist2017-03-285-6/+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)etiess2017-02-221-3/+12
| * | | Merge pull request #2968 from chrido/masterNicolas Lœuillet2017-03-131-1/+1
| |\ \ \
| | * | | 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 cacheetiess2017-02-231-3/+12
| | |/ /
| * | | Merge pull request #2954 from wallabag/update-versionNicolas Lœuillet2017-03-021-1/+1
| |\ \ \
| | * | | 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 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 creationNicolas Lœuillet2017-03-011-0/+1
| * | | | Merge pull request #2926 from qtheuret/masterNicolas Lœuillet2017-03-014-0/+24
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | 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 translationMateusz Rumiński2017-02-241-4/+4
| |/ / /
| * | | Merge pull request #2931 from wallabag/php-7.1Jeremy Benoist2017-02-242-2/+1
| |\ \ \ | | |/ / | |/| |
| | * | Use wallabag/tcpdfJeremy Benoist2017-02-242-2/+1
| |/ /
| * | Merge pull request #2917 from ngosang/feature/es_translation_2Jeremy Benoist2017-02-201-161/+161
| |\ \
| | * | 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 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.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 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 urlKevin Decherf2017-02-162-1/+26
| * | | Merge pull request #2911 from wallabag/jlnostr-patch-1Nicolas Lœuillet2017-02-171-1/+1
| |\ \ \
| | * | | Remove word repetition from german translationJulian Oster2017-02-171-1/+1
| |/ / /
| * | | Merge pull request #2908 from wallabag/move-it-documentatinNicolas Lœuillet2017-02-1724-13/+12
| |\ \ \
| | * | | 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
| |\ \ \