Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Hide open menu on page reading articles | Alexandr Danilov | 2015-08-17 | 1 | -0/+9 |
| | |||||
* | My implementation progress bar at the top of the page #1348 | Alexandr Danilov | 2015-08-17 | 3 | -0/+18 |
| | |||||
* | Fix: | Alexandr Danilov | 2015-08-17 | 3 | -7/+20 |
| | | | | | | | | 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) | ||||
* | Merge remote-tracking branch 'origin/v2' into v2_material | Alexandr Danilov | 2015-08-17 | 2 | -52/+52 |
|\ | |||||
| * | Merge pull request #1338 from wallabag/v2-add-titles | Jeremy Benoist | 2015-08-13 | 2 | -52/+52 |
| |\ | | | | | | | change title for material pages / about page | ||||
| | * | fix diaspora url | Nicolas Lœuillet | 2015-08-13 | 1 | -1/+1 |
| | | | |||||
| | * | change title for material pages / about page | Nicolas Lœuillet | 2015-08-13 | 2 | -52/+52 |
| |/ | |||||
* | | Fix form rendere | Alexandr Danilov | 2015-08-12 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/v2' into v2_material | Alexandr Danilov | 2015-08-12 | 7 | -48/+14 |
|\| | |||||
| * | Merge pull request #1331 from wallabag/v2-disable-download | Jeremy Benoist | 2015-08-12 | 1 | -6/+6 |
| |\ | | | | | | | disable download links on entry view | ||||
| | * | disable download links on entry view | Nicolas Lœuillet | 2015-08-12 | 1 | -7/+7 |
| | | | |||||
| * | | Merge pull request #1334 from wallabag/v2-store-domainname | Jeremy Benoist | 2015-08-12 | 7 | -42/+8 |
| |\ \ | | |/ | |/| | store domainName in database | ||||
| | * | store domainName in database | Nicolas Lœuillet | 2015-08-12 | 7 | -42/+8 |
| |/ | |||||
* | | #1320 Design for filters | Alexandr Danilov | 2015-08-12 | 4 | -8/+64 |
| | | |||||
* | | improved view | Alexandr Danilov | 2015-08-12 | 2 | -13/+17 |
| | | |||||
* | | fix #1321 | Alexandr Danilov | 2015-08-12 | 2 | -1/+33 |
|/ | |||||
* | Merge pull request #1328 from wallabag/v2-fix-1324 | Jeremy Benoist | 2015-08-12 | 2 | -2/+2 |
|\ | | | | | fix #1324: do not display pagination when only 1 page | ||||
| * | remove pagination if page == 1 with baggy theme | Nicolas Lœuillet | 2015-08-12 | 1 | -1/+1 |
| | | |||||
| * | fix #1324: do not display pagination when only 1 page | Nicolas Lœuillet | 2015-08-12 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1326 from wallabag/v2-fix-1299 | Jeremy Benoist | 2015-08-12 | 1 | -5/+5 |
|\ \ | |/ |/| | fix #1299: change send buttons on config page | ||||
| * | fix #1299: change send buttons on config page | Nicolas Lœuillet | 2015-08-12 | 1 | -5/+5 |
|/ | |||||
* | Merge pull request #1325 from wallabag/v2-fix-1314 | Jeremy Benoist | 2015-08-12 | 1 | -2/+2 |
|\ | | | | | fix #1314: change max-width in material theme | ||||
| * | fix #1314: change max-width in material theme | Nicolas Lœuillet | 2015-08-12 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #1323 from wallabag/v2-1302-checkbox | Jeremy Benoist | 2015-08-12 | 2 | -1/+12 |
|\ \ | |/ |/| | fix #1302: add 'stay connected' checkbox | ||||
| * | add translation | Nicolas Lœuillet | 2015-08-12 | 1 | -1/+1 |
| | | |||||
| * | fix indentation | Nicolas Lœuillet | 2015-08-12 | 1 | -1/+1 |
| | | |||||
| * | add 'stay connected' checkbox | Nicolas Lœuillet | 2015-08-12 | 2 | -1/+12 |
| | | |||||
* | | Merge pull request #1312 from wallabag/v2-fix-1311 | Jeremy Benoist | 2015-08-12 | 2 | -2/+21 |
|\ \ | | | | | | | fix #1311, redirect after login | ||||
| * | | add test | Nicolas Lœuillet | 2015-08-12 | 1 | -0/+19 |
| | | | |||||
| * | | fix #1311, redirect after login | Nicolas Lœuillet | 2015-08-10 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #1322 from wallabag/v2-fix-1303 | Jeremy Benoist | 2015-08-12 | 1 | -1/+4 |
|\ \ \ | |_|/ |/| | | fix #1303, add link to homepage on forgot password page | ||||
| * | | fix #1303, add link to homepage on forgot password page | Nicolas Lœuillet | 2015-08-12 | 1 | -1/+4 |
|/ / | |||||
* | | Merge pull request #1319 from wallabag/v2-form-header | Jeremy Benoist | 2015-08-12 | 10 | -52/+66 |
|\ \ | | | | | | | add new post form in material header | ||||
| * | | add new post form in material header | Nicolas Lœuillet | 2015-08-12 | 10 | -52/+66 |
| | | | |||||
* | | | Merge pull request #1297 from wallabag/v2-estimated-time | Jeremy Benoist | 2015-08-12 | 20 | -279/+433 |
|\ \ \ | |/ / |/| | | store estimated reading time in database (#393) | ||||
| * | | store estimated reading time / filters on reading time | Nicolas Lœuillet | 2015-08-12 | 20 | -279/+433 |
|/ / | |||||
* | | Merge pull request #1317 from wallabag/v2-fix-typo | Jeremy Benoist | 2015-08-11 | 2 | -2/+2 |
|\ \ | | | | | | | fix link in howto page | ||||
| * | | fix link in howto page | Nicolas Lœuillet | 2015-08-11 | 2 | -2/+2 |
|/ / | |||||
* | | Merge pull request #1316 from wallabag/v2-focus-searchform | Thomas Citharel | 2015-08-11 | 1 | -1/+2 |
|\ \ | |/ |/| | fix #1310 add focus to search form | ||||
| * | add focus to search form | Nicolas Lœuillet | 2015-08-11 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #1298 from modos189/v2_fix_material | Nicolas Lœuillet | 2015-08-10 | 5 | -149/+103 |
|\ | | | | | fix material | ||||
| * | Merge remote-tracking branch 'origin/v2' into v2_fix_material | Alexandr Danilov | 2015-08-10 | 5 | -2/+122 |
| |\ | |/ |/| | | | | | # Conflicts: # src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig | ||||
* | | Merge pull request #1295 from wallabag/v2-howto | Jeremy Benoist | 2015-08-10 | 5 | -0/+120 |
|\ \ | | | | | | | add howto page | ||||
| * | | remove useless line | Nicolas Lœuillet | 2015-08-10 | 1 | -1/+0 |
| | | | |||||
| * | | add tests for static pages | Nicolas Lœuillet | 2015-08-10 | 1 | -0/+29 |
| | | | |||||
| * | | add howto page | Nicolas Lœuillet | 2015-08-07 | 4 | -0/+92 |
| | | | |||||
| | * | Merge remote-tracking branch 'origin/v2' into v2_fix_material | Alexandr Danilov | 2015-08-10 | 6 | -2/+83 |
| | |\ | |_|/ |/| | | | | | | | | # Conflicts: # src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig | ||||
* | | | Merge pull request #1292 from wallabag/v2-tags-route | Jeremy Benoist | 2015-08-09 | 6 | -2/+83 |
|\ \ \ | | | | | | | | | Add tags list display | ||||
| * | | | unit test | Nicolas Lœuillet | 2015-08-07 | 2 | -2/+19 |
| | | | | |||||
| * | | | fix display | Nicolas Lœuillet | 2015-08-07 | 1 | -16/+2 |
| | | | |