Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #3020 from wallabag/add-remove-archived-entries | Nicolas Lœuillet | 2017-03-31 | 19 | -6/+208 | |
|\ \ | | | | | | | Allow to remove all archived entries | |||||
| * | | Renamed methods | Nicolas Lœuillet | 2017-03-31 | 3 | -4/+4 | |
| | | | ||||||
| * | | Refactored code | Nicolas Lœuillet | 2017-03-31 | 1 | -24/+16 | |
| | | | ||||||
| * | | Added delete button on Baggy theme | Nicolas Lœuillet | 2017-03-31 | 2 | -1/+7 | |
| | | | ||||||
| * | | Renamed countAllEntriesByUsername method | Nicolas Lœuillet | 2017-03-31 | 1 | -1/+1 | |
| | | | ||||||
| * | | Allow to remove all archived entries | Thomas Citharel | 2017-03-31 | 18 | -1/+205 | |
|/ / | | | | | | | | | | | Since we still support fucking SQLite, we need to retrieve all tags & annotations for archived entries before deleting them. Signed-off-by: Thomas Citharel <tcit@tcit.fr> | |||||
* | | Merge pull request #3021 from wallabag/rename-method | Jérémy Benoist | 2017-03-30 | 3 | -4/+4 | |
|\ \ | | | | | | | Rename method | |||||
| * | | Rename method from *username to *user | Thomas Citharel | 2017-03-30 | 3 | -4/+4 | |
| |/ | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | |||||
* | | Merge pull request #3014 from wallabag/change-default-value-listmode | Thomas Citharel | 2017-03-30 | 1 | -1/+1 | |
|\ \ | | | | | | | Changed default value for list mode (grid instead of list) | |||||
| * | | Changed default value for list mode (grid instead of list) | Nicolas Lœuillet | 2017-03-29 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #3000 from cloudron-io/master | Nicolas Lœuillet | 2017-03-29 | 4 | -9/+40 | |
|\ \ | | | | | | | Add Cloudron as installation method | |||||
| * | | Added :de: translation for Cloudron | Johannes Zellner | 2017-03-29 | 1 | -4/+4 | |
| | | | ||||||
| * | | Added :fr: and :it: translations for Cloudron | Nicolas Lœuillet | 2017-03-29 | 4 | -11/+34 | |
| | | | ||||||
| * | | Add Cloudron as installation method | Johannes Zellner | 2017-03-20 | 1 | -0/+8 | |
| | | | ||||||
* | | | Merge pull request #2999 from FrenchHope/master | Nicolas Lœuillet | 2017-03-28 | 28 | -5/+118 | |
|\ \ \ | | | | | | | | | Share articles to a scuttle / semantic scuttle instance | |||||
| * | | | Added migration for Scuttle sharing | Nicolas Lœuillet | 2017-03-28 | 9 | -10/+64 | |
| | | | | ||||||
| * | | | Scuttle sharing | FrenchHope | 2017-03-28 | 24 | -2/+61 | |
|/ / / | ||||||
* | | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-03-28 | 66 | -427/+2415 | |
|\ \ \ | ||||||
| * \ \ | Merge pull request #2861 from wallabag/2.3-droping-5.5 | Jérémy Benoist | 2017-03-28 | 5 | -6/+5 | |
| |\ \ \ | | |_|/ | |/| | | Dropping PHP 5.5 | |||||
| | * | | Updated requirements in documentation | Nicolas Lœuillet | 2017-03-28 | 3 | -3/+3 | |
| | | | | ||||||
| | * | | Dropping PHP 5.5 | Jeremy Benoist | 2017-02-11 | 2 | -3/+2 | |
| | | | | ||||||
| * | | | 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 |