Commit graph

1341 commits

Author SHA1 Message Date
Nicolas Lœuillet 81c657fc5b Merge pull request #2676 from wallabag/update-addons
Updated addons links
2016-12-01 14:39:48 +01:00
Nicolas Lœuillet 8d064ba5a4
Updated addons links 2016-12-01 13:48:34 +01:00
Nicolas Lœuillet 68da51d2a3
Fixed 404 for wallabag logo in 2FA 2016-12-01 10:51:04 +01:00
Nicolas Lœuillet 6787afbe0d
Added floating button on entry view for mobile 2016-11-30 16:08:02 +01:00
Nicolas Lœuillet 9aa991281d
Renamed view_mode by list_mode and hide excerpt 2016-11-28 16:10:21 +01:00
Nicolas Lœuillet 56a7ce17f3 Hide article text on mobile with list mode 2016-11-28 14:27:58 +01:00
Nicolas Lœuillet 9f01d0fde0 Added list view 2016-11-28 14:27:58 +01:00
Nicolas Lœuillet 34ea7be622 Merge pull request #2663 from wallabag/remove-fosuser-attributes
Removed FOSUser attributes removed in alpha4
2016-11-28 14:27:31 +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 6bb0866cf5 Merge pull request #2659 from akovalyov/bugfix/non-latin-characters-in-reading-time-calculation
Fix incorrect reading time calculation for entries in non-latin languages.
2016-11-28 09:23:04 +01:00
Andrew Kovalyov 5b6888b13f Fix incorrect reading time calculation for entries in languages with
non-latin chars subset.
2016-11-28 01:15:06 +02:00
Kevin Decherf 00fc2b44f4 Enforce lowercase on domain name filter
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-26 19:52:50 +01:00
Jeremy Benoist f4a9833490 Merge pull request #2620 from wallabag/fix-password-layout
Fix password layout
2016-11-23 09:53:18 +01:00
Nicolas Lœuillet 0df2a4b021
Fixed entry shortcuts available in list view 2016-11-22 21:31:21 +01:00
Jeremy Benoist 5066c3e066
Re-use FOSUser master branch 2016-11-22 21:25:05 +01:00
Jeremy Benoist d7acde5cc3
Use the correct template
When resetting the password, the overriden template we used wasn’t well spelled.

And since we are using a locked version of FOSUser (on a custom commit), the translation of `resetting.check_email` is wrong in any language but english.
2016-11-22 21:23:58 +01:00
Jeremy Benoist 7c6b7a40d1 Merge pull request #2637 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-11-22 20:02:00 +01:00
Mateusz Rumiński 24d4b243a7 Update messages.pl.yml
translate shortcuts section to polish
2016-11-22 19:24:38 +01:00
Jeremy Benoist 176e0ea3ca Merge pull request #2317 from wallabag/restricted-access
Added authentication for restricted access articles
2016-11-22 19:12:53 +01:00
Nicolas Lœuillet d51093a7d9
Added documentation and missing translations 2016-11-22 17:32:24 +01:00
Nicolas Lœuillet d64bf7953b
Added internal setting to enable/disable articles with paywall 2016-11-22 14:56:53 +01:00
Nicolas Lœuillet 40f3ea57fb
Cleared CookieJar to avoid websites who use cookies for analytics 2016-11-22 14:25:51 +01:00
Bertrand Dunogier 7aab0ecf2f Added authentication for restricted access articles
Fix #438. Thank you so much @bdunogier
2016-11-22 14:01:46 +01:00
Nicolas Lœuillet 893ccad31f
Translations for shortcuts help 2016-11-22 13:33:06 +01:00
Nicolas Lœuillet c526f9e474 Added help about shortcuts 2016-11-22 13:07:42 +01:00
Jeremy Benoist 5cd0857e3c
Return 304 when content isn't reloaded using the API
Previously it was a 400 but this is more related to a real error.
Using the API user should only know the content got reloaded or not.
If reloaded: 200 otherwise: 304.
2016-11-22 10:45:19 +01:00
Nicolas Lœuillet ba838dae5a Merge pull request #2614 from wallabag/api-reload
Add ability to reload entry from API
2016-11-22 09:39:43 +01:00
Mateusz Rumiński 4bf5172585 Update messages.pl.yml
missing polish translation added
2016-11-21 18:18:52 +01:00
Jeremy Benoist 1f00547836 Merge pull request #2630 from ThibaudDauce/fix-black-headings
Add white-text class to card-title too
2016-11-21 17:06:55 +01:00
Thibaud Dauce 4f2755a61d Add white-text class to card-title too 2016-11-21 15:37:47 +01:00
Jeremy Benoist c1683778ab
Add ability to use Redis with password 2016-11-20 20:43:04 +01:00
Jeremy Benoist 56da73969a
Return an explicit error if reload fail 2016-11-20 16:25:13 +01:00
Jeremy Benoist 70584b42aa
Fixing tests 2016-11-20 15:15:13 +01:00
Jeremy Benoist 0a6f4568b5
Add ability to reload entry from API 2016-11-20 13:08:41 +01:00
Jeremy Benoist 8670250a26
Add RSS pagination
Following https://tools.ietf.org/html/rfc5005#page-4
2016-11-20 09:39:26 +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
Nicolas Lœuillet 398de40517 Added search engine in baggy theme 2016-11-19 19:17:30 +01:00
Nicolas Lœuillet ee122a7528 Added a simple search engine
Fix #18
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
Jeremy Benoist cffcce0c92
Wallabag can’t work on PostgreSQL <= 9.1 2016-11-19 11:32:56 +01:00
Nicolas Lœuillet d215273c65
Check if status code is OK 2016-11-18 23:05:02 +01:00
Nicolas Lœuillet e10e6ab34e
Replace http status with a string
I don't want to have 0 if we don't fetch status code, I think it's better to have an empty string, mainly for filters
2016-11-18 15:55:16 +01:00
Nicolas Lœuillet 10b3509757
Added http_status in Entry entity 2016-11-18 15:09:21 +01:00
Mateusz Rumiński 52e01d3483 Update messages.pl.yml
translate action_mark_as_read section to polish
2016-11-17 18:52:42 +01:00
Nicolas Lœuillet c894d76e57 Added tooltips for baggy theme 2016-11-17 09:22:39 +01:00
Nicolas Lœuillet 540a9bc4a2 Added help on config screen 2016-11-17 09:22:39 +01:00
Nicolas Lœuillet 54fd55fda1
Tried to fix tests 2016-11-16 23:07:34 +01:00
Nicolas Lœuillet 65cd8a4a9a
Added tests 2016-11-16 23:07:34 +01:00
Nicolas Lœuillet f052f1fd57
Added constants for redirection values 2016-11-16 23:07:34 +01:00
Strubbl 287204cda7
Update messages.en.yml 2016-11-16 23:07:34 +01:00
Strubbl f0ba37fbd5
Update messages.de.yml 2016-11-16 23:07:34 +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 94f2057ffe
Added CSS class on links 2016-11-16 09:17:12 +01:00
Nicolas Lœuillet 3cc78f0679 Added shortcuts 2016-11-15 21:54:20 +01:00
Jeremy Benoist d213219ec7 Merge pull request #2570 from wallabag/add-creation-date
Added creation date on entries view
2016-11-15 09:23:44 +01:00
Jeremy Benoist 66fe2a3dc4 User-agents have moved to site-config
Since graby@1.5.0, user-agent can be defined in site-config, which the now recommended way
2016-11-14 14:29:13 +01:00
Nicolas Lœuillet a8c6f29f3e
Hide creation date in mobile view 2016-11-14 14:28:42 +01:00
Nicolas Lœuillet 80302e5aaa Changed display for material theme 2016-11-14 13:58:41 +01:00
Nicolas Lœuillet 1c282b1da0 Added creation date on entries view 2016-11-14 13:57:31 +01:00
Jeremy Benoist d3511bbde9 Merge pull request #2577 from wallabag/add-tooltip-material
Added tooltips in header bar
2016-11-14 10:08:26 +01:00
Thomas Citharel d37081e50b Merge pull request #2562 from wallabag/image-bigger
Bigger image preview in case of only image content
2016-11-14 10:01:12 +01:00
Nicolas Lœuillet cf9ee2fbd0
Added tooltips in header bar 2016-11-12 11:57:55 +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 644b340178 Merge pull request #2566 from wallabag/add-unmarkit
Added unmark.it sharing
2016-11-09 18:19:08 +01:00
Nicolas Lœuillet 8a9604aafe Added unmark.it sharing
Fix #668
2016-11-09 18:18:49 +01:00
Nicolas Lœuillet 1781ca3763
Removed support website on about page 2016-11-09 13:59:55 +01:00
Mateusz Rumiński a9740448cf Update messages.pl.yml
translate Pinboard importer section to polish
2016-11-08 23:11:03 +01:00
Jeremy Benoist 8d7b4f0eff
Display a bigger image in case of image content
If the content is only an image, we can display a bigger preview image because we won’t have text to display.

Also, split different card view to avoid too much complexity in the entries.html.twig
2016-11-08 22:17:46 +01:00
Yuriy Evdokimov d99a7c2206 fix #2559 2016-11-08 22:14:32 +05: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
Nicolas Lœuillet a4de2351a0 Merge pull request #2556 from wallabag/replace-tokenstorage
Replaced TokenStorage with TokenStorageInterface
2016-11-07 11:13:50 +01:00
Nicolas Lœuillet 94766a8962
PHP CS 2016-11-07 10:41:11 +01:00
Nicolas Lœuillet 2fe2e411a7
Replaced TokenStorage with TokenStorageInterface 2016-11-07 10:34:49 +01:00
Strubbl 56e6216485 Update messages.en.yml
Instapaper->Pinboard
2016-11-06 22:29:49 +01:00
Strubbl e8e72daaa6 Update messages.de.yml 2016-11-06 22:29:08 +01:00
Jeremy Benoist d61b24e459
Round readingtime to avoid crazy number
Like `8.666666666667 min`
2016-11-06 21:41:32 +01:00
Jeremy Benoist 9ab024b4f5
Add Pinboard import 2016-11-04 22:44:31 +01:00
Jeremy Benoist b5571b52cc Merge pull request #2541 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-11-04 21:49:42 +01:00
Mateusz Rumiński ff7f551f5a Update messages.pl.yml
missing polish translation added
2016-11-04 19:26:06 +01:00
Quent-in eaa0bf00a6 Update of the OC version 2016-11-04 18:13:11 +01:00
Nicolas Lœuillet 2db9142bfc Merge pull request #2460 from wallabag/ui-changes
UI Changes
2016-11-04 08:49:52 +01:00
Jeremy Benoist 7e9c1d65b1
Add index into Table definition 2016-11-04 08:02:02 +01:00
Jeremy Benoist 1e7b04d4ea
Use created_at as default sort
With index (following https://github.com/wallabag/wallabag/pull/2534)
2016-11-04 07:56:04 +01:00
Jeremy Benoist ce11952447
Use created_at as default sort
Imported content use the real creation date. If we sort by id, it'll
display contents in reverse order.
2016-11-04 07:34:38 +01:00
Jeremy Benoist 001cc7168a
Cleanup 2016-11-03 18:01:25 +01:00
Jeremy Benoist 864c1dd23a
Fix rest controller merge 2016-11-03 17:29:16 +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
Thomas Citharel d56d416d9b
Deal with more resolution issues
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 12:49:57 +01:00
Thomas Citharel 3221b2e413
Fix resolution issues and 'title' issues
Also, modify editorconfig for css files.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 11:28:40 +01:00
Jeremy Benoist 3be554c78f Merge pull request #2519 from Jibec/master
Translation update - French
2016-11-02 07:48:10 +01:00
Jeremy Benoist e46fdf3096
CS 2016-11-02 07:26:14 +01:00
Jeremy Benoist 9c15470691 wallabag is full lowercase 2016-11-02 07:15:24 +01:00
Jeremy Benoist 1f66d79e6b
Add more importer to wallabag:import command
All importer available expect Pocket which require an oAuth login.
2016-11-02 07:10:57 +01:00
Jeremy Benoist 7816eb622d
Add entry.saved event to import & rest 2016-11-02 07:10:23 +01:00
Kevin Decherf 22ef6f96e2 Force user-agent for .slashdot.org
Slashdot replaces actual content with a form regarding cookies when
requests originate from France. By forcing the user-agent, the warning
seems to go away.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2016-11-01 19:51:45 +01:00
Jeremy Benoist e0597476d1
Use custom event instead of Doctrine ones
This give us ability to use Entry ID to determine where to store images and it’s then more easy to remove them when we remove the entry.
2016-11-01 14:49:02 +01:00
Laurent 995d909d0f Add Instapaper to CLI import 2016-11-01 18:33:32 +08: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 68e0efffb8
Fixed review 2016-10-31 17:20:27 +01:00
Nicolas Lœuillet 3b81212674
Added translations and baggy part 2016-10-31 16:48:34 +01:00
Nicolas Lœuillet e61ee56031 Added QRCode and link to configure android application 2016-10-31 16:18:52 +01:00
Jeremy Benoist aedd6ca0fd
Add translations & migration 2016-10-31 13:29:33 +01:00
Jeremy Benoist d1495dd0a4
Ability to enable/disable downloading images
This will speed up the test suite because it won’t download everything when we add new entry…
Add a custom test with downloading image enabled
2016-10-30 21:30:45 +01:00
Jeremy Benoist 4b3c983ab8
Inject parameter instead of service
We are injecting CraueConfig service when we only need to retrieve one or two values from it.
Instead I discovered we can directly inject a value from a service in the service definition!
2016-10-30 20:27:41 +01:00
Jeremy Benoist 309e13c11b
Move settings before Entry
Because we need wallabag_url to be defined when we’ll insert entries
2016-10-30 20:12:34 +01:00
Jeremy Benoist 41ada277f0
Add instance url to the downloaded images 2016-10-30 19:50:00 +01:00
Jean-Baptiste 2087e499b4 Translation update - French 2016-10-30 12:11:24 +01:00
Jean-Baptiste f6aff9a7a8 Translation update - French 2016-10-30 12:10:59 +01:00
Jeremy Benoist 48656e0eaa
Fixing tests 2016-10-30 11:27:09 +01:00
Jeremy Benoist 7f55941856
Use doctrine event to download images 2016-10-30 10:48:29 +01:00
Jeremy Benoist 45fd7e09d7
Cleanup 2016-10-30 09:58:53 +01:00
Jeremy Benoist 535bfcbe80
Move related event things in Event folder 2016-10-30 09:58:39 +01:00
Jeremy Benoist 156bf62758
CS 2016-10-29 16:25:45 +02:00
Thomas Citharel 94654765cc
Working 2016-10-29 16:25:45 +02:00
Thomas Citharel 419214d722
Download pictures successfully
Needs to rewrite them properly (get base url)
2016-10-29 16:25:45 +02:00
Thomas Citharel 4dface6670
first draft (from v1) 2016-10-29 16:25:45 +02:00
Nicolas Lœuillet 920d88599a Fixed entries export filtered with a tag
Fix #2505
2016-10-29 13:43:11 +02:00
Nicolas Lœuillet bc4564a709
Removed useless route 2016-10-28 15:24:58 +02:00
Nicolas Lœuillet 900c844861
Exploded WallabagRestController into many controllers
Fix #2503
2016-10-28 14:46:30 +02:00
Nicolas Lœuillet 73e8df9e44
Renamed variable for page title 2016-10-26 15:49:44 +02:00
Nicolas Lœuillet 7a5043f187
Added tag label in the page title
Fix #2472
2016-10-26 13:53:23 +02:00
Jeremy Benoist c68720d40e Merge pull request #2473 from pmichelazzo/master
Portuguese (Brazilian) translation
2016-10-25 11:41:24 +02:00
Paulino Michelazzo e8eec07ae6 Translated missed line 147 2016-10-25 07:25:08 -02:00
Nicolas Lœuillet 23406ca3f1
Added relation between API Client and User
Fix #2062
2016-10-24 21:56:28 +02:00
Mateusz Rumiński cd99bfae68 Update messages.pl.yml
translate reset section to polish
2016-10-24 19:49:33 +02:00
Jeremy Benoist 64a8781e45
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-24 12:03:17 +02:00
Jeremy Benoist 9313ea9d44 Merge pull request #2401 from wallabag/reset-account
Reset account
2016-10-24 11:57:51 +02:00
Jeremy Benoist 5ce1528953
Fix migrations 2016-10-23 12:35:57 +02:00
Jeremy Benoist 88d5d94dcb
Lowercase wallabag 2016-10-22 14:05:59 +02:00
Jeremy Benoist fc79f1ffa8
Add verification check for MySQL version
Must now be >= 5.5.4
2016-10-22 13:41:03 +02:00
Jeremy Benoist b0de88f75d
Use statements & update translation 2016-10-22 13:13:07 +02:00
Jeremy Benoist 8c61fd12b1
CS 2016-10-22 13:13:07 +02:00
Jeremy Benoist ca8b49f46e
Add baggy reset part 2016-10-22 13:13:07 +02:00
Jeremy Benoist f71e55ac88
Avoid orphan tags 2016-10-22 13:13:07 +02:00
Jeremy Benoist 2f82e7f8e1
Cleanup subscriber / listener definition 2016-10-22 13:13:07 +02:00
Jeremy Benoist 191564b7f7
Add custom doctrine subscriber for SQLite
Since SQLite doesn’t handle cascade remove by default, we need to handle it manually.

Also some refacto
2016-10-22 13:13:07 +02:00
Jeremy Benoist 98efffc2a6
Fix emoji insertion in MySQL
Switch to utf8mb4 instead of utf8 because f*** MySQL
See https://github.com/doctrine/dbal/pull/851
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 817724a7b8
Re-add bottom pagination
Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template
2016-10-22 13:09:16 +02:00
Thomas Citharel 34aa06a9b9
WIP
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-10-22 13:08:04 +02:00
Jeremy Benoist aa4741091f
Add test on /api/annotations
Fix controller forward in WallabagRestController.
Update PHPDoc so it is sorted the same way as others one
Duplicate all annotations test to use both api & normal way
Also, make annotation tests independent to each other
2016-10-22 12:09:20 +02:00
Jeremy Benoist 3199ec4702
CS 2016-10-22 09:17:01 +02:00
Nicolas Lœuillet d9b7768dca
Added a missing namespace 2016-10-22 09:06:07 +02:00
Thomas Citharel 0c271b9eb0
fix cs and phpdoc 2016-10-22 09:06:07 +02:00
Thomas Citharel b1e92f8c14
cs 2016-10-22 09:06:07 +02:00