aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Resources/views
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-08-229-80/+123
|\
| * Merge pull request #2222 from wallabag/add-date-on-article-viewNicolas Lœuillet2016-08-222-0/+22
| |\
| | * Display text on baggyJeremy Benoist2016-08-212-5/+9
| | * Changed code indentationNicolas Lœuillet2016-08-182-6/+14
| | * Added creation date and reading time on article viewNicolas Lœuillet2016-08-182-0/+10
| * | Fixed some translationsNicolas Lœuillet2016-08-181-1/+1
| * | Replaced favorite word/icon with star oneNicolas Lœuillet2016-08-183-8/+8
| |/
| * Fix form user display for baggy themeNicolas Lœuillet2016-08-171-1/+2
| * Fix form user display when 2FA is disabledNicolas Lœuillet2016-08-171-1/+1
| * Handling socials links into a config fileSimounet2016-07-204-51/+52
* | Added name on clientThomas Citharel2016-08-226-8/+22
* | Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-07-201-2/+2
|\|
| * Remove fr partThomas Citharel2016-07-021-1/+1
| * Fix 3rd-Party Apps links (Chrome & Firefox)Thomas Citharel2016-07-021-2/+2
| * Merge pull request #2052 from danbartram/feature-filter-unreadJeremy Benoist2016-05-272-0/+10
| |\
| | * Add unread filter to entries pagesDaniel Bartram2016-05-092-0/+10
* | | Bring tags on entries view to baggyThomas Citharel2016-07-012-1/+11
* | | minor ui fixesThomas Citharel2016-06-231-5/+2
* | | fix typo on iconsThomas Citharel2016-06-231-2/+2
* | | Add tags on entries viewThomas Citharel2016-06-231-0/+19
* | | remove block added twiceThomas Citharel2016-06-091-85/+0
* | | manage assets through npmThomas Citharel2016-06-0911-172/+188
|/ /
* | Replace vertical dots in material theme with horizontal dotsNicolas Lœuillet2016-05-181-1/+1
* | Do not specify language in Firefox addon linkMerouane Atig2016-05-131-1/+1
|/
* Merge pull request #2020 from wallabag/fix-number-entries-per-tagJeremy Benoist2016-05-072-2/+2
|\
| * Rename getEntriesByUser method to getEntriesByUserIdNicolas Lœuillet2016-05-042-2/+2
| * Fix number of entries in tag/listNicolas Lœuillet2016-05-032-2/+2
* | Add pagination bar at the bottom of the pageNicolas Lœuillet2016-05-034-21/+25
|/
* Fix tags listingNicolas Lœuillet2016-05-022-2/+2
* Update links in documentationNicolas Lœuillet2016-04-196-14/+14
* Display pagination only if we have more than one pageNicolas Lœuillet2016-04-182-2/+2
* Hide pagination if we only have one entry to displayNicolas Lœuillet2016-04-162-2/+6
* Change guid and link in RSS feeds to give original entry URLNicolas Lœuillet2016-04-152-4/+4
* Merge pull request #1918 from wallabag/improve-paginationJeremy Benoist2016-04-132-16/+3
|\
| * Fix indentationNicolas Lœuillet2016-04-131-4/+4
| * Lost in translation pagerNicolas Lœuillet2016-04-122-2/+2
| * Improve pagination when user has lot of entriesNicolas Lœuillet2016-04-122-17/+4
* | Remove useless dependancyNicolas Lœuillet2016-04-122-2/+0
|/
* Add title hover on entry titlesThomas Citharel2016-04-122-2/+2
* Merge pull request #1898 from wallabag/v2-fix-readingtime-display-materialJeremy Benoist2016-04-101-2/+1
|\
| * Fix estimated reading time in material viewNicolas Lœuillet2016-04-101-2/+1
* | Merge pull request #1896 from wallabag/v2-fix-internal-settingsJeremy Benoist2016-04-102-1/+12
|\ \
| * | Fix internal settingsNicolas Lœuillet2016-04-092-1/+12
| |/
* | Merge pull request #1894 from wallabag/v2-fix-doc-linkJeremy Benoist2016-04-102-2/+2
|\ \
| * | Fix documentation link in developer pageNicolas Lœuillet2016-04-092-2/+2
| |/
* / Fix typo on configuration pageNicolas Lœuillet2016-04-092-2/+2
|/
* Merge pull request #1879 from wallabag/v2-tag-field-positionJeremy Benoist2016-04-081-4/+4
|\
| * Move tag form in Material themeNicolas Lœuillet2016-04-071-4/+4
* | Merge pull request #1868 from wallabag/v2-tagrule-baggyJeremy Benoist2016-04-072-71/+156
|\ \ | |/ |/|
| * Remove keybaord shortcut and add tagging rule panel in baggyNicolas Lœuillet2016-04-052-71/+156