aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Fixed @j0k3r reviewNicolas Lœuillet2017-05-052-6/+4
* Added test for deduplicationNicolas Lœuillet2017-05-054-3/+67
* Add docs for cli commandsThomas Citharel2017-05-012-0/+60
* Add basic testsThomas Citharel2017-05-011-0/+59
* Add Clean Duplicates CommandThomas Citharel2017-05-012-0/+132
* Merge pull request #3055 from wallabag/api-bulk-add-tagsNicolas Lœuillet2017-05-013-3/+174
|\
| * Fix testsJeremy Benoist2017-04-292-15/+13
| * Added endpoint to handle URL list to add/delete tagsNicolas Lœuillet2017-04-243-37/+111
| * Added API endpoint to handle a list of URL and to add/delete tagsNicolas Lœuillet2017-04-242-0/+99
* | Merge pull request #3057 from raf64flo/patch-1Jérémy Benoist2017-04-264-10/+10
|\ \ | |/ |/|
| * Fix IT translation #3057Raphaël Flores2017-04-251-1/+1
| * Fix typos. Fix #3057Raphaël Flores2017-04-252-2/+2
| * Fix documentation for DE/IT/FR language, even if not sure for ED/IT. Fix #3057.Raphaël Flores2017-04-253-6/+6
| * Remove 'fr' from Firefox extension URLRaphaël Flores2017-04-251-1/+1
| * Update Firefox extension and Android linksRaphaël Flores2017-04-251-3/+3
|/
* Merge pull request #3048 from wallabag/remove-download-picturesNicolas Lœuillet2017-04-221-0/+52
|\
| * Cleaned craue_config_setting by removing useless download_pictures settingNicolas Lœuillet2017-04-201-0/+52
|/
* Merge pull request #3024 from wallabag/store-dateNicolas Lœuillet2017-04-1823-17/+243
|\
| * Added test for multiple authorsNicolas Lœuillet2017-04-101-8/+39
| * Fixed migrationsNicolas Lœuillet2017-04-101-0/+5
| * Added author of articleNicolas Lœuillet2017-04-0920-6/+79
| * Added publication dateNicolas Lœuillet2017-04-0537-23/+140
* | Merge pull request #3044 from wallabag/fos-user-2.0Jérémy Benoist2017-04-181-1/+1
|\ \
| * | 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
|\ \
| * | 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 epubMartin Trigaux2017-04-051-2/+2
| |/
| * Merge pull request #3017 from Kdecherf/local-image-alphaJérémy Benoist2017-03-301-0/+2
| |\
| | * Save alpha channel when downloading PNG imagesKevin Decherf2017-03-291-0/+2
| |/
* | Merge pull request #3020 from wallabag/add-remove-archived-entriesNicolas Lœuillet2017-03-3119-6/+208
|\ \
| * | 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
|/ /
* | 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
|\ \ \