mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-05 16:39:49 +00:00
Code Issues Projects Releases Wiki Activity
4432 commits 11 branches 100 tags 165 MiB
Commit graph

1474 commits

Author SHA1 Message Date
Nicolas Lœuillet
c89d35e851 Language selection on config screen 2015-10-15 21:42:29 +02:00
Jeremy Benoist
3d3ed955f1 Merge pull request #1484 from wallabag/v2-2factor-auth 
2factor authentication via email
 2015-10-15 13:52:52 +02:00
Nicolas Lœuillet
18cf594f8a move 2factor activation in parameters 2015-10-15 13:17:21 +02:00
Nicolas Lœuillet
0d6a7929e1 add tests for 2factor authentication 2015-10-14 17:10:12 +02:00
Nicolas Lœuillet
2db616b586 2factor authentication via email 2015-10-13 22:43:15 +02:00
Alexandr Danilov
c26a3edc0a Other improvements 2015-10-09 13:00:15 +03:00
Alexandr Danilov
ba873ae667 Icons in footer 2015-10-09 12:43:42 +03:00
Jeremy Benoist
cf0ea8f113 Merge pull request #1472 from wallabag/v2-clean-views 
fix #1470: clean material theme
 2015-10-08 13:44:04 +02:00
Nicolas Lœuillet
fa853bb603 fix #1470: clean material theme 2015-10-08 13:32:34 +02:00
Nicolas Lœuillet
880a0e1c0b implement bookmarklet 2015-10-08 13:29:41 +02:00
Nicolas Lœuillet
ce782c84b8 fix bug on detect active theme 2015-10-06 20:51:40 +02:00
Nicolas Lœuillet
1ce8f30342 fix type hint for User 2015-10-06 12:16:08 +02:00
Jeremy Benoist
16dabc3263 Merge pull request #1436 from wallabag/v2-register 
Public registration & oAuth2 \o/
 2015-10-06 09:19:06 +02:00
Jeremy Benoist
fdef5f4605 Merge pull request #1461 from wallabag/v2-test-for-www 
fix #1433: add test for removeWww Twig Extension
 2015-10-06 09:16:52 +02:00
Nicolas Lœuillet
784bb4c38d add test for removeWww Twig Extension 2015-10-06 09:09:26 +02:00
Nicolas Lœuillet
68e9dcf615 restore blue color 2015-10-06 06:16:17 +02:00
Nicolas Lœuillet
e0d188809c move css 2015-10-05 22:49:46 +02:00
Nicolas Lœuillet
ec3ce598f6 material design for register/login/recover pages 2015-10-05 22:16:18 +02:00
Thomas Citharel
9c8f7af196 fix #1457 2015-10-05 21:37:17 +02:00
Jeremy Benoist
4c5e544183 Cleanup 
- remove unecessary routing for UserBundle
- remove unused form type
 2015-10-03 13:37:21 +02:00
Nicolas Lœuillet
0a878469d4 move some files to UserBundle 2015-10-03 13:31:48 +02:00
Nicolas Lœuillet
1210dae105 remove old implementation for login/register/recover 2015-10-03 13:31:48 +02:00
Jeremy Benoist
772d8c4b93 Add test on RegistrationConfirmedListener 
And PLEASE @nicosomb, NEVER EVER inject the whole container inside a service.
 2015-10-03 13:30:43 +02:00
Nicolas Lœuillet
2c13918acc add test for confirmed registration 2015-10-03 13:30:43 +02:00
Nicolas Lœuillet
359b3f43cc * rename AuthenticationListener 
* add tests
 2015-10-03 13:30:43 +02:00
Nicolas Lœuillet
fcb1fba5c2 * public registration 
* remove WSSE implementation
* add oAuth2 implementation
 2015-10-03 13:30:43 +02:00
Thomas Citharel
4b55e704ab typo 2015-10-01 18:48:38 +02:00
Nicolas Lœuillet
4e9f656ecb restore footer 2015-10-01 11:38:59 +02:00
Nicolas Lœuillet
cfb28c9da0 french translation 2015-10-01 09:26:52 +02:00
Nicolas Lœuillet
8e417206d5 flash messages translation 2015-09-30 18:17:40 +02:00
Nicolas Lœuillet
4aafa7f0df french translation 2015-09-30 18:09:18 +02:00
Nicolas Lœuillet
4f0dfac6a6 add french translation 2015-09-30 17:06:41 +02:00
Jeremy Benoist
7c99da0c95 Merge pull request #1437 from wallabag/v2-clean-material 
some cleanup on material theme
 2015-09-30 09:05:03 +02:00
Nicolas Lœuillet
72fcaf8a6c remove www. on entries view 2015-09-29 22:59:44 +02:00
Nicolas Lœuillet
b0b352fc8e some cleanup on material theme 2015-09-29 20:26:32 +02:00
Nicolas Lœuillet
917040d4a0 Merge pull request #1434 from wallabag/travis-db 
Add multiple database tests on Travis
 2015-09-28 22:57:11 +02:00
Jeremy Benoist
02d17813a1 Fix tests for all 2015-09-28 20:26:37 +02:00
Jeremy Benoist
159986c4fb Fix Postgres tests 2015-09-28 19:35:55 +02:00
Jeremy Benoist
da3d4998c0 Move readingTime & domainName in ContentProxy 
So, everything is centralized in one place when we save a new entry.
 2015-09-28 19:35:33 +02:00
Jeremy Benoist
0f30f48b93 Enabled created user from Config 
By default, creating user with FOSUser are disabled by default.

Fix #1423
 2015-09-26 19:45:14 +02:00
Jeremy Benoist
d4ebe5c5dc Entries filter on language 
+ updated deps
 2015-09-23 07:55:55 +02:00
Jeremy Benoist
0d3bafdfdf Remove tab from baggy css 
And add a border left on the filter slider
 2015-09-23 07:51:17 +02:00
Jeremy Benoist
98f0929f16 Handle entry in language 
Fix #1333
 2015-09-22 20:52:13 +02:00
Jeremy Benoist
db96045a0a Adjust preview picture 2015-09-20 22:36:51 +02:00
Nicolas Lœuillet
1db9d411c5 Merge pull request #1420 from modos189/v2_display_picture 
improved display pictures
 2015-09-14 17:15:40 +02:00
Alexandr Danilov
451bad02f0 improved display pictures 2015-09-14 02:12:39 +03:00
Thomas Citharel
1a5f7e2d88 A little more width for filter view 2015-09-13 19:53:09 +02:00
Jeremy Benoist
5e98404dfb Re-add preview picture on baggy 
Which should has been removed on merge
 2015-09-13 15:17:58 +02:00
Jeremy Benoist
5def3f5862 Filters view on side for baggy 2015-09-13 14:56:34 +02:00
Jeremy Benoist
71e51207ce Fix tests 2015-09-13 14:56:34 +02:00
Jeremy Benoist
1137fae94d Lower domain search length 
When searching for "bbc" I got no result .. sigh.
 2015-09-13 13:35:12 +02:00
Jeremy Benoist
d2fcbf5d84 Handle filter form using some JS 
Instead of displaying an ugly form
 2015-09-13 13:35:12 +02:00
Jeremy Benoist
19c283140e Cleanup base layout 2015-09-13 13:35:12 +02:00
Jeremy Benoist
89ee994f77 Remove some global assets 
Some global assets where dedicated to baggy
Remove some non-used css
 2015-09-13 13:35:12 +02:00
Jeremy Benoist
a78d6afeaa Move baggy theme in its folder 2015-09-13 13:35:12 +02:00
Jeremy Benoist
4d5fd9be81 Merge pull request #1417 from wallabag/v2-display-picture 
fix #972: add preview pictures
 2015-09-13 11:41:23 +02:00
Jeremy Benoist
40f59b219b Merge pull request #1418 from wallabag/v2-previewpicture-filter 
filter for entries with previewPicture
 2015-09-13 10:14:42 +02:00
Nicolas Lœuillet
497e0cad7c add test for previewPicture filter 2015-09-13 10:11:22 +02:00
Nicolas Lœuillet
b026d3b115 add previewPicture on baggy theme 2015-09-13 10:03:53 +02:00
Nicolas Lœuillet
616f9fea26 forgot case for previewPicture filter 2015-09-13 08:43:15 +02:00
Nicolas Lœuillet
a3bcd60a37 filter for entries with previewPicture 2015-09-12 17:08:12 +02:00
Nicolas Lœuillet
e610143f51 add preview pictures 2015-09-12 13:39:01 +02:00
Jeremy Benoist
af43bd3767 Fix tests 
Ensure that created use during install command will always be unique.
We assume that the install command must be run to initialize a wallabag instance. NEVER to add more user.

Also, use a better way to retrieve the real name of the database and not the one defined in parameters.yml (which isn't the same for test envi because the dbname isn't defined in parameters.yml but directly in config_test.yml)
 2015-09-12 11:36:16 +02:00
Nicolas Lœuillet
3f7a62908c fix tests for FosUser 2015-09-11 20:32:37 +02:00
Nicolas Lœuillet
a1691859ca implement FosUser 2015-09-11 20:32:37 +02:00
Nicolas Lœuillet
9c08a891f9 Merge pull request #1397 from wallabag/v2-graby 
Integrate graby
 2015-09-11 20:17:42 +02:00
Jeremy Benoist
f1e29e69cb CS 2015-09-10 22:00:53 +02:00
Jeremy Benoist
558d9aabab Move fetching content in a separate class 2015-09-10 21:57:25 +02:00
Thomas Citharel
e643992350 typo 2015-08-26 00:24:33 +02:00
Thomas Citharel
b125ed0394 Use full size of the panel for domain-filtering 
For longer domains
 2015-08-26 00:19:17 +02:00
Nicolas Lœuillet
50243f0e34 fix #1357, truncate domain name if it's too loooong 2015-08-24 22:09:57 +02:00
Jeremy Benoist
d13de40db6 Update url from graby 2015-08-24 19:52:31 +02:00
Jeremy Benoist
a1413a3da9 CS 2015-08-24 12:35:02 +02:00
Jeremy Benoist
fad316151c Integrate graby 2015-08-24 12:27:17 +02:00
Jeremy Benoist
8c55a9e6c9 Merge pull request #1395 from wallabag/v2-fix-1378 
fix #1378: nice display for tags list
 2015-08-24 12:16:08 +02:00
Jeremy Benoist
dc1c2debfb Apply margin only on settings page 2015-08-24 12:03:00 +02:00
Nicolas Lœuillet
a754db33c9 fix #1378: nice display for tags list 2015-08-24 11:59:53 +02:00
Nicolas Lœuillet
7083d183b9 Merge pull request #1392 from wallabag/v2-fix-redirect 
Fix redirect after deletion
 2015-08-24 10:44:14 +02:00
Nicolas Lœuillet
8bb1f3d69a Merge pull request #1393 from wallabag/fix-filter-same-day 
Fix date filter on same day
 2015-08-24 10:39:24 +02:00
Jeremy Benoist
f90af145ca Add test for same day filter 2015-08-23 22:06:27 +02:00
Nicolas Lœuillet
bccb5bba75 Merge pull request #1384 from wallabag/v2-fix-config-display 
fix #1371 config screen: display bug in RSS tab
 2015-08-23 13:17:21 +02:00
Jeremy Benoist
7d6c3edcdd Fix date filter on same day 
Fix #1379
 2015-08-22 15:36:07 +02:00
Jeremy Benoist
ec00964de2 Merge pull request #1372 from wallabag/v2-assign-tags 
assign tags to an entry
 2015-08-22 12:56:42 +02:00
Nicolas Lœuillet
7244d6cb61 assign tags to an entry 2015-08-22 12:40:48 +02:00
Jeremy Benoist
83aaf84195 Fix display issue in config rss tab 2015-08-22 12:30:06 +02:00
Jeremy Benoist
16a3d04cbd Fix redirect after deletion 
Fix #1391
 2015-08-22 12:09:27 +02:00
Jeremy Benoist
f506da40e2 Merge pull request #1385 from wallabag/v2-status-filter 
filters: implement status filter and a new view (to display all entries)
 2015-08-21 17:49:20 +02:00
Nicolas Lœuillet
c937de3443 remove dead code 2015-08-21 08:36:57 +02:00
Nicolas Lœuillet
2b7a488917 filters: adapt queryBuilder for 'all' view 2015-08-21 07:38:18 +02:00
Nicolas Lœuillet
e177976099 filters: add test for status filter and adapt other tests results 2015-08-21 07:30:48 +02:00
Nicolas Lœuillet
89659c9eae filters: implement status filter and a new view (to display all entries) 2015-08-21 07:30:48 +02:00
Jeremy Benoist
6682139ec5 CS 2015-08-20 20:39:52 +02:00
Jeremy Benoist
eccf5eb2e0 Add title in "picto-link" 
Picto aren't always obvious for every one. So it's better to have some title when we move the mouse over.
 2015-08-20 20:39:26 +02:00
Jeremy Benoist
1dbcd63b59 Update baggy about page 
According to what have been done on the material theme
 2015-08-20 20:39:26 +02:00
Jeremy Benoist
4793ee6509 Fixed my name & website 👌 2015-08-20 20:39:26 +02:00
Jeremy Benoist
6eebd8c909 Remove unsed things 2015-08-20 20:39:26 +02:00
Jeremy Benoist
0ab7404f93 Refactorize the way to retrieve entries 
One place to retrieve entries in Entry & Rss controller.
More simple and easy to maintain.
 2015-08-20 20:39:22 +02:00
Jeremy Benoist
8ce32af612 CS 
We shouldn't forget to run `php-cs-fixer` time to time
 2015-08-20 07:53:55 +02:00
Jeremy Benoist
34437f408c Merge pull request #1369 from wallabag/v2-bottombar 
fix #1332: bottom bar to display message
 2015-08-19 21:27:49 +02:00
Jeremy Benoist
ab4aeb8bd8 Merge pull request #1375 from wallabag/v2-fix-1371 
fix #1368 config: redirect on correct tab in material theme
 2015-08-19 21:26:29 +02:00
Nicolas Lœuillet
fdab81e910 warning bar: add parameter to dis/enable it 2015-08-19 16:00:15 +02:00
Nicolas Lœuillet
e62d27ff9b bottom bar to display message 2015-08-19 15:14:08 +02:00
Nicolas Lœuillet
8b8cdabc89 config: redirect on correct tab in material theme 2015-08-19 15:10:11 +02:00
Nicolas Lœuillet
bdd23b076a filters: enhance view for domain name 2015-08-19 14:55:39 +02:00
Nicolas Lœuillet
443cecd2d8 add filter on domain name 2015-08-19 14:27:00 +02:00
Jeremy Benoist
b71ebd9af9 Merge pull request #1366 from wallabag/fix-tags-view 
fix tag view in material theme
 2015-08-19 12:02:24 +02:00
Jeremy Benoist
22ed64522a Merge pull request #1365 from wallabag/v2-typo-pagination 
change </div> into </ul>
 2015-08-19 11:21:31 +02:00
Jeremy Benoist
2e02b50409 Merge pull request #1367 from wallabag/v2-fix-actions-label 
action labels depend on status
 2015-08-19 11:20:22 +02:00
Nicolas Lœuillet
02947111c0 change </div> into </ul> 2015-08-18 18:20:07 +02:00
Nicolas Lœuillet
e68d9179a1 fix tag view in material theme 2015-08-18 18:18:35 +02:00
Nicolas Lœuillet
c713273619 action labels depend on status 2015-08-18 18:13:30 +02:00
Nicolas Lœuillet
3f357ee241 add test 2015-08-18 16:33:32 +02:00
Nicolas Lœuillet
72ea6dd1a7 add creation date filter view 2015-08-18 15:26:45 +02:00
Jeremy Benoist
54f2b4a254 Merge pull request #1353 from wallabag/v2-pluriel 
check if one entry or not
 2015-08-18 14:29:10 +02:00
Jeremy Benoist
3162601c59 Merge pull request #1343 from wallabag/v2-filter-date 
[WIP] filter by creation date
 2015-08-18 14:28:43 +02:00
Nicolas Lœuillet
428af5a8c3 usage of transchoice 2015-08-18 08:32:50 +02:00
Nicolas Lœuillet
5f246a5543 clean -> clear 2015-08-17 20:12:11 +02:00
Nicolas Lœuillet
2ba06b1ee2 check if one entry or not 2015-08-17 18:02:54 +02:00
Nicolas Lœuillet
3c5b025ac3 filter by creation date 2015-08-17 15:54:49 +02:00
Nicolas Lœuillet
925d8ab316 Merge pull request #1337 from modos189/v2_material 
fixes material
 2015-08-17 15:32:59 +02:00
Alexandr Danilov
d5b28518e9 fix 2015-08-17 16:30:30 +03:00
Jeremy Benoist
0a3a5f6cd7 Merge pull request #1352 from wallabag/v2-fix-pagination 
fix #1350: fix pagination with filters
 2015-08-17 15:19:35 +02:00
Nicolas Lœuillet
ab2c93c7eb add test 2015-08-17 15:15:51 +02:00
Alexandr Danilov
727b39a90e Fix calendar in chromium and reducing the size of the calendar 2015-08-17 15:43:44 +03:00
Nicolas Lœuillet
c14a7c4251 fix #1350: fix pagination with filters 2015-08-17 12:13:37 +02:00
Alexandr Danilov
790d18a319 GUI for filter by creation date #1343 2015-08-17 03:12:14 +03:00
Alexandr Danilov
6fd3d82c01 Hide open menu on page reading articles 2015-08-17 02:02:55 +03:00
Alexandr Danilov
fcb3faf109 My implementation progress bar at the top of the page #1348 2015-08-17 01:50:46 +03:00
Alexandr Danilov
d75a9fa38b Fix: 
When I click on "new article" icon, and on the cross after, the filter icon is no more visible.
    When I change the size of my browser window, the filter appears but I didn't click on the icon
    Bug: can't click on pagination > 1
    display bug: when we load homepage, we see quickly the filter form
    new entry form: when we click on the field, the history of the field is at the left of the screen, not below the field (see screenshot)
 2015-08-17 01:29:51 +03:00
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
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
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
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
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