Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | filters: adapt queryBuilder for 'all' view | Nicolas Lœuillet | 2015-08-21 | 2 | -28/+19 | |
| | | | | ||||||
| * | | | filters: add test for status filter and adapt other tests results | Nicolas Lœuillet | 2015-08-21 | 2 | -2/+31 | |
| | | | | ||||||
| * | | | filters: implement status filter and a new view (to display all entries) | Nicolas Lœuillet | 2015-08-21 | 7 | -15/+77 | |
| |/ / | ||||||
* | | | Merge pull request #1389 from wallabag/v2-fix-duplicate | Jeremy Benoist | 2015-08-21 | 1 | -23/+0 | |
|\ \ \ | |/ / |/| | | remove dead code | |||||
| * | | remove dead code | Nicolas Lœuillet | 2015-08-21 | 1 | -23/+0 | |
|/ / | ||||||
* | | Merge pull request #1386 from wallabag/v2-refactor | Nicolas Lœuillet | 2015-08-20 | 16 | -290/+182 | |
|\ \ | |/ |/| | WIP – Fixing things around :dash: | |||||
| * | CS | Jeremy Benoist | 2015-08-20 | 3 | -2/+3 | |
| | | ||||||
| * | Add test on getting starred entries using the API | Jeremy Benoist | 2015-08-20 | 1 | -0/+25 | |
| | | ||||||
| * | Add title in "picto-link" | Jeremy Benoist | 2015-08-20 | 1 | -3/+3 | |
| | | | | | | | | Picto aren't always obvious for every one. So it's better to have some title when we move the mouse over. | |||||
| * | Update baggy about page | Jeremy Benoist | 2015-08-20 | 1 | -20/+18 | |
| | | | | | | | | According to what have been done on the material theme | |||||
| * | Fixed my name & website :ok_hand: | Jeremy Benoist | 2015-08-20 | 2 | -1/+2 | |
| | | ||||||
| * | Remove unsed things | Jeremy Benoist | 2015-08-20 | 6 | -157/+15 | |
| | | ||||||
| * | Refactorize the way to retrieve entries | Jeremy Benoist | 2015-08-20 | 3 | -108/+117 | |
|/ | | | | | One place to retrieve entries in Entry & Rss controller. More simple and easy to maintain. | |||||
* | Merge pull request #1383 from wallabag/cs | Nicolas Lœuillet | 2015-08-20 | 22 | -74/+73 | |
|\ | | | | | CS | |||||
| * | CS | Jeremy Benoist | 2015-08-20 | 22 | -74/+73 | |
|/ | | | | We shouldn't forget to run `php-cs-fixer` time to time | |||||
* | Merge pull request #1369 from wallabag/v2-bottombar | Jeremy Benoist | 2015-08-19 | 4 | -0/+24 | |
|\ | | | | | fix #1332: bottom bar to display message | |||||
| * | warning bar: add parameter to dis/enable it | Nicolas Lœuillet | 2015-08-19 | 4 | -3/+12 | |
| | | ||||||
| * | bottom bar to display message | Nicolas Lœuillet | 2015-08-19 | 2 | -0/+15 | |
| | | ||||||
* | | Merge pull request #1375 from wallabag/v2-fix-1371 | Jeremy Benoist | 2015-08-19 | 1 | -4/+4 | |
|\ \ | | | | | | | fix #1368 config: redirect on correct tab in material theme | |||||
| * | | config: redirect on correct tab in material theme | Nicolas Lœuillet | 2015-08-19 | 1 | -4/+4 | |
| |/ | ||||||
* | | Merge pull request #1374 from wallabag/v2-fix-filters-display | Jeremy Benoist | 2015-08-19 | 1 | -8/+6 | |
|\ \ | |/ |/| | filters: enhance view for domain name | |||||
| * | filters: enhance view for domain name | Nicolas Lœuillet | 2015-08-19 | 1 | -8/+6 | |
|/ | ||||||
* | Merge pull request #1342 from wallabag/v2-domain-filter | Jeremy Benoist | 2015-08-19 | 3 | -2/+45 | |
|\ | | | | | fix #981: add filter on domain name | |||||
| * | add filter on domain name | Nicolas Lœuillet | 2015-08-19 | 3 | -2/+45 | |
|/ | ||||||
* | Merge pull request #1366 from wallabag/fix-tags-view | Jeremy Benoist | 2015-08-19 | 1 | -0/+15 | |
|\ | | | | | fix tag view in material theme | |||||
| * | fix tag view in material theme | Nicolas Lœuillet | 2015-08-18 | 1 | -0/+15 | |
| | | ||||||
* | | Merge pull request #1365 from wallabag/v2-typo-pagination | Jeremy Benoist | 2015-08-19 | 1 | -1/+1 | |
|\ \ | | | | | | | change </div> into </ul> | |||||
| * | | change </div> into </ul> | Nicolas Lœuillet | 2015-08-18 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge pull request #1367 from wallabag/v2-fix-actions-label | Jeremy Benoist | 2015-08-19 | 1 | -2/+2 | |
|\ \ | | | | | | | action labels depend on status | |||||
| * | | action labels depend on status | Nicolas Lœuillet | 2015-08-18 | 1 | -2/+2 | |
| |/ | ||||||
* | | Merge pull request #1363 from wallabag/v2-add-date-filter-view | Jeremy Benoist | 2015-08-19 | 2 | -1/+39 | |
|\ \ | | | | | | | add creation date filter view | |||||
| * | | add test | Nicolas Lœuillet | 2015-08-18 | 1 | -1/+30 | |
| | | | ||||||
| * | | add creation date filter view | Nicolas Lœuillet | 2015-08-18 | 1 | -0/+9 | |
| | | | ||||||
* | | | 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 | |
| | | |