aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1323 from wallabag/v2-1302-checkboxJeremy Benoist2015-08-122-1/+12
|\ | | | | 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-122-1/+12
| |
* | Merge pull request #1312 from wallabag/v2-fix-1311Jeremy Benoist2015-08-122-2/+21
|\ \ | | | | | | fix #1311, redirect after login
| * | 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 page
| * | 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
| | |
* | | Merge pull request #1297 from wallabag/v2-estimated-timeJeremy Benoist2015-08-1220-279/+433
|\ \ \ | |/ / |/| | store estimated reading time in database (#393)
| * | 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 page
| * | 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
|\ \ | |/ |/| fix #1310 add focus to search form
| * 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
|\ | | | | fix material
| * 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
| | | |
* | | | Merge pull request #1304 from wallabag/v2-rename-starred-menuThomas Citharel2015-08-091-1/+1
|\ \ \ \ | | | | | | | | | | rename favorite in starred
| * | | | rename favorite in starredNicolas Lœuillet2015-08-091-1/+1
|/ / / /
* | | | Merge pull request #1296 from wallabag/v2-fix-564Thomas Citharel2015-08-081-1/+1
|\ \ \ \ | |_|/ / |/| | | fix #564: replace Untitled by the domain name
| * | | 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
| |/ |/|
* | Merge pull request #1294 from wallabag/v2-fix-1282Jeremy Benoist2015-08-071-1/+1
|\ \ | | | | | | fix #1282: add title on wallabag logo
| * | fix #1282: add title on wallabag logoNicolas Lœuillet2015-08-071-1/+1
|/ /
* | Merge pull request #1293 from wallabag/v2-items-per-pageJeremy Benoist2015-08-071-0/+3
|\ \ | |/ |/| get itemsPerPage for unread/fav/archive views
| * 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
| |
* | Many corrections material themeAlexandr Danilov2015-08-0611-23/+353
|/
* Merge pull request #1279 from wallabag/material-defaultJeremy Benoist2015-08-044-4/+4
|\ | | | | set material to default theme \o/
| * set material to default theme \o/Nicolas Lœuillet2015-08-044-4/+4
|/
* Merge pull request #1276 from modos189/v2Nicolas Lœuillet2015-08-0456-0/+16852
|\ | | | | Added Material theme
| * Fixes and improve css @mediaAlexandr Danilov2015-08-049-71/+92
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 23:11:34 +0000