aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Resources
Commit message (Expand)AuthorAgeFilesLines
* 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
* | clean -> clearNicolas Lœuillet2015-08-172-2/+2
|/
* 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-125-18/+13
| |\ \
| * | | #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-172-2/+2
|\ \ \ \
| * | | | add testNicolas Lœuillet2015-08-172-2/+2
| * | | | 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 viewNicolas Lœuillet2015-08-121-7/+7
| |/
* / store domainName in databaseNicolas Lœuillet2015-08-125-12/+7
|/
* 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
* | 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-121-1/+6
|\ \ | |/ |/|
| * 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
* | 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-129-49/+51
|\
| * add new post form in material headerNicolas Lœuillet2015-08-129-49/+51
* | store estimated reading time / filters on reading timeNicolas Lœuillet2015-08-126-37/+39
|/
* 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-103-2/+84
|\
| * Merge pull request #1295 from wallabag/v2-howtoJeremy Benoist2015-08-103-0/+82
| |\
| | * add howto pageNicolas Lœuillet2015-08-073-0/+82
* | | Merge remote-tracking branch 'origin/v2' into v2_fix_materialAlexandr Danilov2015-08-102-1/+14
|\| |
| * | Merge pull request #1292 from wallabag/v2-tags-routeJeremy Benoist2015-08-093-2/+15
| |\ \
| | * | fix displayNicolas Lœuillet2015-08-071-16/+2
| | * | Add tags list displayNicolas Lœuillet2015-08-073-2/+29
| * | | rename favorite in starredNicolas Lœuillet2015-08-091-1/+1
| | |/ | |/|