Commit Graph

4015 Commits

Author SHA1 Message Date
f39152ad6e Merge pull request #3266 from egilli/export-domain-as-author
Use the article publisher as author for exported files
2017-07-11 09:21:49 +02:00
c7fcca533d Merge pull request #3270 from wallabag/do-not-allow-html-api
Disallow html for API templating formats
2017-07-11 07:30:30 +02:00
9aa11176b8 Merge pull request #3264 from wallabag/trait-timestamps
Add EntityTimestampsTrait to handle dates
2017-07-11 07:30:08 +02:00
eeabca8090 Make updateAuthor code simpler to read 2017-07-10 10:08:20 +02:00
337e807297 Merge pull request #3267 from wallabag/revert-client-credentials
Revert client_credentials grant types
2017-07-09 21:22:28 +02:00
c57f69d967 Use the article publisher as author for export
When exporting an entry, use the publishedBy field as author name for
epub, mobi and pdf formats. Fallback to domain name if empty.
2017-07-09 18:33:14 +02:00
2e6239bb9f Disallow html for templating formats
Using html template format will then put the html format in the allowed list for the api doc which we don’t want since the api doesn’t response for html format.
2017-07-09 10:07:14 +02:00
07320a2bd2 Use the article domain as author for export files
When exporting an entry, use the domain name as author name for epub,
mobi and pdf formats, instead of 'wallabag'.
Change the author from array to string, because for now, there is always
only one author.
2017-07-08 19:53:43 +02:00
2e5b2fa808 Revert client_credentials grant types 2017-07-08 19:28:12 +02:00
927c9e796f Add EntityTimestampsTrait to handle dates
Refactorize timestamps() method to avoid re-writing it on each entity
2017-07-06 09:01:51 +02:00
b5d7eb148c Merge pull request #3256 from wallabag/fix-patch
Fix PATCH method
2017-07-05 15:00:24 +02:00
896f981ff5 Merge pull request #3257 from wallabag/fix-mapping-entities
Fixed mapping entities
2017-07-03 17:15:45 +02:00
c18a2476b6 CS 2017-07-03 13:56:39 +02:00
d0ec2ddd23 Fix validateAndSetPreviewPicture
Which wasn't covered by a test!
2017-07-03 13:45:04 +02:00
a05b61159e Fix PATCH method
The PATCH method for the entry should only update what user sent to us and not the whole entry as it was before.
Also, sending tags when patching an entry will now remove all current tags & assocatied new ones.
2017-07-03 13:45:04 +02:00
e50d7d31c0 CS 2017-07-03 13:40:47 +02:00
9114615adc Fixed mapping entities
There were this error in the console:

> The association Wallabag\CoreBundle\Entity\SiteCredential#user refers to the inverse side field Wallabag\UserBundle\Entity\User#site_credentials which does not exist.
2017-07-03 13:40:47 +02:00
71e1cbc8eb Merge pull request #3258 from wallabag/cs-fixer
Add a real configuration for CS-Fixer
2017-07-03 13:39:54 +02:00
38520658ad Fix tests 2017-07-03 07:30:54 +02:00
f808b01692 Add a real configuration for CS-Fixer 2017-07-01 09:52:38 +02:00
822c877949 Merge pull request #3245 from wallabag/fix-bc
Avoid BC on exists endpoint
2017-06-29 11:17:58 +02:00
331e5b0261 CS 2017-06-28 09:18:22 +02:00
39ffaba323 Return null instead of false 2017-06-28 08:15:06 +02:00
42708d1121 Merge remote-tracking branch 'origin/master' into 2.3 2017-06-26 10:05:48 +02:00
53e1892eb6 Merge pull request #3237 from matteocoder/master
Revised messages.it.yml file
2017-06-26 10:00:35 +02:00
559cbfdc2f Fixed broken lines and added new lines
In addition to fixing broken lines, I've also added a couple of lines from recent PRs.
2017-06-24 11:06:09 +02:00
18696f77fd Avoid BC on exists endpoint 2017-06-23 08:30:23 +02:00
29714661b1 Merge pull request #3204 from wallabag/better-export-page
Better public sharing page
2017-06-22 15:34:46 +02:00
151f45db0e Don't load js for nothing in prod 2017-06-22 14:55:49 +02:00
77255d6688 Add css on share public page 2017-06-22 12:15:24 +02:00
6b1b148d65 Add share.scss file
Still needs to include it in the twig template
2017-06-22 12:13:22 +02:00
789c46821d Fix linter issue on webpack config files 2017-06-22 12:13:22 +02:00
38dd2def20 add 🇮🇹 shared_by_wallabag string translated by @matteocoder 2017-06-22 12:13:22 +02:00
5642d1a150 adjust 🇩🇪 shared_by_wallabag string to include user info 2017-06-22 12:13:22 +02:00
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
9416053bfc Merge pull request #3241 from wallabag/fix-qr-code-trans
Fix translations on QR code instructions
2017-06-22 10:26:41 +02:00
d0702f9fbd Merge pull request #3227 from wallabag/oauth-client-credentials
Add client_credentials oAuth2 auth method
2017-06-22 10:00:23 +02:00
1adab57426 Add 🇮🇹 translation 2017-06-22 09:12:57 +02:00
8c3d7875b2 Update polish
add missing translation
2017-06-22 09:12:57 +02:00
e2a038d653 Fix translations on QR code instructions 2017-06-22 09:12:57 +02:00
8c68acff2a Merge pull request #3207 from wallabag/tag-rss
Add RSS for tags
2017-06-21 14:51:46 +02:00
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
ebf2d92327 Fix typo 2017-06-21 11:44:36 +02:00
8c59809432 add rss icon
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-21 11:44:36 +02:00
11b8695663 Fix tests 2017-06-21 11:44:35 +02:00
03ce43d466 Fix getContainer in command 2017-06-21 11:44:35 +02:00
18c38dffc6 Add RSS tags feeds 2017-06-21 11:44:35 +02:00
25203e5081 User existing service instead of getDoctrine 2017-06-21 11:44:35 +02:00
80784b782b Merge pull request #2683 from wallabag/credentials-in-db
Store credentials in DB
2017-06-20 16:40:48 +02:00
f44dba22fc Get rid of masked value in listing 2017-06-20 16:03:39 +02:00