aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #3044 from wallabag/fos-user-2.0Jérémy Benoist2017-04-181-1/+1
|\ \ \ | | | | | | | | Remove dev FOSUserBundle
| * | | Remove dev FOSUserBundleJeremy Benoist2017-04-181-1/+1
|/ / /
* | | Merge pull request #3030 from wallabag/remove-isPublic-from-entryJérémy Benoist2017-04-1430-61/+65
|\ \ \ | | | | | | | | Remove isPublic from Entry entity fix #2598
| * | | Removed is_public in Entry edit formNicolas Lœuillet2017-04-1329-37/+15
| | | |
| * | | Remove isPublic from Entry entity fix #2598Maxime2017-04-132-25/+51
|/ / /
* | | Merge branch 'master' into 2.3Nicolas Lœuillet2017-04-132-2/+4
|\ \ \ | |/ / |/| / | |/
| * Merge pull request #3023 from mart-e/epub-notice-at-the-endJérémy Benoist2017-04-051-2/+2
| |\ | | | | | | Add export notice at the end of the epub
| | * Add export notice at the end of the epubMartin Trigaux2017-04-051-2/+2
| |/ | | | | | | | | | | | | | | | | The text "Produced by wallabag with PHPePub" is the first page of any epub. On ebooks reader, it is common (e.g. kobo) to use the first page as the cover of unread books, which makes it more difficult to differentiate the books. Move the Notices chapter at the end of the book.
| * Merge pull request #3017 from Kdecherf/local-image-alphaJérémy Benoist2017-03-301-0/+2
| |\ | | | | | | Save alpha channel when downloading PNG images
| | * Save alpha channel when downloading PNG imagesKevin Decherf2017-03-291-0/+2
| |/ | | | | | | | | | | Fixes #2805 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3020 from wallabag/add-remove-archived-entriesNicolas Lœuillet2017-03-3119-6/+208
|\ \ | | | | | | Allow to remove all archived entries
| * | Renamed methodsNicolas Lœuillet2017-03-313-4/+4
| | |
| * | Refactored codeNicolas Lœuillet2017-03-311-24/+16
| | |
| * | Added delete button on Baggy themeNicolas Lœuillet2017-03-312-1/+7
| | |
| * | Renamed countAllEntriesByUsername methodNicolas Lœuillet2017-03-311-1/+1
| | |
| * | Allow to remove all archived entriesThomas Citharel2017-03-3118-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-methodJérémy Benoist2017-03-303-4/+4
|\ \ | | | | | | Rename method
| * | Rename method from *username to *userThomas Citharel2017-03-303-4/+4
| |/ | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | 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)
| * | 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
|\ \ | | | | | | Add Cloudron as installation method
| * | 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
|\ \ \ | | | | | | | | Share articles to a scuttle / semantic scuttle instance
| * | | 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
| |\ \ \ | | |_|/ | |/| | 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