mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-06-29 18:40:33 +00:00
Code Issues Projects Releases Wiki Activity
1481 commits 13 branches 99 tags 148 MiB
Commit graph

1481 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandr Danilov 392f4a2681 #1320 Design for filters 2015-08-12 22:55:44 +03: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
Jeremy Benoist 1a0ea1f35a Merge pull request #1326 from wallabag/v2-fix-1299 
fix #1299: change send buttons on config page
 2015-08-12 13:42:32 +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
Jeremy Benoist a15692b1b7 Merge pull request #1312 from wallabag/v2-fix-1311 
fix #1311, redirect after login
 2015-08-12 13:21:16 +02:00
Nicolas Lœuillet 6622cf9968 add translation 2015-08-12 13:21:07 +02:00
Nicolas Lœuillet 7fc14130c7 add test 2015-08-12 13:18:39 +02:00
Nicolas Lœuillet 579764b264 fix indentation 2015-08-12 13:03:26 +02:00
Jeremy Benoist 3e1f25e22f Merge pull request #1322 from wallabag/v2-fix-1303 
fix #1303, add link to homepage on forgot password page
 2015-08-12 12:43:02 +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
Jeremy Benoist 930334cd6d Merge pull request #1297 from wallabag/v2-estimated-time 
store estimated reading time in database (#393)
 2015-08-12 09:05:21 +02:00
Nicolas Lœuillet 2686457448 store estimated reading time / filters on reading time 2015-08-12 09:01:29 +02:00
Jeremy Benoist fedaf00537 Merge pull request #1317 from wallabag/v2-fix-typo 
fix link in howto page
 2015-08-11 21:26:31 +02:00
Nicolas Lœuillet ea8da8c6d5 fix link in howto page 2015-08-11 21:12:08 +02:00
Thomas Citharel 95135988f9 Merge pull request #1316 from wallabag/v2-focus-searchform 
fix #1310 add focus to search form
 2015-08-11 20:00:30 +02:00
Nicolas Lœuillet d85454fbf8 add focus to search form 2015-08-11 18:07:02 +02:00
Nicolas Lœuillet 728a432850 fix #1311, redirect after login 2015-08-10 22:37:56 +02:00
Nicolas Lœuillet f59601fced Merge pull request #1298 from modos189/v2_fix_material 
fix material
 2015-08-10 19:35:23 +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
Nicolas Lœuillet b958d9e59b remove useless line 2015-08-10 14:13:23 +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
Nicolas Lœuillet 1473e8c9fb add tests for static pages 2015-08-10 08:19:40 +02: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
Thomas Citharel 20a69dffe7 Merge pull request #1304 from wallabag/v2-rename-starred-menu 
rename favorite in starred
 2015-08-09 20:47:13 +02:00
Nicolas Lœuillet 009696d0a8 rename favorite in starred 2015-08-09 20:31:53 +02:00
Thomas Citharel e9d5c2bf02 Merge pull request #1296 from wallabag/v2-fix-564 
fix #564: replace Untitled by the domain name
 2015-08-08 20:58:03 +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 0bc2baa65c fix #564: replace Untitled by the domain name 2015-08-07 21:57:53 +02:00
Nicolas Lœuillet b7dd5f824c add howto page 2015-08-07 21:22:43 +02:00
Jeremy Benoist 54139268f8 Merge pull request #1294 from wallabag/v2-fix-1282 
fix #1282: add title on wallabag logo
 2015-08-07 20:56:45 +02:00
Nicolas Lœuillet 44a16e82d8 fix #1282: add title on wallabag logo 2015-08-07 20:47:19 +02:00
Nicolas Lœuillet d0b90fbe18 unit test 2015-08-07 20:29:03 +02:00
Jeremy Benoist 55333dfd21 Merge pull request #1293 from wallabag/v2-items-per-page 
get itemsPerPage for unread/fav/archive views
 2015-08-07 20:10:07 +02:00
Nicolas Lœuillet 47e12c3677 fix display 2015-08-07 20:07:39 +02:00