Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | 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 | |
| | | | | ||||||
| * | | | Add tags list display | Nicolas Lœuillet | 2015-08-07 | 5 | -2/+80 | |
| | | | | ||||||
* | | | | Merge pull request #1304 from wallabag/v2-rename-starred-menu | Thomas Citharel | 2015-08-09 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | rename favorite in starred | |||||
| * | | | | rename favorite in starred | Nicolas Lœuillet | 2015-08-09 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #1296 from wallabag/v2-fix-564 | Thomas Citharel | 2015-08-08 | 1 | -1/+1 | |
|\ \ \ \ | |_|/ / |/| | | | fix #564: replace Untitled by the domain name | |||||
| * | | | 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 | |
| |/ |/| | ||||||
* | | Merge pull request #1294 from wallabag/v2-fix-1282 | Jeremy Benoist | 2015-08-07 | 1 | -1/+1 | |
|\ \ | | | | | | | fix #1282: add title on wallabag logo | |||||
| * | | fix #1282: add title on wallabag logo | Nicolas Lœuillet | 2015-08-07 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #1293 from wallabag/v2-items-per-page | Jeremy Benoist | 2015-08-07 | 1 | -0/+3 | |
|\ \ | |/ |/| | get itemsPerPage for unread/fav/archive views | |||||
| * | 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 | |
|/ | ||||||
* | Merge pull request #1279 from wallabag/material-default | Jeremy Benoist | 2015-08-04 | 4 | -4/+4 | |
|\ | | | | | set material to default theme \o/ | |||||
| * | set material to default theme \o/ | Nicolas Lœuillet | 2015-08-04 | 4 | -4/+4 | |
|/ | ||||||
* | Merge pull request #1276 from modos189/v2 | Nicolas Lœuillet | 2015-08-04 | 56 | -0/+16852 | |
|\ | | | | | Added Material theme | |||||
| * | Fixes and improve css @media | Alexandr Danilov | 2015-08-04 | 9 | -71/+92 | |
| | | ||||||
| * | Added Material theme | Alexandr Danilov | 2015-08-04 | 56 | -0/+16831 | |
|/ | ||||||
* | Merge pull request #1250 from frankoa/v2_pagination_and_api | Jeremy Benoist | 2015-07-29 | 8 | -59/+76 | |
|\ | | | | | Adds pagerfanta paginator everywhere, modifies article routing. | |||||
| * | Adds pagerfanta paginator everywhere, modifies article routing. Change API ↵ | Francois Gravelaine | 2015-07-28 | 8 | -59/+76 | |
|/ | | | | for is_starred and is_archived | |||||
* | Merge branch 'v2-edit-title' into v2 | Nicolas Lœuillet | 2015-06-08 | 8 | -13/+147 | |
|\ | ||||||
| * | Merge branch 'v2' into v2-edit-title | Nicolas Lœuillet | 2015-06-08 | 13 | -175/+80 | |
| |\ | |/ |/| | ||||||
* | | Merge pull request #1206 from wallabag/sf-2.7 | Nicolas Lœuillet | 2015-06-03 | 13 | -175/+80 | |
|\ \ | | | | | | | Upgrade to Symfony 2.7 | |||||
| * | | Update to Symfony 2.7 | Jeremy Benoist | 2015-06-02 | 9 | -135/+80 | |
| | | | | | | | | | | | | And fix some deps instead of using dev tags | |||||
| * | | Remove phinx | Jeremy Benoist | 2015-06-02 | 4 | -40/+0 | |
|/ / | | | | | | | Doctrine handle quite correctly database migration. Thanks to `doctrine:schema:update` | |||||
| * | 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. | |||||
* | Update deps | Jeremy Benoist | 2015-06-01 | 2 | -14/+22 | |
| | ||||||
* | Merge pull request #1167 from wallabag/v2-api-bundle | Nicolas Lœuillet | 2015-06-01 | 56 | -789/+1142 | |
|\ | | | | | Move API stuff in ApiBundle | |||||
| * | CS | Jeremy Benoist | 2015-05-30 | 31 | -163/+204 | |
| | |