aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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
|\ \ | | | | | | check if one entry or not
| * | 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
|\ \ \ | | | | | | | | [WIP] filter by creation date
| * | | filter by creation dateNicolas Lœuillet2015-08-171-1/+15
| |/ /
* | | Merge pull request #1354 from wallabag/v2-cleanJeremy Benoist2015-08-184-20/+13
|\ \ \ | | | | | | | | some cleanup
| * | | 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 -> clear
| * | | clean -> clearNicolas Lœuillet2015-08-172-2/+2
| |/ /
* | | Merge pull request #1358 from wallabag/nicosomb-patch-1Jeremy Benoist2015-08-171-2/+2
|\ \ \ | |/ / |/| | Disable external_code_coverage on Scrutinizr
| * | disable external_code_coverageNicolas Lœuillet2015-08-171-2/+2
| | |
| * | change timeout because scrutinizer failedNicolas Lœuillet2015-08-171-1/+1
|/ /
* | Merge pull request #1337 from modos189/v2_materialNicolas Lœuillet2015-08-177-25/+179
|\ \ | | | | | | fixes material
| * | fixAlexandr Danilov2015-08-171-1/+1
| | |
| * | Fix calendar in chromium and reducing the size of the calendarAlexandr Danilov2015-08-171-0/+5
| | |
| * | GUI for filter by creation date #1343Alexandr Danilov2015-08-172-2/+19
| | |