mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-27 18:10:28 +00:00
Code Issues Projects Releases Wiki Activity
7112 commits 14 branches 100 tags 174 MiB
Commit graph

2437 commits

Author SHA1 Message Date
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
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
c641baad0e More tests on the install command 2015-02-22 23:29:48 +01:00
Jeremy
732c2ad897 sqlite doesn't support getListDatabasesSQL 2015-02-22 17:18:54 +01:00
Jeremy
0bf99bb144 Improve install command & add test 
Also add fixtures for Config

InstallCommand now check if database, schema are here and ask the user what to do (keep or trash & re-create)
 2015-02-22 14:35:36 +01:00
Jeremy
0bd2cb1ecd Handle default value for new user 2015-02-22 10:50:27 +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
7781faa0b0 Use a form type for entry 2015-02-16 21:31:58 +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
55f58c9c5e Update UserConfig schema 2015-02-16 21:31:58 +01:00
Jeremy
2f6a596760 Merge pull request #1070 from wallabag/v2-api-tests 
1st draft for testing API
 2015-02-12 08:50:06 +01:00
Nicolas Lœuillet
8c7e0f95b9 remove debug lines 2015-02-12 08:46:40 +01:00
Nicolas Lœuillet
d9b7175593 test if GET /api/entries returns 1 or more results 2015-02-11 18:22:59 +01:00
Nicolas Lœuillet
59f18f9a85 create single test for bad headers 2015-02-11 16:08:13 +01:00
Nicolas Lœuillet
9ca5fd43f9 test with bad headers 2015-02-11 15:35:40 +01:00
Nicolas Lœuillet
f170f31594 add test for empty salt 2015-02-11 15:15:06 +01:00
Nicolas Lœuillet
874e3e10a4 phpdoc 2015-02-11 11:52:10 +01:00
Nicolas Lœuillet
70b54da2b1 test line, forgot to remove it 2015-02-11 07:52:58 +01:00
Nicolas Lœuillet
c9fa9677c1 DELETE entry and use of query for fetch entries 2015-02-11 07:43:43 +01:00
Nicolas Lœuillet
19aee7cd54 refactor and test one entry 2015-02-11 06:41:44 +01:00
Nicolas Lœuillet
2725de8efb cs 2015-02-11 06:31:16 +01:00
Nicolas Lœuillet
91f78f26f2 first test for API, need refactor 2015-02-11 06:28:23 +01:00
Nicolas Lœuillet
2734044aca add test for api/salts 2015-02-11 06:28:23 +01:00
Nicolas Lœuillet
0536b809b0 Test for GET on empty database 2015-02-11 06:27:50 +01:00
Nicolas Lœuillet
e1dd7f70c5 first test for API, need refactor 2015-02-11 06:27:05 +01:00
Nicolas Lœuillet
f5deb024a2 add test for api/salts 2015-02-11 06:27:04 +01:00
Nicolas Lœuillet
68c6f1bd7f Test for GET on empty database 2015-02-11 06:27:04 +01:00
Jeremy
3d2b2d62be Avoid user to see other entries 
hehe :)
 2015-02-10 22:56:44 +01:00
Jeremy
eb3bd7efb7 Add more tests on Entry controller 
Also add more fixtures
 2015-02-10 22:32:42 +01:00
Jeremy
f59f45d740 Merge pull request #1069 from wallabag/v2-fix-return-entries 
GET /api/entries returns object, no more array
 2015-02-10 14:51:32 +01:00
Nicolas Lœuillet
017e20895f findEntries returns array 2015-02-10 13:53:00 +01:00
Jeremy
2c0ffcf397 Merge pull request #1068 from wallabag/v2-api-authentication 
V2 api authentication
 2015-02-10 13:49:57 +01:00
Nicolas Lœuillet
3d3368cfd5 change test if we have no entry in GET /api/entries 2015-02-10 13:47:57 +01:00
Nicolas Lœuillet
92504e0dd4 move dir check into constructor 2015-02-10 13:35:34 +01:00
Nicolas Lœuillet
11204db45a change phpdoc 2015-02-10 12:14:09 +01:00
Nicolas Lœuillet
d4c029f46e review from @j0k3r 2015-02-10 12:12:44 +01:00
Nicolas Lœuillet
c5e8ba25bb getSalt method 2015-02-10 08:35:43 +01:00
Nicolas Lœuillet
eaf95758dc GET /api/entries returns object, no more array 2015-02-10 06:44:38 +01:00
Nicolas Lœuillet
7ffb1e80bf replace services.xml into services.yml 2015-02-09 22:54:29 +01:00
Nicolas Lœuillet
5078e8360a PSR 3 2015-02-09 22:43:06 +01:00
Nicolas Lœuillet
d29bfaf139 fix return on API call and fix id in clear for user 2015-02-09 22:40:20 +01:00
Nicolas Lœuillet
2a94b1d1b7 log for authentication on API 2015-02-09 22:07:39 +01:00
Jeremy
cbce162b40 Merge pull request #1063 from wallabag/v2-rename-tags-entity 
Rename Tags entity
 2015-02-09 15:52:10 +01:00
Nicolas Lœuillet
fb8389f463 change settings for TagsEntries model 2015-02-09 15:41:07 +01:00
Nicolas Lœuillet
970c40bb93 restore TagsEntries 2015-02-09 15:07:48 +01:00
Nicolas Lœuillet
0ac38198ab authentication on API 2015-02-09 13:59:48 +01:00
Nicolas Lœuillet
653e8be4c1 rename Tags entity 
why did I delete this file?

rename Tags entity

rename Tags entity
 2015-02-09 12:58:44 +01:00
Jeremy
3b815d2de5 Add some fixtures 
Improve test, so user can login
Fix some leftJoin
Cleanup EntryController
 2015-02-08 23:13:40 +01:00
Jeremy
d91691573f Add custom auth encoder & provider 
These custom classes allow Wallabag v2 to be compatible with Wallabag v1 salted password
 2015-02-08 23:13:40 +01:00
Nicolas Lœuillet
7812f508bc create an Entry with a User in parameter 2015-02-08 23:13:40 +01:00
Nicolas Lœuillet
5f09650eef add a real relation between user and entry 2015-02-08 23:13:40 +01:00
Jeremy
9c0c882006 Add some tests on EntryController 
Also, create database schema on test initialisation
 2015-02-07 18:30:46 +01:00
Jeremy
94f2364cd8 Fix #1057 
Unexisting function
 2015-02-07 18:29:05 +01:00
Jeremy
8125b415d8 Avoid raw javascript in template 
It kills the Symfony Crawler :)
 2015-02-07 18:28:31 +01:00
Jeremy
02b225a82e Remove temporary entities 2015-02-06 14:26:37 +01:00
Nicolas Lœuillet
2f69eb4afa rename User entity 2015-02-06 14:18:01 +01:00
Nicolas Lœuillet
be463487cc rename Entries to Entry 2015-02-06 07:45:32 +01:00
Nicolas Lœuillet
905ae369bd normalize entries fields 2015-02-05 22:33:36 +01:00
Jeremy
c8dee95396 Merge pull request #1055 from wallabag/v2-api-patch-methid 
PATCH method, boolean for some parameters and change entity methods name
 2015-02-05 21:51:05 +01:00
Nicolas Lœuillet
c0284f6182 remove persist() for PATCH and DELETE 2015-02-05 21:36:39 +01:00
Jeremy
5644c2d88e Merge pull request #1054 from wallabag/v2-api-set-title-post 
we can now set a title to the article when we use POST /api/entries
 2015-02-05 19:07:30 +01:00
Nicolas Lœuillet
2c093b03de PATCH method, boolean for some parameters and change entity methods name 2015-02-05 18:21:31 +01:00
Nicolas Lœuillet
9e0fff7cb0 simplify code 2015-02-05 18:19:34 +01:00
Nicolas Lœuillet
77bb7b92a2 we can now set a title to the article when we use POST /api/entries 2015-02-05 18:05:27 +01:00
Nicolas Lœuillet
bc782eaa72 sort entries in repository 2015-02-05 07:54:04 +01:00
Nicolas Lœuillet
34d15eb4d0 change database structure for Entries 2015-02-04 22:25:44 +01:00
Nicolas Lœuillet
eacaf7f864 change type for isRead, isFav and isDeleted fields, as said @j0k3r 2015-02-04 18:21:45 +01:00
Nicolas Lœuillet
6079aaa33d change delete status for GET /api/entries method 2015-02-04 18:12:13 +01:00
Nicolas Lœuillet
6e334aba68 for GET /api/entries, star, delete and archive status are no more necessary 2015-02-04 18:06:42 +01:00
Nicolas Lœuillet
42a9064620 implement delete method 2015-02-04 17:54:23 +01:00
Nicolas Lœuillet
889249804f disable authentication for the moment 2015-02-02 12:54:14 +01:00
Jeremy
2e45e7bebc New wallabag installer 
Instead of the legacy bin/install here is a symfony command that can initialize wallabag.

There are still work to do on the requirements part (to be sure that wallabag can run like a charm).

I've also added (but commented) the fixtures load part (which will need an extra doctrine package). We'll see that point later.
 2015-02-01 20:16:27 +01:00
Jeremy
7df80cb32c CS 2015-01-31 19:12:49 +01:00
Nicolas Lœuillet
1990517b22 remove Acme and AppBundle 2015-01-31 15:36:04 +01:00
Nicolas Lœuillet
c3235553dd first implementation of security 2015-01-31 15:14:10 +01:00
Jeremy
aa6e27cf4f Tests are working again 2015-01-31 09:35:50 +01:00
Nicolas Lœuillet
843dbe5195 create entry via API 2015-01-30 09:05:54 +01:00
Nicolas Lœuillet
a8c90c5c1b add documentation for API 2015-01-30 07:50:52 +01:00
Nicolas Lœuillet
27f15aa4ca improve API 2015-01-29 20:32:11 +01:00
Nicolas Lœuillet
f8bf895254 routing for API, trying to respect #414 2015-01-29 16:56:58 +01:00
Nicolas Lœuillet
38ba7ed972 skeleton for DELETE and PATCH methods 2015-01-28 18:18:57 +01:00
Nicolas Lœuillet
3e5a342f65 bundle for API 2015-01-28 18:14:04 +01:00
Nicolas Lœuillet
e4788de51e 1st implementation of wallabag api, yeah 2015-01-28 17:09:27 +01:00
Nicolas Lœuillet
19f2f11ee8 fix themes symlinks 2015-01-28 13:58:12 +01:00
Nicolas Lœuillet
0c678cf24a rename test file 2015-01-27 13:17:37 +01:00
Nicolas Lœuillet
b9ec99e25b replace legacy calls with new one 2015-01-27 13:08:02 +01:00
Nicolas Lœuillet
d692b3b08d remove legacy code 2015-01-27 13:07:27 +01:00
Nicolas Lœuillet
6b767d1cc0 refactoring for fetching content 2015-01-26 22:15:19 +01:00
Nicolas Lœuillet
ad4d1caa9e move WallabagBundle into Wallabag:CoreBundle 2015-01-23 16:28:37 +01:00
Nicolas Lœuillet
b84a80559a some parameters, new entry form, etc. 2015-01-23 14:58:17 +01:00
Nicolas Lœuillet
163eae0bb1 toggle archive / fav actions 2015-01-23 12:45:24 +01:00
Nicolas Lœuillet
bd9f08157c article view, fav list, archive list 2015-01-22 21:11:22 +01:00
Nicolas Lœuillet
9d50517cea migrating legacy to symfony 2015-01-22 17:18:56 +01:00
Nicolas Lœuillet
93fd4692f6 symfony is there 2015-01-22 08:30:07 +01:00
Nicolas Lœuillet
0440249631 move templates into resources 2015-01-21 16:04:05 +01:00
Nicolas Lœuillet
79e051a1f2 restructure folders 2015-01-20 14:11:26 +01:00
Nicolas Lœuillet
6ad93dff69 new folders 2015-01-20 07:40:39 +01:00