mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-24 08:30:30 +00:00
Code Issues Projects Releases Wiki Activity
1559 commits 13 branches 100 tags 174 MiB
Commit graph

246 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Nicolas Lœuillet
4ab58dcf6c set material to default theme \o/ 2015-08-04 22:51:21 +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
Nicolas Lœuillet
ac9d58211e Merge branch 'v2' into v2-edit-title 2015-06-08 16:35:02 +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
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
2f3c816579 Update naming strategy since Doctrine 2.5 
See 20fb8270dc
 2015-05-30 13:40:39 +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
Jeremy
132f614dee Avoid / in feed token 
Of course, it breaks the url and the route matcher for each feed route
 2015-04-01 21:59:13 +02:00
Jeremy
9744e97131 Fix tests 2015-04-01 21:59:13 +02:00
Jeremy
769e19dc4a Move API stuff in ApiBundle 2015-04-01 21:59:12 +02:00
Nicolas Lœuillet
e3c34bfc06 Merge pull request #1164 from wallabag/v2-remove-username-in-config 
Remove ability to change username
 2015-04-01 21:58:08 +02:00
Jeremy
164bd80118 Ability to prefix tables 
Will fix #799
 2015-04-01 21:32:02 +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
34c06cabef Use lemonde instead of mailjet 
Mailjet seems to be laggy, hope that LeMonde will be more reliable in the future.

@see https://travis-ci.org/wallabag/wallabag/jobs/56246231
 2015-03-31 22:48:01 +02:00
Jeremy
0ee043f745 Update InstallCommand test 
They are god damn too long to execute because it launch external command (mostly related to doctrine).

So I've added a PHPUnit @group (`command-doctrine`) so that we can avoid launching them on a regular basis, like that:

`phpunit --exclude-group command-doctrine`
 2015-03-31 22:48:01 +02:00
Jeremy
371ac69a6b Add tests 
and fix few mistakes
 2015-03-31 22:48:00 +02:00
Jeremy
2385f891e5 Sort by id is faster 
Since it's the primary key
 2015-03-31 22:47:43 +02:00
Jeremy
0c83fd5994 Add rss for entries 
will fix #1000
 2015-03-31 22:47:43 +02:00
Jeremy
d0c2243b10 Add some tests 2015-03-08 22:47:32 +01:00
Jeremy
6894d48e03 Handle forgot password 2015-03-08 07:35:24 +01:00
William Durand
6e22bd737b Use pager in getEntries() and return Hateoas collection 2015-03-06 21:11:02 +01:00
William Durand
bcf53ab75b Return pager into EntryRepository (for entries only) 2015-03-06 21:11:01 +01:00
Nicolas Lœuillet
48b67328e2 add getUser on Tag entity 2015-03-06 21:09:15 +01:00
Nicolas Lœuillet
efad7e53a1 add more log on AccessDeniedException 2015-03-06 21:09:15 +01:00
Nicolas Lœuillet
2ab8cb6816 fix tests 2015-03-06 21:09:15 +01:00
Nicolas Lœuillet
db2b4bf678 remove JsonResponse 2015-03-06 21:09:15 +01:00
Nicolas Lœuillet
b0cce9e636 fix tests for GET /entries/tags 2015-03-06 21:09:15 +01:00
Nicolas Lœuillet
1df1204d94 remove useless code 2015-03-06 21:09:15 +01:00
Nicolas Lœuillet
6ee416a069 commit bug with getSalt 2015-03-06 21:09:15 +01:00
Nicolas Lœuillet
0ca374e6a1 replace Response with JsonResponse 2015-03-06 21:09:15 +01:00
Nicolas Lœuillet
d8f9f37ab2 remove debug lines 2015-03-06 21:09:15 +01:00
Nicolas Lœuillet
092ca70725 add relation between user and tags, tests are broken 2015-03-06 21:09:15 +01:00
Nicolas Lœuillet
a36737f485 POST entries/tags with test 2015-03-06 20:50:31 +01:00
Nicolas Lœuillet
46bbd8d321 relation between tags and entries 2015-03-06 20:50:31 +01:00
Nicolas Lœuillet
6c87418ff0 fixtures for tag 2015-03-06 20:50:30 +01:00
Nicolas Lœuillet
1bd12b6229 fix GET /api/entries/{entry}/tags 2015-03-06 20:50:30 +01:00
Nicolas Lœuillet
0a018fe039 add relation between entry and tag 2015-03-06 20:50:30 +01:00
Nicolas Lœuillet
6d37a7e6c1 remove dumb code 2015-03-06 20:50:30 +01:00
Nicolas Lœuillet
b3dc0749d3 remove GET /tags/id 2015-03-06 20:50:30 +01:00
Nicolas Lœuillet
2691cf0438 GET /api/tags/id_tag method 2015-03-06 20:50:30 +01:00
Nicolas Lœuillet
1d14779154 remove isDeleted flag 2015-03-06 20:50:30 +01:00
Nicolas Lœuillet
aa4d6562c1 improve hateoas implementation 2015-03-06 20:50:30 +01:00
Nicolas Lœuillet
0ed6302212 returns serialzed object for GET /entries 2015-03-06 20:50:30 +01:00
Nicolas Lœuillet
0f00688096 first draft of hypermedia implementation 2015-03-06 20:50:29 +01:00
Jeremy
3e30422cda Only one pattern for LiipTheme 
Others patterns aren't required (but I think it's still important to have them around)
 2015-03-01 20:25:43 +01:00