aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* 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
| |/ /
* | | Merge pull request #1358 from wallabag/nicosomb-patch-1Jeremy Benoist2015-08-171-2/+2
|\ \ \ | |/ / |/| |
| * | 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
|\ \
| * | 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
| * | Hide open menu on page reading articlesAlexandr Danilov2015-08-171-0/+9
| * | My implementation progress bar at the top of the page #1348Alexandr Danilov2015-08-173-0/+18
| * | Fix:Alexandr Danilov2015-08-173-7/+20
| * | Merge remote-tracking branch 'origin/v2' into v2_materialAlexandr Danilov2015-08-172-52/+52
| |\|
| * | Fix form rendereAlexandr Danilov2015-08-121-2/+2
| * | Merge remote-tracking branch 'origin/v2' into v2_materialAlexandr Danilov2015-08-127-48/+14
| |\ \
| * | | #1320 Design for filtersAlexandr Danilov2015-08-124-8/+64
| * | | improved viewAlexandr Danilov2015-08-122-13/+17
| * | | fix #1321Alexandr Danilov2015-08-122-1/+33
* | | | Merge pull request #1352 from wallabag/v2-fix-paginationJeremy Benoist2015-08-173-2/+24
|\ \ \ \