aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Merge pull request #1338 from wallabag/v2-add-titlesJeremy Benoist2015-08-132-52/+52
| |\
| | * fix diaspora urlNicolas Lœuillet2015-08-131-1/+1
| | * change title for material pages / about pageNicolas Lœuillet2015-08-132-52/+52
| |/
* | Fix form rendereAlexandr Danilov2015-08-121-2/+2
* | Merge remote-tracking branch 'origin/v2' into v2_materialAlexandr Danilov2015-08-127-48/+14
|\|
| * Merge pull request #1331 from wallabag/v2-disable-downloadJeremy Benoist2015-08-121-6/+6
| |\
| | * disable download links on entry viewNicolas Lœuillet2015-08-121-7/+7
| * | Merge pull request #1334 from wallabag/v2-store-domainnameJeremy Benoist2015-08-127-42/+8
| |\ \ | | |/ | |/|
| | * store domainName in databaseNicolas Lœuillet2015-08-127-42/+8
| |/
* | #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 #1328 from wallabag/v2-fix-1324Jeremy Benoist2015-08-122-2/+2
|\
| * remove pagination if page == 1 with baggy themeNicolas Lœuillet2015-08-121-1/+1
| * fix #1324: do not display pagination when only 1 pageNicolas Lœuillet2015-08-121-1/+1
* | Merge pull request #1326 from wallabag/v2-fix-1299Jeremy Benoist2015-08-121-5/+5
|\ \ | |/ |/|
| * fix #1299: change send buttons on config pageNicolas Lœuillet2015-08-121-5/+5
|/
* Merge pull request #1325 from wallabag/v2-fix-1314Jeremy Benoist2015-08-121-2/+2
|\
| * fix #1314: change max-width in material themeNicolas Lœuillet2015-08-121-2/+2
* | Merge pull request #1323 from wallabag/v2-1302-checkboxJeremy Benoist2015-08-122-1/+12
|\ \ | |/ |/|
| * add translationNicolas Lœuillet2015-08-121-1/+1
| * fix indentationNicolas Lœuillet2015-08-121-1/+1
| * add 'stay connected' checkboxNicolas Lœuillet2015-08-122-1/+12
* | Merge pull request #1312 from wallabag/v2-fix-1311Jeremy Benoist2015-08-122-2/+21
|\ \
| * | add testNicolas Lœuillet2015-08-121-0/+19
| * | fix #1311, redirect after loginNicolas Lœuillet2015-08-101-2/+2
* | | Merge pull request #1322 from wallabag/v2-fix-1303Jeremy Benoist2015-08-121-1/+4
|\ \ \ | |_|/ |/| |
| * | fix #1303, add link to homepage on forgot password pageNicolas Lœuillet2015-08-121-1/+4
|/ /
* | Merge pull request #1319 from wallabag/v2-form-headerJeremy Benoist2015-08-1210-52/+66
|\ \
| * | add new post form in material headerNicolas Lœuillet2015-08-1210-52/+66
* | | Merge pull request #1297 from wallabag/v2-estimated-timeJeremy Benoist2015-08-1220-279/+433
|\ \ \ | |/ / |/| |
| * | store estimated reading time / filters on reading timeNicolas Lœuillet2015-08-1220-279/+433
|/ /
* | Merge pull request #1317 from wallabag/v2-fix-typoJeremy Benoist2015-08-112-2/+2
|\ \
| * | fix link in howto pageNicolas Lœuillet2015-08-112-2/+2
|/ /
* | Merge pull request #1316 from wallabag/v2-focus-searchformThomas Citharel2015-08-111-1/+2
|\ \ | |/ |/|
| * add focus to search formNicolas Lœuillet2015-08-111-1/+2
|/
* Merge pull request #1298 from modos189/v2_fix_materialNicolas Lœuillet2015-08-105-149/+103
|\
| * Merge remote-tracking branch 'origin/v2' into v2_fix_materialAlexandr Danilov2015-08-105-2/+122
| |\ | |/ |/|
* | Merge pull request #1295 from wallabag/v2-howtoJeremy Benoist2015-08-105-0/+120
|\ \
| * | remove useless lineNicolas Lœuillet2015-08-101-1/+0
| * | add tests for static pagesNicolas Lœuillet2015-08-101-0/+29
| * | add howto pageNicolas Lœuillet2015-08-074-0/+92
| | * Merge remote-tracking branch 'origin/v2' into v2_fix_materialAlexandr Danilov2015-08-106-2/+83
| | |\ | |_|/ |/| |
* | | Merge pull request #1292 from wallabag/v2-tags-routeJeremy Benoist2015-08-096-2/+83
|\ \ \
| * | | unit testNicolas Lœuillet2015-08-072-2/+19
| * | | fix displayNicolas Lœuillet2015-08-071-16/+2