aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #1385 from wallabag/v2-status-filterJeremy Benoist2015-08-219-6/+88
|\ \ \
| * | | restore composer.lockNicolas Lœuillet2015-08-211-11/+11
| * | | filters: adapt queryBuilder for 'all' viewNicolas Lœuillet2015-08-212-28/+19
| * | | filters: add test for status filter and adapt other tests resultsNicolas Lœuillet2015-08-212-2/+31
| * | | filters: implement status filter and a new view (to display all entries)Nicolas Lœuillet2015-08-217-15/+77
| |/ /
* | | Merge pull request #1389 from wallabag/v2-fix-duplicateJeremy Benoist2015-08-211-23/+0
|\ \ \ | |/ / |/| |
| * | remove dead codeNicolas Lœuillet2015-08-211-23/+0
|/ /
* | Merge pull request #1386 from wallabag/v2-refactorNicolas Lœuillet2015-08-2016-290/+182
|\ \ | |/ |/|
| * CSJeremy Benoist2015-08-203-2/+3
| * Add test on getting starred entries using the APIJeremy Benoist2015-08-201-0/+25
| * Add title in "picto-link"Jeremy Benoist2015-08-201-3/+3
| * Update baggy about pageJeremy Benoist2015-08-201-20/+18
| * Fixed my name & website :ok_hand:Jeremy Benoist2015-08-202-1/+2
| * Remove unsed thingsJeremy Benoist2015-08-206-157/+15
| * Refactorize the way to retrieve entriesJeremy Benoist2015-08-203-108/+117
|/
* Merge pull request #1383 from wallabag/csNicolas Lœuillet2015-08-2022-74/+73
|\
| * CSJeremy Benoist2015-08-2022-74/+73
|/
* Merge pull request #1369 from wallabag/v2-bottombarJeremy Benoist2015-08-194-0/+24
|\
| * warning bar: add parameter to dis/enable itNicolas Lœuillet2015-08-194-3/+12
| * bottom bar to display messageNicolas Lœuillet2015-08-192-0/+15
* | Merge pull request #1375 from wallabag/v2-fix-1371Jeremy Benoist2015-08-191-4/+4
|\ \
| * | config: redirect on correct tab in material themeNicolas Lœuillet2015-08-191-4/+4
| |/
* | Merge pull request #1374 from wallabag/v2-fix-filters-displayJeremy Benoist2015-08-191-8/+6
|\ \ | |/ |/|
| * filters: enhance view for domain nameNicolas Lœuillet2015-08-191-8/+6
|/
* Merge pull request #1342 from wallabag/v2-domain-filterJeremy Benoist2015-08-193-2/+45
|\
| * add filter on domain nameNicolas Lœuillet2015-08-193-2/+45
|/
* Merge pull request #1366 from wallabag/fix-tags-viewJeremy Benoist2015-08-191-0/+15
|\
| * fix tag view in material themeNicolas Lœuillet2015-08-181-0/+15
* | Merge pull request #1365 from wallabag/v2-typo-paginationJeremy Benoist2015-08-191-1/+1
|\ \
| * | change </div> into </ul>Nicolas Lœuillet2015-08-181-1/+1
| |/
* | Merge pull request #1367 from wallabag/v2-fix-actions-labelJeremy Benoist2015-08-191-2/+2
|\ \
| * | action labels depend on statusNicolas Lœuillet2015-08-181-2/+2
| |/
* | Merge pull request #1363 from wallabag/v2-add-date-filter-viewJeremy Benoist2015-08-192-1/+39
|\ \
| * | add testNicolas Lœuillet2015-08-181-1/+30
| * | add creation date filter viewNicolas Lœuillet2015-08-181-0/+9
* | | Merge pull request #1370 from wallabag/v2-composer-cleanupJeremy Benoist2015-08-192-335/+49
|\ \ \ | |_|/ |/| |
| * | diet for composerNicolas Lœuillet2015-08-182-335/+49
|/ /
* | Merge pull request #1341 from wallabag/v2-capistranoJeremy Benoist2015-08-186-0/+266
|\ \ | |/ |/|
| * remove capistrano in gitignoreNicolas Lœuillet2015-08-181-5/+0
| * capistrano configNicolas Lœuillet2015-08-177-0/+271
* | Merge pull request #1353 from wallabag/v2-plurielJeremy Benoist2015-08-181-50/+36
|\ \
| * | usage of transchoiceNicolas Lœuillet2015-08-181-42/+36
| * | check if one entry or notNicolas Lœuillet2015-08-171-9/+1
* | | Merge pull request #1343 from wallabag/v2-filter-dateJeremy Benoist2015-08-181-1/+15
|\ \ \
| * | | filter by creation dateNicolas Lœuillet2015-08-171-1/+15
| |/ /
* | | Merge pull request #1354 from wallabag/v2-cleanJeremy Benoist2015-08-184-20/+13
|\ \ \
| * | | Update CONTRIBUTING.mdNicolas Lœuillet2015-08-181-1/+1
| * | | some cleanupNicolas Lœuillet2015-08-174-19/+12
| |/ /
* | | Merge pull request #1355 from wallabag/v2-clear-buttonJeremy Benoist2015-08-172-2/+2
|\ \ \
| * | | clean -> clearNicolas Lœuillet2015-08-172-2/+2
| |/ /