Commit graph

3700 commits

Author SHA1 Message Date
Thomas Citharel
c37515f880 Add filter to users management page
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-05-02 15:28:39 +02:00
Jeremy Benoist
e1d64050ad
Merge remote-tracking branch 'origin/master' into 2.3 2017-05-01 22:15:46 +02:00
Nicolas Lœuillet
3cbb0cc3ef Merge pull request #3055 from wallabag/api-bulk-add-tags
Added API endpoint to handle a list of URL and to add/delete tags
2017-05-01 09:04:41 +02:00
Jérémy Benoist
9579003045 Merge pull request #3066 from wallabag/ignore-tests-exported-files
Ignore tests exported files
2017-04-29 22:51:32 +02:00
Thomas Citharel
d49cdfe2ef Ignore tests exported files 2017-04-29 19:41:14 +02:00
Jérémy Benoist
8ee18fdabc Merge pull request #3064 from gileri/master
Correct create_application en string
2017-04-29 15:43:42 +02:00
Jeremy Benoist
dcbebc17aa
Fix tests 2017-04-29 12:58:39 +02:00
Éric Gillet
ef88b37eb5 Correct create_application en string 2017-04-29 12:30:12 +02:00
Jérémy Benoist
c5e04b0109 Merge pull request #3057 from raf64flo/patch-1
Use up-to-date Firefox extension and add F-Droid link for Android app.
2017-04-26 09:10:28 +02:00
Raphaël Flores
e6ec001c6a Fix IT translation #3057 2017-04-25 16:52:02 +02:00
Raphaël Flores
283aca210a Fix typos. Fix #3057 2017-04-25 15:52:51 +02:00
Raphaël Flores
6f01c10c88 Fix documentation for DE/IT/FR language, even if not sure for ED/IT. Fix #3057. 2017-04-25 15:35:51 +02:00
Raphaël Flores
b40c479a40 Remove 'fr' from Firefox extension URL 2017-04-25 15:17:08 +02:00
Raphaël Flores
83bf04f09e Update Firefox extension and Android links
Use up-to-date Firefox extension and add F-Droid link for Android app.
2017-04-25 15:11:53 +02:00
Jérémy Benoist
138c352cd7 Merge pull request #3052 from shtrom/fix-relative-symlinks
Make symfony-assets-install use `relative` symlinks
2017-04-25 14:15:01 +02:00
Nicolas Lœuillet
80299ed282
Added endpoint to handle URL list to add/delete tags 2017-04-24 12:24:17 +02:00
Nicolas Lœuillet
d1fc590211
Added API endpoint to handle a list of URL and to add/delete tags 2017-04-24 11:12:41 +02:00
Olivier Mehani
f972af3f5b Make symfony-assets-install use relative symlinks
This facilitates packaging, when installing in a different work PREFIX
than the final install location.

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
2017-04-22 21:45:30 +10:00
Nicolas Lœuillet
b8acf672c0 Merge pull request #3048 from wallabag/remove-download-pictures
Cleaned craue_config_setting by removing useless download_pictures setting
2017-04-22 13:20:44 +02:00
Nicolas Lœuillet
21d955f703
Cleaned craue_config_setting by removing useless download_pictures setting 2017-04-20 15:45:43 +02:00
Nicolas Lœuillet
64f1d8f77a Merge pull request #3024 from wallabag/store-date
Added publication date and author
2017-04-18 13:12:28 +02:00
Jérémy Benoist
c5ba478dc3 Merge pull request #3044 from wallabag/fos-user-2.0
Remove dev FOSUserBundle
2017-04-18 09:49:59 +02:00
Jeremy Benoist
177ef14c15
Remove dev FOSUserBundle 2017-04-18 08:08:26 +02:00
Jérémy Benoist
531828ca44 Merge pull request #3030 from wallabag/remove-isPublic-from-entry
Remove isPublic from Entry entity fix #2598
2017-04-14 14:56:26 +02:00
Nicolas Lœuillet
01736b5a2e Removed is_public in Entry edit form 2017-04-13 15:54:19 +02:00
Maxime
15e4aea678 Remove isPublic from Entry entity fix #2598 2017-04-13 13:12:19 +02:00
Nicolas Lœuillet
3e7a843aa9 Merge branch 'master' into 2.3 2017-04-13 13:07:06 +02:00
Nicolas Lœuillet
e9c80c99bd
Added test for multiple authors 2017-04-10 17:58:27 +02:00
Nicolas Lœuillet
3aa655e44a
Fixed migrations 2017-04-10 09:26:08 +02:00
Nicolas Lœuillet
7b0b3622ab Added author of article 2017-04-09 15:24:51 +02:00
Nicolas Lœuillet
5e9009ce86 Added publication date 2017-04-05 22:22:52 +02:00
Jérémy Benoist
656395fde6 Merge pull request #3023 from mart-e/epub-notice-at-the-end
Add export notice at the end of the epub
2017-04-05 10:20:19 +02:00
Martin Trigaux
1b70990b01 Add export notice at the end of the epub
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.
2017-04-05 09:24:48 +02:00
Nicolas Lœuillet
19122cf660 Merge pull request #3020 from wallabag/add-remove-archived-entries
Allow to remove all archived entries
2017-03-31 17:28:54 +02:00
Nicolas Lœuillet
13a592a128
Renamed methods 2017-03-31 17:03:08 +02:00
Nicolas Lœuillet
e682a70f88
Refactored code 2017-03-31 11:04:18 +02:00
Nicolas Lœuillet
9102851f59
Added delete button on Baggy theme 2017-03-31 10:53:23 +02:00
Nicolas Lœuillet
73f28afb19
Renamed countAllEntriesByUsername method 2017-03-31 10:46:47 +02:00
Thomas Citharel
6da1aebc94 Allow to remove all archived entries
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>
2017-03-31 10:46:05 +02:00
Jérémy Benoist
fa884b30ba Merge pull request #3021 from wallabag/rename-method
Rename method
2017-03-30 16:40:18 +02:00
Thomas Citharel
5633b32f0a Merge pull request #3014 from wallabag/change-default-value-listmode
Changed default value for list mode (grid instead of list)
2017-03-30 16:12:11 +02:00
Thomas Citharel
273b6f0658 Rename method from *username to *user
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-03-30 16:07:48 +02:00
Jérémy Benoist
548e608870 Merge pull request #3017 from Kdecherf/local-image-alpha
Save alpha channel when downloading PNG images
2017-03-30 14:45:24 +02:00
Kevin Decherf
7a3260ae9e Save alpha channel when downloading PNG images
Fixes #2805

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-03-29 21:58:29 +02:00
Nicolas Lœuillet
1680c95c27
Changed default value for list mode (grid instead of list) 2017-03-29 14:43:47 +02:00
Nicolas Lœuillet
6f296a789c Merge pull request #3000 from cloudron-io/master
Add Cloudron as installation method
2017-03-29 14:18:55 +02:00
Johannes Zellner
106e0160f2 Added 🇩🇪 translation for Cloudron 2017-03-29 14:16:04 +02:00
Nicolas Lœuillet
3ea184ffc0
Added 🇫🇷 and 🇮🇹 translations for Cloudron 2017-03-29 12:31:52 +02:00
Nicolas Lœuillet
f76bcf6705 Merge pull request #2999 from FrenchHope/master
Share articles to a scuttle / semantic scuttle instance
2017-03-28 15:19:42 +02:00
Nicolas Lœuillet
b5a5377af1
Added migration for Scuttle sharing 2017-03-28 14:20:14 +02:00