Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1370 from wallabag/v2-composer-cleanup | Jeremy Benoist | 2015-08-19 | 2 | -335/+49 |
|\ | | | | | fix 1356: diet for composer | ||||
| * | diet for composer | Nicolas Lœuillet | 2015-08-18 | 2 | -335/+49 |
|/ | |||||
* | Merge pull request #1341 from wallabag/v2-capistrano | Jeremy Benoist | 2015-08-18 | 6 | -0/+266 |
|\ | | | | | capistrano config | ||||
| * | remove capistrano in gitignore | Nicolas Lœuillet | 2015-08-18 | 1 | -5/+0 |
| | | |||||
| * | capistrano config | Nicolas Lœuillet | 2015-08-17 | 7 | -0/+271 |
| | | |||||
* | | Merge pull request #1353 from wallabag/v2-pluriel | Jeremy Benoist | 2015-08-18 | 1 | -50/+36 |
|\ \ | | | | | | | check if one entry or not | ||||
| * | | usage of transchoice | Nicolas Lœuillet | 2015-08-18 | 1 | -42/+36 |
| | | | |||||
| * | | check if one entry or not | Nicolas Lœuillet | 2015-08-17 | 1 | -9/+1 |
| | | | |||||
* | | | Merge pull request #1343 from wallabag/v2-filter-date | Jeremy Benoist | 2015-08-18 | 1 | -1/+15 |
|\ \ \ | | | | | | | | | [WIP] filter by creation date | ||||
| * | | | filter by creation date | Nicolas Lœuillet | 2015-08-17 | 1 | -1/+15 |
| |/ / | |||||
* | | | Merge pull request #1354 from wallabag/v2-clean | Jeremy Benoist | 2015-08-18 | 4 | -20/+13 |
|\ \ \ | | | | | | | | | some cleanup | ||||
| * | | | Update CONTRIBUTING.md | Nicolas Lœuillet | 2015-08-18 | 1 | -1/+1 |
| | | | | |||||
| * | | | some cleanup | Nicolas Lœuillet | 2015-08-17 | 4 | -19/+12 |
| |/ / | |||||
* | | | Merge pull request #1355 from wallabag/v2-clear-button | Jeremy Benoist | 2015-08-17 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | clean -> clear | ||||
| * | | | clean -> clear | Nicolas Lœuillet | 2015-08-17 | 2 | -2/+2 |
| |/ / | |||||
* | | | Merge pull request #1358 from wallabag/nicosomb-patch-1 | Jeremy Benoist | 2015-08-17 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | Disable external_code_coverage on Scrutinizr | ||||
| * | | disable external_code_coverage | Nicolas Lœuillet | 2015-08-17 | 1 | -2/+2 |
| | | | |||||
| * | | change timeout because scrutinizer failed | Nicolas Lœuillet | 2015-08-17 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1337 from modos189/v2_material | Nicolas Lœuillet | 2015-08-17 | 7 | -25/+179 |
|\ \ | | | | | | | fixes material | ||||
| * | | fix | Alexandr Danilov | 2015-08-17 | 1 | -1/+1 |
| | | | |||||
| * | | Fix calendar in chromium and reducing the size of the calendar | Alexandr Danilov | 2015-08-17 | 1 | -0/+5 |
| | | | |||||
| * | | GUI for filter by creation date #1343 | Alexandr Danilov | 2015-08-17 | 2 | -2/+19 |
| | | | |||||
| * | | 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 |
| |\| | |||||
| * | | 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 |
| |\ \ | |||||
| * | | | #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 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1349 from wallabag/v2-add-original-link | Jeremy Benoist | 2015-08-17 | 1 | -0/+8 |
|\ \ \ \ | |/ / / |/| | | | add link to original article in material theme | ||||
| * | | | add link to original article in material theme | Nicolas Lœuillet | 2015-08-16 | 1 | -0/+8 |
|/ / / | |||||
* | | | 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 |
|/ / | |||||
* | | 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 |
|/ | |||||
* | 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 |
| | |