mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-06-27 01:20:34 +00:00
Code Issues Projects Releases Wiki Activity
1503 commits 13 branches 99 tags 147 MiB
Commit graph

1503 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nicolas Lœuillet 3f3fbef11f Add tags list display 2015-08-07 18:17:23 +02:00
Nicolas Lœuillet 48ffc5a4b6 get itemsPerPage for unread/fav/archive views 2015-08-07 18:04:46 +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
Jeremy Benoist 8d9b8912af Merge pull request #1279 from wallabag/material-default 
set material to default theme \o/
 2015-08-04 23:13:15 +02:00
Nicolas Lœuillet 4ab58dcf6c set material to default theme \o/ 2015-08-04 22:51:21 +02:00
Nicolas Lœuillet 9e07dc982c Merge pull request #1276 from modos189/v2 
Added Material theme
 2015-08-04 22:42:33 +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
Jeremy Benoist 7e63b892f9 Merge pull request #1250 from frankoa/v2_pagination_and_api 
Adds pagerfanta paginator everywhere, modifies article routing.
 2015-07-29 09:02:30 +02: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
Nicolas Lœuillet 9b9b05008a Merge branch 'v2-edit-title' into v2 2015-06-08 16:35:41 +02:00
Nicolas Lœuillet ac9d58211e Merge branch 'v2' into v2-edit-title 2015-06-08 16:35:02 +02:00
Nicolas Lœuillet 3cf22a0541 Merge pull request #1206 from wallabag/sf-2.7 
Upgrade to Symfony 2.7
 2015-06-03 21:24:11 +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 Benoist 75e9d1df03 Update to Symfony 2.7 
And fix some deps instead of using dev tags
 2015-06-02 16:58:19 +02:00
Jeremy Benoist 170746f99d Remove phinx 
Doctrine handle quite correctly database migration. Thanks to `doctrine:schema:update`
 2015-06-02 16:54:52 +02:00
Jeremy Benoist 51d9699fa1 Update deps 2015-06-01 17:39:05 +02:00
Nicolas Lœuillet 2878416f8b Merge pull request #1167 from wallabag/v2-api-bundle 
Move API stuff in ApiBundle
 2015-06-01 15:49:49 +02:00
Jeremy Benoist 4346a86068 CS 2015-05-30 13:59:33 +02:00
Jeremy Benoist 399bd777d7 Update deps 2015-05-30 13:42:38 +02:00
Jeremy Benoist 2f3c816579 Update naming strategy since Doctrine 2.5 
See 20fb8270dc
 2015-05-30 13:40:39 +02:00
Jeremy Benoist 9a014e48d6 Disable coverage 
It takes ages to process and most of the time the build fail for "execution time" too long.
Too much time already burned to investigate it.
We'll investigate later, it's not a priority atm.
 2015-05-30 13:31:54 +02:00
Jeremy Benoist 98510a4189 Merge pull request #1180 from wallabag/v2patch 
Add some required
 2015-04-15 17:29:28 +02:00
Thomas Citharel c7d3bf1671 name not required 2015-04-15 17:19:37 +02:00
Thomas Citharel 4d6e818e40 changed email fields with the email type and added required parameter on some stuff 2015-04-15 16:50:20 +02:00