Commit graph

121 commits

Author SHA1 Message Date
Alexandr Danilov 0e7cf1fc50 Merge remote-tracking branch 'origin/v2' into v2_material 2015-08-17 00:33:03 +03:00
Nicolas Lœuillet 9cc6bd87fe add link to original article in material theme 2015-08-16 21:05:37 +02:00
Nicolas Lœuillet 4ca0c9139c fix diaspora url 2015-08-13 09:18:41 +02:00
Nicolas Lœuillet a64f1d9f2d change title for material pages / about page 2015-08-13 09:16:22 +02:00
Alexandr Danilov bac5a34552 Fix form rendere 2015-08-12 23:52:40 +03:00
Alexandr Danilov a737d2a0ee Merge remote-tracking branch 'origin/v2' into v2_material 2015-08-12 23:02:19 +03:00
Jeremy Benoist 545b852f46 Merge pull request #1331 from wallabag/v2-disable-download
disable download links on entry view
2015-08-12 21:58:46 +02:00
Alexandr Danilov 392f4a2681 #1320 Design for filters 2015-08-12 22:55:44 +03:00
Nicolas Lœuillet 120544cccd disable download links on entry view 2015-08-12 21:52:39 +02:00
Nicolas Lœuillet c2257428b2 store domainName in database 2015-08-12 21:16:00 +02:00
Alexandr Danilov 8ba913d87a improved view 2015-08-12 20:27:30 +03:00
Alexandr Danilov 06fdfd025e fix #1321 2015-08-12 19:18:31 +03:00
Jeremy Benoist d990dc6f05 Merge pull request #1328 from wallabag/v2-fix-1324
fix #1324: do not display pagination when only 1 page
2015-08-12 14:12:08 +02:00
Nicolas Lœuillet bdf39ff10d remove pagination if page == 1 with baggy theme 2015-08-12 14:06:56 +02:00
Nicolas Lœuillet 2ac2e0bc2b fix #1324: do not display pagination when only 1 page 2015-08-12 14:05:53 +02:00
Nicolas Lœuillet 43e6f47d5b fix #1299: change send buttons on config page 2015-08-12 13:35:48 +02:00
Jeremy Benoist 9f1d650ae8 Merge pull request #1325 from wallabag/v2-fix-1314
fix #1314: change max-width in material theme
2015-08-12 13:31:34 +02:00
Nicolas Lœuillet b69fc0628a fix #1314: change max-width in material theme 2015-08-12 13:26:49 +02:00
Jeremy Benoist a8596c35c8 Merge pull request #1323 from wallabag/v2-1302-checkbox
fix #1302: add 'stay connected' checkbox
2015-08-12 13:23:52 +02:00
Nicolas Lœuillet 6622cf9968 add translation 2015-08-12 13:21:07 +02:00
Nicolas Lœuillet 579764b264 fix indentation 2015-08-12 13:03:26 +02:00
Nicolas Lœuillet 5a58461491 add 'stay connected' checkbox 2015-08-12 12:27:12 +02:00
Nicolas Lœuillet 773ed2e7a6 fix #1303, add link to homepage on forgot password page 2015-08-12 12:16:50 +02:00
Jeremy Benoist 496f21e6fa Merge pull request #1319 from wallabag/v2-form-header
add new post form in material header
2015-08-12 10:14:44 +02:00
Nicolas Lœuillet 053b9568b2 add new post form in material header 2015-08-12 09:52:36 +02:00
Nicolas Lœuillet 2686457448 store estimated reading time / filters on reading time 2015-08-12 09:01:29 +02:00
Nicolas Lœuillet ea8da8c6d5 fix link in howto page 2015-08-11 21:12:08 +02:00
Nicolas Lœuillet d85454fbf8 add focus to search form 2015-08-11 18:07:02 +02:00
Alexandr Danilov 0e654f6273 Merge remote-tracking branch 'origin/v2' into v2_fix_material
# Conflicts:
#	src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
2015-08-10 15:25:23 +03:00
Jeremy Benoist f48a018929 Merge pull request #1295 from wallabag/v2-howto
add howto page
2015-08-10 14:15:11 +02:00
Alexandr Danilov 4919584b87 Merge remote-tracking branch 'origin/v2' into v2_fix_material
# Conflicts:
#	src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
2015-08-10 12:27:12 +03:00
Jeremy Benoist 47cadf36c8 Merge pull request #1292 from wallabag/v2-tags-route
Add tags list display
2015-08-09 22:47:28 +02:00
Nicolas Lœuillet 009696d0a8 rename favorite in starred 2015-08-09 20:31:53 +02:00
Alexandr Danilov 946d6a5124 Preparation for adding links 2015-08-08 01:30:52 +03:00
Alexandr Danilov a6523cfe86 fix #1281 2015-08-08 00:16:14 +03:00
Alexandr Danilov c54ea989a3 fix #1281 (notifications when we star articles are buggy)
All notification corrected
2015-08-08 00:08:29 +03:00
Alexandr Danilov 342f0cc55a fix #1281 (When I save 10 articles, I've got 4 lines: 3 articles on 1st line, 3 on 2nd one, only 1 on 3rd line and 3 on last lines (chrome and firefox)) 2015-08-08 00:00:11 +03:00
Alexandr Danilov 0e7650683d Title in navigation bar 2015-08-07 23:59:11 +03:00
Alexandr Danilov 768303a573 fix #1282 2015-08-07 23:29:21 +03:00
Nicolas Lœuillet b7dd5f824c add howto page 2015-08-07 21:22:43 +02:00
Nicolas Lœuillet 44a16e82d8 fix #1282: add title on wallabag logo 2015-08-07 20:47:19 +02:00
Nicolas Lœuillet 47e12c3677 fix display 2015-08-07 20:07:39 +02:00
Nicolas Lœuillet 3f3fbef11f Add tags list display 2015-08-07 18:17:23 +02:00
Danilow Alexandr 6ecdd48a3f Merge pull request #1286 from wallabag/v2-issue-1283
fix #1283: display the good title for each category
2015-08-06 04:38:04 +03:00
Alexandr Danilov b17874a7d5 Many corrections material theme 2015-08-06 04:22:45 +03:00
Nicolas Lœuillet 308db01684 change order of condition 2015-08-05 21:16:48 +02:00
Nicolas Lœuillet b1a65df9df fix #1283: display the good title for each category 2015-08-05 21:10:20 +02:00
Alexandr Danilov 9948d899d3 Fixes and improve css @media 2015-08-04 19:39:26 +03:00
Alexandr Danilov 53e121881b Added Material theme 2015-08-04 17:18:15 +03:00
Francois Gravelaine 9fb6ac830f Adds pagerfanta paginator everywhere, modifies article routing. Change API for is_starred and is_archived 2015-07-28 23:23:49 +02:00
Jeremy Benoist 82d6d9cb06 Add basic title edition
Fix #218
I mean basic, because there is no javascript at all. It could be a nice edit-in-place. But for the moment, it is simple.
2015-06-02 18:56:07 +02:00
Jeremy c844dc0c50 Remove ability to change username
Since password are linked to username it was hard to change username while checking that the password is the good one.

Instead of doing crazy things to achieve that, I act that user won't be able to update username.

Also, username (and email) must be unique, since people logged in using username and can request a new password using email.

This should fix #1149
2015-04-01 21:23:27 +02:00
Jeremy 7d74a2f32b Force raw on content
We don't want Symfony to escape html content
2015-04-01 16:11:19 +02:00
Jeremy 371ac69a6b Add tests
and fix few mistakes
2015-03-31 22:48:00 +02:00
Jeremy 0c83fd5994 Add rss for entries
will fix #1000
2015-03-31 22:47:43 +02:00
Jeremy 6894d48e03 Handle forgot password 2015-03-08 07:35:24 +01:00
Jeremy 495aecfe74 Cleanup & simplify theme 2015-03-01 10:49:17 +01:00
Jeremy 71798e4ec4 Remove old themes 2015-03-01 10:49:16 +01:00
Jeremy 32da2a70ef Add LiipThemeBundle
Re-defined the config / user relation to be OneToOne bidirectionnal.
ConfigType is now a service so I can inject the list of available themes that are also used by LiipThemeBundle

Force sqlite for test
In case of people use a different driver in parameter.yml (yes I do :))
2015-03-01 10:49:16 +01:00
Jeremy e4977b8a86 Adding new user 2015-02-22 09:30:25 +01:00
Jeremy c0d9eba07f Updating logged in user (email, name, etc ..) 2015-02-17 22:45:20 +01:00
Jeremy d9085c63e3 Handle password change 2015-02-17 21:03:23 +01:00
Jeremy 4d85d7e9ba Implement simple config 2015-02-16 21:31:58 +01:00
Jeremy 7a577c519f Fix indentation in templates 2015-02-16 21:31:58 +01:00
Jeremy 8125b415d8 Avoid raw javascript in template
It kills the Symfony Crawler :)
2015-02-07 18:28:31 +01:00
Nicolas Lœuillet 905ae369bd normalize entries fields 2015-02-05 22:33:36 +01:00
Jeremy 7df80cb32c CS 2015-01-31 19:12:49 +01:00
Nicolas Lœuillet c3235553dd first implementation of security 2015-01-31 15:14:10 +01:00
Nicolas Lœuillet f8bf895254 routing for API, trying to respect #414 2015-01-29 16:56:58 +01:00
Nicolas Lœuillet 19f2f11ee8 fix themes symlinks 2015-01-28 13:58:12 +01:00
Nicolas Lœuillet ad4d1caa9e move WallabagBundle into Wallabag:CoreBundle 2015-01-23 16:28:37 +01:00