Commit graph

86 commits

Author SHA1 Message Date
Jeremy Benoist 4ab0d25f65
Merge remote-tracking branch 'origin/master' into 2.3 2017-05-19 11:25:19 +02:00
Cedric Girard 5f82fc23a7 modify key name as well 2017-05-18 17:17:21 +02:00
Thomas Citharel 6b76ae3d1f Merge pull request #3060 from wallabag/search-users
Search & paginate users
2017-05-04 14:35:14 +02:00
Nicolas Lœuillet b5b6877976 Merged list and search methods 2017-05-02 15:30:32 +02:00
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
Nicolas Lœuillet fdd725f58c Added notmatches operator for tagging rule 2017-04-20 15:17:02 +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
Nicolas Lœuillet 01736b5a2e Removed is_public in Entry edit form 2017-04-13 15:54:19 +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
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
Nicolas Lœuillet 013f426d10
Renamed Developer section to API client management 2017-02-01 13:23:13 +01:00
Nicolas Lœuillet 70d99765c7
Removed the small element on reading time 2016-12-30 14:17:18 +01:00
Nicolas Lœuillet 8d064ba5a4
Updated addons links 2016-12-01 13:48:34 +01:00
Nicolas Lœuillet cda0662311
Removed FOSUser attributes removed in alpha4
See https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/Upgrade.md\#200-alpha3-to-200-alpha4
2016-11-28 12:44:17 +01:00
Nicolas Lœuillet 893ccad31f
Translations for shortcuts help 2016-11-22 13:33:06 +01:00
Nicolas Lœuillet 49b042dfdf Added translations and currentRoute parameter 2016-11-19 19:17:30 +01:00
Jeremy Benoist 68003139e1
Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts:
#	.editorconfig
#	docs/de/index.rst
#	docs/de/user/import.rst
#	docs/en/index.rst
#	docs/en/user/configuration.rst
#	docs/en/user/import.rst
#	docs/fr/index.rst
#	docs/fr/user/import.rst
#	src/Wallabag/CoreBundle/Command/InstallCommand.php
#	src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
#	src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
#	web/bundles/wallabagcore/themes/baggy/css/style.min.css
#	web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
#	web/bundles/wallabagcore/themes/material/css/style.min.css
#	web/bundles/wallabagcore/themes/material/js/material.min.js
2016-11-19 15:30:49 +01:00
Nicolas Lœuillet 10b3509757
Added http_status in Entry entity 2016-11-18 15:09:21 +01:00
Nicolas Lœuillet 540a9bc4a2 Added help on config screen 2016-11-17 09:22:39 +01:00
Nicolas Lœuillet a42f38d9fb
Added a configuration to define the redirection after archiving an entry
Fix #496
2016-11-16 23:07:34 +01:00
Nicolas Lœuillet ece4718f63
Changed behavior when we change language
No need to disconnect to apply the language substitution
2016-11-10 20:54:20 +01:00
Nicolas Lœuillet 1781ca3763
Removed support website on about page 2016-11-09 13:59:55 +01:00
Nicolas Lœuillet df30af69d2 Added new tag form in mobile view for Material theme
Fix #2376
2016-11-08 14:24:00 +01:00
Jeremy Benoist 9ab024b4f5
Add Pinboard import 2016-11-04 22:44:31 +01:00
Jeremy Benoist 5a619812ca
Merge remote-tracking branch 'origin/master' into 2.2 2016-11-03 16:41:29 +01:00
Jeremy Benoist da41365579 Merge pull request #2180 from wallabag/download-pictures
Download pictures
2016-11-03 16:22:07 +01:00
Jeremy Benoist ca08d02f2f
Add warning message for import + download images
When import isn't async and downloading images is enabled, we warn the user that import can fail.
Also, added missing translations
2016-11-03 15:59:20 +01:00
Nicolas Lœuillet 3b81212674
Added translations and baggy part 2016-10-31 16:48:34 +01:00
Nicolas Lœuillet 7a5043f187
Added tag label in the page title
Fix #2472
2016-10-26 13:53:23 +02:00
Jeremy Benoist 64a8781e45
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-24 12:03:17 +02:00
Jeremy Benoist 206bade58a
Add ability to reset some datas
- annotations
- tags
- entries
2016-10-22 13:13:06 +02:00
Jeremy Benoist 645dc7594b
Fix missing translations 2016-10-21 07:52:55 +02:00
Jeremy Benoist e4cf672ccf
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-11 21:01:30 +02:00
Krzysztof Szafranek 90c766b96b Show number of annotations instead of nbAnnotations placeholder
When there was more than one annotation, a placeholder was displayed in both themes, instead of actual number.
2016-10-09 04:59:04 +02:00
Jeremy Benoist 876d77a67d
Better display and description
Confirmation message isn’t required since it is written in the delete description
2016-10-08 20:25:42 +02:00
Nicolas Lœuillet bb0c78f4a6
Added check if there is only one user
Added translations and documentation
2016-10-08 13:27:18 +02:00
Thomas Citharel e4b46f77ef
work 2016-10-08 13:27:17 +02:00
Nicolas Lœuillet c8d2dcdafe Merge pull request #2383 from wallabag/add-info-publich-articles
Added OpenGraph support for public articles
2016-10-07 14:30:46 +02:00
Nicolas Lœuillet d0d196ffb3
Fixed review 2016-10-07 09:22:40 +02:00
Nicolas Lœuillet f0d52417fb
Added OpenGraph support for public articles
Fix #2289
2016-10-07 09:05:18 +02:00
Jeremy Benoist 6c8806cadc
Fix bad translation key
`entry_reload_failed` instead of `entry_reloaded_failed`
2016-10-07 07:43:48 +02:00
Jeremy Benoist 152fcccd44
Add users management UI
- remove the “add a user” from the config page
- add a CRUD on user
- fix some missing translations (+ bad indentation)
2016-10-02 11:08:53 +02:00
Jeremy Benoist 52c1fc7449 Merge pull request #2326 from wallabag/update-quickstart
Changed quickstart layout
2016-10-02 11:06:03 +02:00
Jeremy Benoist 6e5e27ab07 Merge pull request #2324 from wallabag/edit-tagging-rule
Add ability to edit a tagging rule
2016-10-02 11:05:10 +02:00
Jeremy Benoist bfb3ae01da Merge pull request #2323 from wallabag/footer-stats
Add simple stats in footer
2016-10-02 11:04:49 +02:00
Jeremy Benoist a4df48916d
Fix OC typos
+ remove extra sentence
2016-10-02 09:57:48 +02:00
Nicolas Lœuillet 7d72cce4c7
Changed translations 2016-10-01 17:29:04 +02:00
Nicolas Lœuillet a44d2613c7 Changed quickstart layout 2016-10-01 17:13:53 +02:00
Jeremy Benoist bf3dc999e7
Add ability to edit a tagging rule 2016-10-01 16:52:05 +02:00