mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-06-16 12:10:41 +00:00
Code Issues Projects Releases Wiki Activity
7070 commits 12 branches 99 tags 144 MiB
Commit graph

211 commits

Author SHA1 Message Date
Jeremy Benoist 6e4fc956ab
Better translations 
Replace “Google Authenticator” by “Google Authenticator, Authy or FreeOTP” in all text.

Translate how to use the code / qr code.
 2019-01-23 13:28:02 +01:00
Jeremy Benoist a6b242a1fd
Enable OTP 2FA 
- Update SchebTwoFactorBundle to version 3
- Enable Google 2fa on the bundle
- Disallow ability to use both email and google as 2fa
- Update Ocramius Proxy Manager to handle typed function & attributes (from PHP 7)
- use `$this->addFlash` shortcut instead of `$this->get('session')->getFlashBag()->add`
- update admin to be able to create/reset the 2fa
 2019-01-23 13:28:02 +01:00
Jeremy Benoist acd4412080
Create a dedicated tab to reset data 2019-01-23 13:28:01 +01:00
Jeremy Benoist 50f35f0db2
Move icon into the top menu bar 
Change the way to select a random entry:
- select all ids from the given user (with filters)
- choose randomly one in php
- find that entry
 2019-01-19 22:24:10 +01:00
Nicolas Lœuillet 09ef25c3c3
Added random feature 2019-01-19 21:09:32 +01:00
Jeremy Benoist 5419a8368e
Merge remote-tracking branch 'origin/master' into 2.4 2019-01-15 09:41:18 +01:00
Kevin Decherf af83d05ce2 Add translations 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2019-01-07 23:06:02 +01:00
Jeremy Benoist b878be4cc9
Merge remote-tracking branch 'origin/master' into 2.4 
# Conflicts:
#	web/wallassets/baggy.js
#	web/wallassets/manifest.json
#	web/wallassets/material.css
#	web/wallassets/material.js
 2018-11-25 09:58:18 +01:00
Eloi Coutant ccc3b0a531
Update messages.fr.yml 2018-11-16 01:45:16 +01:00
Eloi Coutant 0ddfb2956c
Update messages.fr.yml 
Modification pour éclaircir le sens de l'option
 2018-11-16 01:37:53 +01:00
Stéphane HULARD 559f708cae
Add translations about latest Tag changes. 
Add new translations in each language file.
 2018-09-25 10:18:08 +02:00
Simounet 5e0c44a2ac Using new 'entry.default_title' as translation key 2017-12-26 09:02:00 +01:00
Kevin Decherf ecf41ab3fa Replace hardcoded 'Provided by' string with i18n string 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-11-19 15:02:11 +01:00
Kevin Decherf 3b771f51a6 Improve origin_url field description and translations 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-11-19 15:02:11 +01:00
Kevin Decherf 03b020eb20 Entry: handle originUrl in edit form, update translations 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-11-19 15:02:11 +01:00
Nicolas Lœuillet b1428a1cf8
Translated first page of exported article 2017-10-11 10:43:19 +02:00
Nicolas Hart 383215866f add a dedicated title for all entries page 2017-07-27 23:08:08 +02:00
Jeremy Benoist 77c5140bed Better export page 
I’ve increase the width of the page 900px, 600px looks too small for me. Should we use something like 90% instead?
 2017-06-22 12:13:22 +02:00
Thomas Citharel e2a038d653
Fix translations on QR code instructions 2017-06-22 09:12:57 +02:00
Thomas Citharel bd40f1af88
Add all entries RSS feed and put links on tag page itself and baggy too 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-06-21 12:02:04 +02:00
Jérémy Benoist 80784b782b Merge pull request #2683 from wallabag/credentials-in-db 
Store credentials in DB
 2017-06-20 16:40:48 +02:00
Thomas Citharel bead8b42da
Fix reviews 
Encrypt username too
Redirect to list after saving credentials
Fix typos

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-06-20 16:03:39 +02:00
Jeremy Benoist b8427f22f0
Add menu access to site credentials CRUD 2017-06-20 16:03:14 +02:00
Jeremy Benoist fc6d92c63d
Update route & user verification 2017-06-20 16:03:13 +02:00
Jeremy Benoist f92fcb53ca
Add CRUD for site credentials 2017-06-20 16:03:08 +02:00
Jeremy Benoist a9c6577f0c
Few fixes 2017-06-10 15:37:25 +02:00
Jeremy Benoist e8911f7c09
Add isPublic filter on entries 2017-06-10 15:00:52 +02:00
Jeremy Benoist fa0f5ee12b
Add some deletion confirmation to avoid mistake 2017-05-24 21:33:37 +02:00
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
Cedric Girard 1dd76ac650 unify Download/Export wording. 
This fixes #2967
 2017-05-18 15:23:48 +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 af54b2c959 Merge pull request #2731 from llune/patch-2 
Minor typo fix
 2016-12-30 08:55:15 +01:00
llune 9ad7475c74 Minor typo fix 2016-12-30 02:20:58 +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 32f455c131 Added tests 2016-11-19 20:05:16 +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 80302e5aaa Changed display for material theme 2016-11-14 13:58:41 +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
Jeremy Benoist 9c15470691 wallabag is full lowercase 2016-11-02 07:15:24 +01:00
Jean-Baptiste 303b3c61a7 Translation - French - tiny typo 2016-10-31 20:16:36 +01:00
Jean-Baptiste 31dd328df4 Translation - French - tiny escape correction 2016-10-31 20:12:29 +01:00
Jean-Baptiste 337b47c216 Translation - French - tiny escape correction 2016-10-31 20:01:07 +01:00
Nicolas Lœuillet 3b81212674
Added translations and baggy part 2016-10-31 16:48:34 +01:00
Jean-Baptiste f6aff9a7a8 Translation update - French 2016-10-30 12:10:59 +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 b0de88f75d
Use statements & update translation 2016-10-22 13:13:07 +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 166e8cc6a9
Fix french translation 2016-10-20 21:14:46 +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 0d61b6015f
Fixed french translation 2016-10-01 18:15:59 +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
Jeremy Benoist 1264029cd4
Add simple stats in footer 2016-10-01 16:03:50 +02:00
Nicolas Lœuillet eef8aeec8f
Reordered upgrade documentation 2016-09-28 11:13:20 +02:00
Nicolas Lœuillet 084fb0d303 Some fixes about upgrade from 2.0.x -> 2.1.0 2016-09-28 10:04:36 +02:00
Jeremy Benoist a9e92b6609 Add Instapaper translations 2016-09-27 20:27:08 +02:00
Thomas Citharel 59201088b4
bring chrome and firefox as separate imports 2016-09-25 12:29:18 +02:00
Nicolas Lœuillet efe659ab84
Add Chrome path for Mac OS 2016-09-25 12:28:55 +02:00
Thomas Citharel ae669126e7
Import Firefox & Chrome bookmarks into wallabag 2016-09-25 12:28:54 +02:00
Jeremy Benoist 13a522dfbd
Display a message when async import won’t work 
Mostly if Redis or RabbitMQ isn’t installed / launched.
I guess it’ll avoid some issues.
 2016-09-24 19:56:15 +02:00
Jeremy Benoist 59b97fae99
Avoid losing entry when fetching fail 
Instead of just say “Failed to save entry” we’ll save the entry at all cost and try to fetch content. If fetching content failed, the entry will still be saved at least, but without content.
 2016-09-17 07:40:56 +02:00