Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge remote-tracking branch 'origin/v2' into v2_material | Alexandr Danilov | 2015-08-12 | 7 | -48/+14 | |
| |\ \ | ||||||
| * | | | #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 #1352 from wallabag/v2-fix-pagination | Jeremy Benoist | 2015-08-17 | 3 | -2/+24 | |
|\ \ \ \ | | | | | | | | | | | fix #1350: fix pagination with filters | |||||
| * | | | | add test | Nicolas Lœuillet | 2015-08-17 | 3 | -2/+24 | |
| | | | | | ||||||
| * | | | | fix #1350: fix pagination with filters | Nicolas Lœuillet | 2015-08-17 | 1 | -1/+1 | |
| | |_|/ | |/| | | ||||||
* / | | | add link to original article in material theme | Nicolas Lœuillet | 2015-08-16 | 1 | -0/+8 | |
|/ / / | ||||||
* | | | 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 | |
| |/ |/| | ||||||
* | | 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 | |
| |/ | ||||||
* / | store domainName in database | Nicolas Lœuillet | 2015-08-12 | 7 | -42/+8 | |
|/ | ||||||
* | 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 | |
| | | ||||||
* | | 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 | 1 | -1/+6 | |
|\ \ | |/ |/| | 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 | 1 | -1/+6 | |
| | | ||||||
* | | Merge pull request #1312 from wallabag/v2-fix-1311 | Jeremy Benoist | 2015-08-12 | 1 | -0/+19 | |
|\ \ | | | | | | | fix #1311, redirect after login | |||||
| * | | add test | Nicolas Lœuillet | 2015-08-12 | 1 | -0/+19 | |
| | | | ||||||
* | | | 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 | |
| | | | ||||||
* | | | store estimated reading time / filters on reading time | Nicolas Lœuillet | 2015-08-12 | 14 | -87/+184 | |
|/ / | ||||||
* | | fix link in howto page | Nicolas Lœuillet | 2015-08-11 | 2 | -2/+2 | |
| | | ||||||
* | | add focus to search form | Nicolas Lœuillet | 2015-08-11 | 1 | -1/+2 | |
|/ | ||||||
* | 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 | |
| | | | | ||||||
| | * | | Add tags list display | Nicolas Lœuillet | 2015-08-07 | 5 | -2/+80 | |
| | | | | ||||||
| * | | | rename favorite in starred | Nicolas Lœuillet | 2015-08-09 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | fix #564: replace Untitled by the domain name | Nicolas Lœuillet | 2015-08-07 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
* | | | Preparation for adding links | Alexandr Danilov | 2015-08-08 | 2 | -1/+6 | |
| | | | ||||||
* | | | fix #1281 | Alexandr Danilov | 2015-08-08 | 3 | -161/+76 | |
| | | | ||||||
* | | | fix #1281 (notifications when we star articles are buggy) | Alexandr Danilov | 2015-08-08 | 1 | -0/+8 | |
| | | | | | | | | | | | | All notification corrected | |||||
* | | | fix #1281 (When I save 10 articles, I've got 4 lines: 3 articles on 1st ↵ | Alexandr Danilov | 2015-08-08 | 1 | -2/+3 | |
| | | | | | | | | | | | | line, 3 on 2nd one, only 1 on 3rd line and 3 on last lines (chrome and firefox)) | |||||
* | | | Title in navigation bar | Alexandr Danilov | 2015-08-07 | 3 | -0/+15 | |
| | | | ||||||
* | | | fix #1282 | Alexandr Danilov | 2015-08-07 | 2 | -0/+10 | |
|/ / | ||||||
* | | fix #1282: add title on wallabag logo | Nicolas Lœuillet | 2015-08-07 | 1 | -1/+1 | |
| | |