Commit graph

1433 commits

Author SHA1 Message Date
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
Thomas Citharel
1eea248bb0
move code 2016-10-22 09:06:07 +02:00
Thomas Citharel
c7935f32d2
cs 2016-10-22 09:06:07 +02:00
Thomas Citharel
351eb8d97e
bring annotations to API 2016-10-22 09:06:07 +02:00
Nicolas Lœuillet
f99ddbc6f8 Merge pull request #2481 from wallabag/some-fixes
Some fixes
2016-10-21 15:15:41 +02:00
Jeremy Benoist
b64d8f2c9f
Update Twitter cards description 2016-10-21 10:51:20 +02:00
Jeremy Benoist
2cbf0d05d4
Update translation for piwik_host 2016-10-21 10:45:39 +02:00
Jeremy Benoist
645dc7594b
Fix missing translations 2016-10-21 07:52:55 +02:00
Jeremy Benoist
818cbe1fee
Fix Portuguese translation 2016-10-21 07:18:41 +02:00
Paulino Michelazzo
8e53bf3aa1 Update translation 2016-10-21 00:12:53 +02:00
Jeremy Benoist
2297d60f10
If reload content failed, don’t update it
In case user wants a fresh version of the current one and the website isn’t available, don’t erase it with a boring message saying wallabag wasn’t able to refresh the content.
2016-10-20 22:49:46 +02:00
Jeremy Benoist
5453500458
Requeue depending on producer
Browser import can requeue message from `parseEntry` but we should take care of the way import are handled (depending on the producer)
2016-10-20 21:17:45 +02:00
Jeremy Benoist
1e3d74a9cf
Avoid RabbitMQ consumer to loop
When the `parseEntry` returns null it means the entry already exists in the database. Sending `false` as return, will requeue the message which will then loop forever.
2016-10-20 21:17:03 +02:00
Jeremy Benoist
576d285ddf
Translate date
I use a kind of hacky way to convert the user locale (defined with 2 letters, like `fr`) into a local with 5 letters (like `fr_FR`). I guess it should work on most of the case..
2016-10-20 21:16:01 +02:00
Jeremy Benoist
166e8cc6a9
Fix french translation 2016-10-20 21:14:46 +02:00
Jeremy Benoist
1cad9416c9
Update Portuguese translations 2016-10-20 21:11:10 +02:00
Paulino Michelazzo
a42cc6ff89 Update validators.pt.yml file
Some missed strings translated.
2016-10-20 08:57:24 +02:00
Paulino Michelazzo
99731f0bb1 Merge remote-tracking branch 'wallabag/master' 2016-10-18 22:48:23 +02:00
Paulino Michelazzo
3a3c6b866b Portuguese (Brazilian) translation
This the Portuguese (Brazilian) for the Wallaby v2.
2016-10-18 20:51:31 +02:00
Jeremy Benoist
692f9388cb Merge pull request #2455 from wallabag/fix-material-config-tabs
Fix tabs on material
2016-10-16 21:06:23 +02:00
Jeremy Benoist
3fb409ffc6 Merge pull request #2454 from wallabag/fix-baggy-small-width
Fix baggy display on small screens
2016-10-16 21:05:30 +02:00
Thomas Citharel
97512ec4bc Merge pull request #2459 from wallabag/improve-german-translation
German: improve existing and add missing translation
2016-10-16 12:06:42 +02:00
Sven Fischer
5bd7acd50d German: improve existing and add missing translation 2016-10-16 10:45:51 +02:00
Sven Fischer
f69ab83a5a add link to German documentation in about page 2016-10-16 09:23:58 +02:00
Thomas Citharel
d9a30ef301 Fix tabs on material
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-10-15 19:26:38 +02:00
Thomas Citharel
d32e1c424a Fix baggy on small screens 2016-10-15 19:04:53 +02:00
Jeremy Benoist
5960aa1ffc
CS 2016-10-15 18:00:08 +02:00
Jeremy Benoist
f1c3f68e90
ApiDoc & Route annotation were conflicted
The generated error was “Unable to guess how to get a Doctrine instance from the request information.”.

I haven’t checked deeper in Doctrine (I know it was coming from the DoctrineParamConverter).

Anyway, I check for FosRest possiblity to add extra format without allowing them for every route (like it was done in the first place).

I finally found a way but it then seems all request goes to the FormatListener of FosRest so I needed to add a custom rules to match all request to be sure we don’t get  a 406 error from FosRest.

Should be ok now …
2016-10-15 16:46:42 +02:00
Alexandr Danilov
38dc91be8e Improved side menu, reduced the font size on small screens, fixed a form to add links on small screens 2016-10-15 14:49:07 +02:00
Mateusz Rumiński
fa100dd1e0 Update messages.pl.yml
translate delete section to polish
2016-10-12 19:32:30 +02:00
Jeremy Benoist
b1b561da51 Merge pull request #2372 from pmartin/api-get-entry-as-epub
API: ability to export entry in all available format (epub, pdf, etc...)
2016-10-12 14:06:33 +02:00
Jeremy Benoist
e4cf672ccf
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-11 21:01:30 +02:00
Jeremy Benoist
e57df5611f Merge pull request #2409 from wallabag/Quent-in-patch-1
Occitan version update
2016-10-11 18:18:29 +02:00
Quent-in
a9e4d6dad2 Update messages.oc.yml
I thought I had translated the Docker installation line, apparently not!
Thanks Nicolas for the other changes!
2016-10-10 20:01:25 +02:00
Nicolas Lœuillet
a2f42d8eaa
Fixed Twitter Cards by adding a description tag 2016-10-10 16:05:06 +02:00
Nicolas Lœuillet
020c723e28 Added support of Twitter Cards for public articles 2016-10-10 14:33:34 +02:00
Nicolas Lœuillet
c26d1285ba Fixed review 2016-10-10 10:05:50 +02:00
Nicolas Lœuillet
2a5ff7f554 Merge pull request #2411 from wallabag/fix-entities
Fix entities definition
2016-10-10 08:02:25 +02:00
Jeremy Benoist
8eeefc658c Merge pull request #2414 from szafranek/bugfix-bookmarklet
Remove automatic closing of the window from bookmarklet
2016-10-10 07:11:01 +02:00
Krzysztof Szafranek
d8a9209cfc Remove automatic closing of the window from bookmarklet 2016-10-09 22:40:55 +02:00
Jeremy Benoist
39a19bdf47
When a sub command fail, display error message
We often got issue with message “The command "doctrine:database:create" terminated with an error code: 1.”.

Using the `BufferedOutput` we can store the output and only display it if an error occurs.
2016-10-09 22:39:43 +02:00
Jeremy Benoist
8dc4cd0f25
Fix entities definition
As per Doctrine said in the debug tool bar:

- The field Wallabag\ApiBundle\Entity\Client#refreshTokens is on the inverse side of a bi-directional relationship, but the specified mappedBy association on the target-entity Wallabag\ApiBundle\Entity\RefreshToken#client does not contain the required 'inversedBy="refreshTokens"' attribute.

- The field Wallabag\ApiBundle\Entity\Client#accessTokens is on the inverse side of a bi-directional relationship, but the specified mappedBy association on the target-entity Wallabag\ApiBundle\Entity\AccessToken#client does not contain the required 'inversedBy="accessTokens"' attribute.
2016-10-09 20:51:37 +02:00
Jeremy Benoist
28bb48905a
Optimize the way tag list is rendered
Instead of retrieve all informations about entries of a tag to just count them, we’ll count them before with a fastest query.

Also change the layout of the tag list in material design
2016-10-09 18:55:22 +02:00
Jeremy Benoist
b4fcd60e7f
Avoid tag duplication when tagging all articles
Mostly when the tag doesn’t yet exist.
It was created each time it matche the rule… glups.
2016-10-09 18:55:21 +02:00
Jeremy Benoist
4d318f3755
Add more log to tag:all 2016-10-09 18:55:21 +02:00
Quent-in
dd248e4561 Occitan version update
If you need to write dates in full letter you might be interessed in https://github.com/fightbulc/moment.php
It comes with lots of languages ;)
Q: where are the "previous" and "next" bouton text? Can't find them to translate them.
2016-10-09 18:24:42 +02:00
Jeremy Benoist
e39aec3e38 Merge pull request #2406 from szafranek/bugfix-number-of-annotations
Show number of annotations instead of nbAnnotations placeholder
2016-10-09 14:11:20 +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
Krzysztof Szafranek
c5e4293efd Fix few invalid HTML tags 2016-10-09 03:37:21 +02:00
Jeremy Benoist
9810f30821
Remove unnecessary user serialization 2016-10-08 21:16:40 +02:00
Jeremy Benoist
7ac3e575f1
CS 2016-10-08 20:35:16 +02:00
Jeremy Benoist
a730cae384
Bonus: display driver in install command 2016-10-08 20:33:21 +02:00
Jeremy Benoist
3f60446756
Fix PostgreSQL query
PostgreSQL doesn’t like when we compare interger and boolean :)
2016-10-08 20:26:06 +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
Jeremy Benoist
eed812afd0
Logout user before deleting it
And add a smal description
2016-10-08 19:39:12 +02:00
Nicolas Lœuillet
93a95c09bf Merge pull request #2351 from wallabag/fix-api-client-deletion
Changed relation between API client and refresh token
2016-10-08 13:31:54 +02:00
Nicolas Lœuillet
4ad6f5878a Merge pull request #2393 from wallabag/api-urls-exist
Ability to check multiple urls in API
2016-10-08 13:31:31 +02:00
Nicolas Lœuillet
71254701b7
Changed tests 2016-10-08 13:27:18 +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
abb5291cd5
CS 2016-10-08 13:27:17 +02:00
Thomas Citharel
e4b46f77ef
work 2016-10-08 13:27:17 +02:00
Jeremy Benoist
3f3a60879e
Add entry export in API
Export isn't available for json & xml because user can use the default
entry endpoint instead.
2016-10-08 12:59:19 +02:00
Pascal MARTIN
24de866534
API: getEntry can return EPUB 2016-10-08 12:05:41 +02:00
Pascal MARTIN
3d4b0b3064
Routing: epub format is allowed for API 2016-10-08 12:05:40 +02:00
Jeremy Benoist
ee32248f43
Ensure access_token are removed
When we remove the client, we should ensure that access_token are also removed.

To ensure that, I created a test that generated an access_token. So when we remove the client, this association should be cascaded and shouldn’t generate an error.

Also I moved some Api related stuff to the ApiBundle (like the developer controler and ClientType form)
2016-10-08 00:05:41 +02:00
Jeremy Benoist
ac8cf632bb
Ensure orphan tag are remove in API
When the association between a tag and an entry is removed, if the tag doesn’t have other entries, we can remove it.

Also add more tests for that part and ensure TagControllerTest is isolated from the rest of the test suite (finally!)
2016-10-07 23:31:53 +02:00
Nicolas Lœuillet
3049afe190 Merge pull request #2396 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-10-07 22:20:51 +02:00
Mateusz Rumiński
aa8a58b5a0 Update messages.pl.yml
translated shared_by_wallabag to polish
2016-10-07 21:32:27 +02:00
Jeremy Benoist
6d204f5382
Add ability to use socket
For Redis & MySQL
2016-10-07 21:00:13 +02:00
Jeremy Benoist
f0abc22d09
Ability to check multiple urls in API 2016-10-07 20:37:01 +02:00
Nicolas Lœuillet
20bf78b935 Merge pull request #2389 from wallabag/add-info-publich-articles
Added default picture if preview picture is null
2016-10-07 16:35:32 +02:00
Nicolas Lœuillet
d5c45d5288
Added default picture if preview picture is null 2016-10-07 15:21:31 +02:00
Nicolas Lœuillet
5e7786f3c4
Fixed two-factor checkbox display in user admin panel
Fix #2380
2016-10-07 14:56:26 +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
74e1f7433a
Fix tag test 2016-10-07 07:43:48 +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
b0458874c8
Fix relations export for Entry
Tags & Annotations weren’t really well exported.
This is now fixed (+ tests)
2016-10-07 07:43:19 +02:00
Thomas Citharel
9d127b3b93 Merge pull request #2377 from wallabag/fix-exists-api
Fix exists API call
2016-10-05 19:52:06 +02:00
Jeremy Benoist
0b174d69d7
Fix typo & add test 2016-10-05 19:30:56 +02:00
Thomas Citharel
5d39243068 Fix exists API call
Boo
2016-10-05 15:28:36 +02:00
Thomas Citharel
15f1352ef8
better tags on material 2016-10-05 14:06:55 +02:00
Thomas Citharel
645c0d5bce
better tags on baggy 2016-10-04 20:11:10 +02:00
Thomas Citharel
57386125ab Merge pull request #2353 from wallabag/assets-fix
Basically, fix everything
2016-10-04 16:26:50 +02:00
Thomas Citharel
f733d8aaa3
Fix icon position 2016-10-04 15:12:48 +02:00
Nicolas Lœuillet
3e85e91159
Fixed calendar icon position with baggy theme 2016-10-04 15:00:47 +02:00
Nicolas Lœuillet
0c7f1ba796
Fixed icon position in share menu 2016-10-04 14:58:06 +02:00
Thomas Citharel
46d78f87d9
fix icons 2016-10-04 14:48:22 +02:00
Jeremy Benoist
755ff9e835
Create config even if user is disabled
When a user register itself AND the wallabag instance is configured to send a confirmation email, the user is disabled when the listener (which create the config) receive the event.
There were a check (don't know why) if the user is enabled we create the config. But the user is disabled when confirmation email is actived.
2016-10-04 10:42:46 +02:00
Thomas Citharel
a494c33ef7
Basically, fix everything
* Remove install.sh
* Assets are now provided
* Icons font issues are fixed
2016-10-03 23:08:26 +02:00
Nicolas Lœuillet
b0da721a52
Changed relation between API client and refresh token
Fix #2350
2016-10-03 21:39:01 +02:00
Thomas Citharel
aafb3321b7 Merge pull request #2341 from mruminski/master
Update messages.pl.yml
2016-10-03 16:44:19 +02:00
Sven Fischer
1c634fe437 improve German translation 2016-10-03 15:52:27 +02:00
Mateusz Rumiński
0113e2af1f Update messages.pl.yml
add missing and update existing translation
2016-10-03 15:05:21 +02:00
Nicolas Lœuillet
0f70abd695
Fixed CSS for quickstart links 2016-10-03 10:27:01 +02:00
Jeremy Benoist
7d002c333d Merge pull request #2333 from wallabag/translation-german-for-2.1
for 2.1, translate all strings to German, which haven't been translated yet
2016-10-03 09:25:51 +02:00
Nicolas Lœuillet
ab809de184 Merge pull request #2314 from wallabag/assets
Assets work
2016-10-03 09:09:45 +02:00
Jeremy Benoist
c30af946e7 Update messages.de.yml 2016-10-03 09:08:42 +02:00
Nicolas Lœuillet
553f863c3c Fixed typos 2016-10-03 09:05:40 +02:00
Julian Oster
beee26f6d5 Better translation for the weird sentence 2016-10-02 22:50:27 +02:00
Julian Oster
a878581410 Improve the german translation a bit
Just some little mistakes, good work so far :)
2016-10-02 22:32:23 +02:00
Sven Fischer
df9c080f8c translate all strings to German, which haven't been translated yet 2016-10-02 21:41:21 +02:00
Thomas Citharel
dfbbf0e18a Merge pull request #2331 from wallabag/api-links
Fix parameters in API _links
2016-10-02 17:48:16 +02:00
Jeremy Benoist
77557d289b
Merge remote-tracking branch 'origin/master' into 2.1 2016-10-02 17:37:41 +02:00
Jeremy Benoist
c3f8b428dd
Fix parameters in API _links
We forgot to pass them to the factory
2016-10-02 15:41:08 +02:00
Jeremy Benoist
1dc3bee6b9 Merge pull request #2327 from wallabag/user-management
Add users management UI
2016-10-02 15:00:02 +02:00
Jeremy Benoist
ccc7faec09
Disabled delete button for the logged user
To avoid some bad things to happen…
2016-10-02 13:29:57 +02:00
Nicolas Lœuillet
18b8dc0e99 Merge pull request #2325 from wallabag/api-entries-exists
Add an exists endpoint in API
2016-10-02 13:17:23 +02:00
Paulino Michelazzo
ffcd91ec6c Remove error message when creating ePub versions
Trying to create a ePub version, the first page shows a message of a
“missing >”. This change solve this problem (and, for sure, in any
download version that’s use HTML).
2016-10-02 13:16:12 +02:00
Nicolas Lœuillet
92395680b6 Merge pull request #2328 from wallabag/avoid-duplicate-url
Avoid duplicate url with accents
2016-10-02 13:14:16 +02:00
Jeremy Benoist
03141f9b95
Cleanup & add link on baggy menu 2016-10-02 11:08:53 +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