Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-01 | 3 | -2/+6 | |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | ||||||
| * | | Merge pull request #3066 from wallabag/ignore-tests-exported-files | Jérémy Benoist | 2017-04-29 | 1 | -0/+4 | |
| |\ \ | ||||||
| | * | | Ignore tests exported files | Thomas Citharel | 2017-04-29 | 1 | -0/+4 | |
| |/ / | ||||||
| * | | Merge pull request #3064 from gileri/master | Jérémy Benoist | 2017-04-29 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | Correct create_application en string | Éric Gillet | 2017-04-29 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Merge pull request #3052 from shtrom/fix-relative-symlinks | Jérémy Benoist | 2017-04-25 | 1 | -1/+1 | |
| |\ \ | ||||||
| | * | | Make symfony-assets-install use `relative` symlinks | Olivier Mehani | 2017-04-22 | 1 | -1/+1 | |
| |/ / | ||||||
* | | | Merge pull request #3055 from wallabag/api-bulk-add-tags | Nicolas Lœuillet | 2017-05-01 | 3 | -3/+174 | |
|\ \ \ | ||||||
| * | | | Fix tests | Jeremy Benoist | 2017-04-29 | 2 | -15/+13 | |
| * | | | Added endpoint to handle URL list to add/delete tags | Nicolas Lœuillet | 2017-04-24 | 3 | -37/+111 | |
| * | | | Added API endpoint to handle a list of URL and to add/delete tags | Nicolas Lœuillet | 2017-04-24 | 2 | -0/+99 | |
* | | | | Merge pull request #3057 from raf64flo/patch-1 | Jérémy Benoist | 2017-04-26 | 4 | -10/+10 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Fix IT translation #3057 | Raphaël Flores | 2017-04-25 | 1 | -1/+1 | |
| * | | | Fix typos. Fix #3057 | Raphaël Flores | 2017-04-25 | 2 | -2/+2 | |
| * | | | Fix documentation for DE/IT/FR language, even if not sure for ED/IT. Fix #3057. | Raphaël Flores | 2017-04-25 | 3 | -6/+6 | |
| * | | | Remove 'fr' from Firefox extension URL | Raphaël Flores | 2017-04-25 | 1 | -1/+1 | |
| * | | | Update Firefox extension and Android links | Raphaël Flores | 2017-04-25 | 1 | -3/+3 | |
|/ / / | ||||||
* | | | Merge pull request #3048 from wallabag/remove-download-pictures | Nicolas Lœuillet | 2017-04-22 | 1 | -0/+52 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Cleaned craue_config_setting by removing useless download_pictures setting | Nicolas Lœuillet | 2017-04-20 | 1 | -0/+52 | |
|/ / | ||||||
* | | Merge pull request #3024 from wallabag/store-date | Nicolas Lœuillet | 2017-04-18 | 23 | -17/+243 | |
|\ \ | ||||||
| * | | Added test for multiple authors | Nicolas Lœuillet | 2017-04-10 | 1 | -8/+39 | |
| * | | Fixed migrations | Nicolas Lœuillet | 2017-04-10 | 1 | -0/+5 | |
| * | | Added author of article | Nicolas Lœuillet | 2017-04-09 | 20 | -6/+79 | |
| * | | Added publication date | Nicolas Lœuillet | 2017-04-05 | 37 | -23/+140 | |
* | | | Merge pull request #3044 from wallabag/fos-user-2.0 | Jérémy Benoist | 2017-04-18 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Remove dev FOSUserBundle | Jeremy Benoist | 2017-04-18 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #3030 from wallabag/remove-isPublic-from-entry | Jérémy Benoist | 2017-04-14 | 30 | -61/+65 | |
|\ \ \ | ||||||
| * | | | Removed is_public in Entry edit form | Nicolas Lœuillet | 2017-04-13 | 29 | -37/+15 | |
| * | | | Remove isPublic from Entry entity fix #2598 | Maxime | 2017-04-13 | 2 | -25/+51 | |
|/ / / | ||||||
* | | | Merge branch 'master' into 2.3 | Nicolas Lœuillet | 2017-04-13 | 2 | -2/+4 | |
|\ \ \ | |/ / |/| / | |/ | ||||||
| * | Merge pull request #3023 from mart-e/epub-notice-at-the-end | Jérémy Benoist | 2017-04-05 | 1 | -2/+2 | |
| |\ | ||||||
| | * | Add export notice at the end of the epub | Martin Trigaux | 2017-04-05 | 1 | -2/+2 | |
| |/ | ||||||
| * | Merge pull request #3017 from Kdecherf/local-image-alpha | Jérémy Benoist | 2017-03-30 | 1 | -0/+2 | |
| |\ | ||||||
| | * | Save alpha channel when downloading PNG images | Kevin Decherf | 2017-03-29 | 1 | -0/+2 | |
| |/ | ||||||
* | | Merge pull request #3020 from wallabag/add-remove-archived-entries | Nicolas Lœuillet | 2017-03-31 | 19 | -6/+208 | |
|\ \ | ||||||
| * | | 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 | |
|/ / | ||||||
* | | Merge pull request #3021 from wallabag/rename-method | Jérémy Benoist | 2017-03-30 | 3 | -4/+4 | |
|\ \ | ||||||
| * | | Rename method from *username to *user | Thomas Citharel | 2017-03-30 | 3 | -4/+4 | |
| |/ | ||||||
* | | 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) | 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 | |
|\ \ | ||||||
| * | | 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 | |
|\ \ \ | ||||||
| * | | | Added migration for Scuttle sharing | Nicolas Lœuillet | 2017-03-28 | 9 | -10/+64 |