Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | get itemsPerPage for unread/fav/archive views | Nicolas Lœuillet | 2015-08-07 | 1 | -0/+3 |
|/ | |||||
* | Merge pull request #1286 from wallabag/v2-issue-1283 | Danilow Alexandr | 2015-08-06 | 1 | -1/+12 |
|\ | | | | | fix #1283: display the good title for each category | ||||
| * | change order of condition | Nicolas Lœuillet | 2015-08-05 | 1 | -3/+3 |
| | | |||||
| * | fix #1283: display the good title for each category | Nicolas Lœuillet | 2015-08-05 | 1 | -1/+12 |
| | | |||||
* | | Many corrections material theme | Alexandr Danilov | 2015-08-06 | 11 | -23/+353 |
|/ | |||||
* | set material to default theme \o/ | Nicolas Lœuillet | 2015-08-04 | 3 | -3/+3 |
| | |||||
* | Fixes and improve css @media | Alexandr Danilov | 2015-08-04 | 8 | -71/+91 |
| | |||||
* | Added Material theme | Alexandr Danilov | 2015-08-04 | 55 | -0/+16830 |
| | |||||
* | Adds pagerfanta paginator everywhere, modifies article routing. Change API ↵ | Francois Gravelaine | 2015-07-28 | 7 | -55/+68 |
| | | | | for is_starred and is_archived | ||||
* | Merge branch 'v2' into v2-edit-title | Nicolas Lœuillet | 2015-06-08 | 7 | -18/+24 |
|\ | |||||
| * | Update to Symfony 2.7 | Jeremy Benoist | 2015-06-02 | 7 | -18/+24 |
| | | | | | | | | And fix some deps instead of using dev tags | ||||
* | | Add basic title edition | Jeremy Benoist | 2015-06-02 | 8 | -13/+147 |
|/ | | | | | 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. | ||||
* | Merge pull request #1167 from wallabag/v2-api-bundle | Nicolas Lœuillet | 2015-06-01 | 50 | -457/+776 |
|\ | | | | | Move API stuff in ApiBundle | ||||
| * | CS | Jeremy Benoist | 2015-05-30 | 31 | -163/+204 |
| | | |||||
| * | Update naming strategy since Doctrine 2.5 | Jeremy Benoist | 2015-05-30 | 1 | -0/+8 |
| | | | | | | | | See https://github.com/doctrine/doctrine2/commit/20fb8270dc3c84eceaf90979644fdfbe0b2e615e | ||||
| * | Avoid / in feed token | Jeremy | 2015-04-01 | 1 | -1/+2 |
| | | | | | | | | Of course, it breaks the url and the route matcher for each feed route | ||||
| * | Fix tests | Jeremy | 2015-04-01 | 4 | -11/+11 |
| | |