Commit graph

323 commits

Author SHA1 Message Date
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