aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Apply margin only on settings pageJeremy Benoist2015-08-241-1/+2
|
* Merge pull request #1392 from wallabag/v2-fix-redirectNicolas Lœuillet2015-08-241-5/+4
|\ | | | | Fix redirect after deletion
| * Fix redirect after deletionJeremy Benoist2015-08-221-5/+4
| | | | | | | | Fix #1391
* | Merge pull request #1393 from wallabag/fix-filter-same-dayNicolas Lœuillet2015-08-244-2/+51
|\ \ | | | | | | Fix date filter on same day
| * | Add test for same day filterJeremy Benoist2015-08-232-5/+14
| | |
| * | Fix date filter on same dayJeremy Benoist2015-08-223-2/+42
| | | | | | | | | | | | Fix #1379
* | | Merge pull request #1384 from wallabag/v2-fix-config-displayNicolas Lœuillet2015-08-232-14/+21
|\ \ \ | |/ / |/| | fix #1371 config screen: display bug in RSS tab
| * | Fix display issue in config rss tabJeremy Benoist2015-08-222-14/+21
| | |
* | | Merge pull request #1372 from wallabag/v2-assign-tagsJeremy Benoist2015-08-229-2/+186
|\ \ \ | |_|/ |/| | assign tags to an entry
| * | assign tags to an entryNicolas Lœuillet2015-08-229-2/+186
| | |
* | | Merge pull request #1390 from wallabag/coderatingJeremy Benoist2015-08-211-0/+4
|\ \ \ | | | | | | | | Enable code rating on Scrutinizer
| * | | Enable code rating on ScrutinizerJeremy Benoist2015-08-211-0/+4
|/ / /
* | | Merge pull request #1385 from wallabag/v2-status-filterJeremy Benoist2015-08-219-6/+88
|\ \ \ | | | | | | | | filters: implement status filter and a new view (to display all entries)
| * | | 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 code
| * | remove dead codeNicolas Lœuillet2015-08-211-23/+0
|/ /
* | Merge pull request #1386 from wallabag/v2-refactorNicolas Lœuillet2015-08-2016-290/+182
|\ \ | |/ |/| WIP – Fixing things around :dash:
| * 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
| | | | | | | | 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 pageJeremy Benoist2015-08-201-20/+18
| | | | | | | | According to what have been done on the material theme
| * 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
|/ | | | | One place to retrieve entries in Entry & Rss controller. More simple and easy to maintain.
* Merge pull request #1383 from wallabag/csNicolas Lœuillet2015-08-2022-74/+73
|\ | | | | CS
| * CSJeremy Benoist2015-08-2022-74/+73
|/ | | | We shouldn't forget to run `php-cs-fixer` time to time
* Merge pull request #1369 from wallabag/v2-bottombarJeremy Benoist2015-08-194-0/+24
|\ | | | | fix #1332: bottom bar to display message
| * 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
|\ \ | | | | | | fix #1368 config: redirect on correct tab in material theme
| * | 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 name
| * 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
|\ | | | | fix #981: add filter on domain name
| * 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 theme
| * 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>
| * | 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 status
| * | 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 creation date filter view
| * | 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
|\ \ \ | |_|/ |/| | fix 1356: diet for composer
| * | diet for composerNicolas Lœuillet2015-08-182-335/+49
|/ /
* | Merge pull request #1341 from wallabag/v2-capistranoJeremy Benoist2015-08-186-0/+266
|\ \ | |/ |/| capistrano config