Commit graph

4001 commits

Author SHA1 Message Date
Jérémy Benoist
896f981ff5 Merge pull request #3257 from wallabag/fix-mapping-entities
Fixed mapping entities
2017-07-03 17:15:45 +02:00
Jeremy Benoist
e50d7d31c0
CS 2017-07-03 13:40:47 +02:00
Jeremy Benoist
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
Jérémy Benoist
71e1cbc8eb Merge pull request #3258 from wallabag/cs-fixer
Add a real configuration for CS-Fixer
2017-07-03 13:39:54 +02:00
Jeremy Benoist
38520658ad
Fix tests 2017-07-03 07:30:54 +02:00
Jeremy Benoist
f808b01692
Add a real configuration for CS-Fixer 2017-07-01 09:52:38 +02:00
Jérémy Benoist
822c877949 Merge pull request #3245 from wallabag/fix-bc
Avoid BC on exists endpoint
2017-06-29 11:17:58 +02:00
Jérémy Benoist
331e5b0261 CS 2017-06-28 09:18:22 +02:00
Jeremy Benoist
39ffaba323
Return null instead of false 2017-06-28 08:15:06 +02:00
Jeremy Benoist
42708d1121
Merge remote-tracking branch 'origin/master' into 2.3 2017-06-26 10:05:48 +02:00
Jérémy Benoist
53e1892eb6 Merge pull request #3237 from matteocoder/master
Revised messages.it.yml file
2017-06-26 10:00:35 +02:00
matteocoder
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
Jeremy Benoist
18696f77fd
Avoid BC on exists endpoint 2017-06-23 08:30:23 +02:00
Jérémy Benoist
29714661b1 Merge pull request #3204 from wallabag/better-export-page
Better public sharing page
2017-06-22 15:34:46 +02:00
Thomas Citharel
151f45db0e Don't load js for nothing in prod 2017-06-22 14:55:49 +02:00
Thomas Citharel
77255d6688 Add css on share public page 2017-06-22 12:15:24 +02:00
Jeremy Benoist
6b1b148d65 Add share.scss file
Still needs to include it in the twig template
2017-06-22 12:13:22 +02:00
Jeremy Benoist
789c46821d Fix linter issue on webpack config files 2017-06-22 12:13:22 +02:00
Sven Fischer
38dd2def20 add 🇮🇹 shared_by_wallabag string translated by @matteocoder 2017-06-22 12:13:22 +02:00
Sven Fischer
5642d1a150 adjust 🇩🇪 shared_by_wallabag string to include user info 2017-06-22 12:13:22 +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
Nicolas Lœuillet
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
Nicolas Lœuillet
d0702f9fbd Merge pull request #3227 from wallabag/oauth-client-credentials
Add client_credentials oAuth2 auth method
2017-06-22 10:00:23 +02:00
Jérémy Benoist
1adab57426
Add 🇮🇹 translation 2017-06-22 09:12:57 +02:00
Mateusz Rumiński
8c3d7875b2
Update polish
add missing translation
2017-06-22 09:12:57 +02:00
Thomas Citharel
e2a038d653
Fix translations on QR code instructions 2017-06-22 09:12:57 +02:00
Jérémy Benoist
8c68acff2a Merge pull request #3207 from wallabag/tag-rss
Add RSS for tags
2017-06-21 14:51:46 +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
Jeremy Benoist
ebf2d92327
Fix typo 2017-06-21 11:44:36 +02:00
Thomas Citharel
8c59809432
add rss icon
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-21 11:44:36 +02:00
Jeremy Benoist
11b8695663
Fix tests 2017-06-21 11:44:35 +02:00
Jeremy Benoist
03ce43d466
Fix getContainer in command 2017-06-21 11:44:35 +02:00
Jeremy Benoist
18c38dffc6
Add RSS tags feeds 2017-06-21 11:44:35 +02:00
Jeremy Benoist
25203e5081
User existing service instead of getDoctrine 2017-06-21 11:44:35 +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
Jeremy Benoist
f44dba22fc
Get rid of masked value in listing 2017-06-20 16:03:39 +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
906424c1b6
Crypt site credential password 2017-06-20 16:03:35 +02:00
Jeremy Benoist
9de9f1e5ce
Add a live test for restricted article
It is not aimed to test if we can get the full article (since we aren't using real login/password)
but mostly to test the full work (with authentication, etc.)

Do not clean fixtured to avoid SQLite to re-use id for entry tag relation 😓
2017-06-20 16:03:20 +02:00
Jeremy Benoist
fd7fde9515
Force sequence creation for postgresql 2017-06-20 16:03:20 +02:00
Jeremy Benoist
b8427f22f0
Add menu access to site credentials CRUD 2017-06-20 16:03:14 +02:00
Jeremy Benoist
5a9bc00726
Retrieve username/password from database
Inject the current user & the repo to retrieve username/password from the database
2017-06-20 16:03:13 +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
Jérémy Benoist
604cca1f42 Merge pull request #3215 from wallabag/fix-3192
Empty preview pictures and language return null
2017-06-20 06:43:59 +02:00
matteocoder
fbb39b61bd Merge pull request #1 from matteocoder/matteocoder-messages.it
revised messages.it
2017-06-17 13:42:50 +02:00
matteocoder
508f248676 revised messages.it 2017-06-17 13:42:28 +02:00
Thomas Citharel
7e271553fe Merge pull request #3229 from wallabag/fix-mobile-view
Fix mobile view and update asset deps
2017-06-15 09:56:39 +02:00
Thomas Citharel
f99ebec0f2 Fix mobile view and update asset deps
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-15 07:58:12 +02:00
Thomas Citharel
caa0b1765b Add client_credentials oAuth2 auth method
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-06-14 17:30:12 +02:00