aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1352 from wallabag/v2-fix-paginationJeremy Benoist2015-08-173-2/+24
|\ | | | | fix #1350: fix pagination with filters
| * add testNicolas Lœuillet2015-08-173-2/+24
| |
| * fix #1350: fix pagination with filtersNicolas Lœuillet2015-08-171-1/+1
| |
* | add link to original article in material themeNicolas Lœuillet2015-08-161-0/+8
|/
* fix diaspora urlNicolas Lœuillet2015-08-131-1/+1
|
* change title for material pages / about pageNicolas Lœuillet2015-08-132-52/+52
|
* Merge pull request #1331 from wallabag/v2-disable-downloadJeremy Benoist2015-08-121-6/+6
|\ | | | | disable download links on entry view
| * disable download links on entry viewNicolas Lœuillet2015-08-121-7/+7
| |
* | store domainName in databaseNicolas Lœuillet2015-08-127-42/+8
|/
* Merge pull request #1328 from wallabag/v2-fix-1324Jeremy Benoist2015-08-122-2/+2
|\ | | | | fix #1324: do not display pagination when only 1 page
| * 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
| |
* | 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 theme
| * 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-121-1/+6
|\ \ | |/ |/| fix #1302: add 'stay connected' checkbox
| * add translationNicolas Lœuillet2015-08-121-1/+1
| |
| * fix indentationNicolas Lœuillet2015-08-121-1/+1
| |
| * add 'stay connected' checkboxNicolas Lœuillet2015-08-121-1/+6
| |
* | Merge pull request #1312 from wallabag/v2-fix-1311Jeremy Benoist2015-08-121-0/+19
|\ \ | | | | | | fix #1311, redirect after login
| * | add testNicolas Lœuillet2015-08-121-0/+19
| | |
* | | 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 header
| * | add new post form in material headerNicolas Lœuillet2015-08-1210-52/+66
| | |
* | | store estimated reading time / filters on reading timeNicolas Lœuillet2015-08-1214-87/+184
|/ /
* | fix link in howto pageNicolas Lœuillet2015-08-112-2/+2
| |
* | add focus to search formNicolas Lœuillet2015-08-111-1/+2
|/
* Merge remote-tracking branch 'origin/v2' into v2_fix_materialAlexandr Danilov2015-08-105-2/+122
|\ | | | | | | | | # Conflicts: # src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
| * Merge pull request #1295 from wallabag/v2-howtoJeremy Benoist2015-08-105-0/+120
| |\ | | | | | | add howto page
| | * 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
|\| | | | | | | | | | | | | | # Conflicts: # src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
| * | Merge pull request #1292 from wallabag/v2-tags-routeJeremy Benoist2015-08-096-2/+83
| |\ \ | | | | | | | | Add tags list display
| | * | unit testNicolas Lœuillet2015-08-072-2/+19
| | | |
| | * | fix displayNicolas Lœuillet2015-08-071-16/+2
| | | |
| | * | Add tags list displayNicolas Lœuillet2015-08-075-2/+80
| | | |
| * | | rename favorite in starredNicolas Lœuillet2015-08-091-1/+1
| | | |
| * | | fix #564: replace Untitled by the domain nameNicolas Lœuillet2015-08-071-1/+1
| | |/ | |/|
* | | Preparation for adding linksAlexandr Danilov2015-08-082-1/+6
| | |
* | | fix #1281Alexandr Danilov2015-08-083-161/+76
| | |
* | | fix #1281 (notifications when we star articles are buggy)Alexandr Danilov2015-08-081-0/+8
| | | | | | | | | | | | All notification corrected
* | | fix #1281 (When I save 10 articles, I've got 4 lines: 3 articles on 1st ↵Alexandr Danilov2015-08-081-2/+3
| | | | | | | | | | | | line, 3 on 2nd one, only 1 on 3rd line and 3 on last lines (chrome and firefox))
* | | Title in navigation barAlexandr Danilov2015-08-073-0/+15
| | |
* | | fix #1282Alexandr Danilov2015-08-072-0/+10
|/ /
* | fix #1282: add title on wallabag logoNicolas Lœuillet2015-08-071-1/+1
| |
* | get itemsPerPage for unread/fav/archive viewsNicolas Lœuillet2015-08-071-0/+3
|/
* Merge pull request #1286 from wallabag/v2-issue-1283Danilow Alexandr2015-08-061-1/+12
|\ | | | | fix #1283: display the good title for each category
| * change order of conditionNicolas Lœuillet2015-08-051-3/+3
| |
| * fix #1283: display the good title for each categoryNicolas Lœuillet2015-08-051-1/+12
| |