aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 2.1Jeremy Benoist2016-06-2346-6063/+20
|\
| * Merge pull request #2157 from wallabag/lower-upper-readingtimeJeremy Benoist2016-06-231-7/+16
| |\
| | * fixup! Handle only upper or only lower reading filterJeremy Benoist2016-06-231-2/+2
| | * Handle only upper or only lower reading filterJeremy Benoist2016-06-231-7/+16
| * | Fix a few french translations typosThomas Citharel2016-06-231-4/+4
| |/
| * Jump to Symfony 3.1Jeremy Benoist2016-06-2245-6058/+0
| * Try to find bad redirection after deleteJeremy Benoist2016-06-171-3/+4
| * Merge pull request #2122 from wallabag/fix-tags-deletionNicolas Lœuillet2016-05-3117-41/+122
| |\
| | * Change ManyToMany between entry & tagJeremy Benoist2016-05-314-7/+68
| | * Display a message when saving an entry failedJeremy Benoist2016-05-3012-27/+45
| | * Move fixtures to the right placeJeremy Benoist2016-05-302-6/+8
| | * Fix the deletion of Tags/Entries relation when delete an entryNicolas Lœuillet2016-05-281-1/+1
| * | Merge pull request #2052 from danbartram/feature-filter-unreadJeremy Benoist2016-05-2714-0/+50
| |\ \ | | |/ | |/|
| | * Add unread filter test to EntryControllerTestDaniel Bartram2016-05-091-0/+18
| | * Add unread filter to entries pagesDaniel Bartram2016-05-0913-0/+32
* | | Merge pull request #2142 from wallabag/v2-use-npmNicolas Lœuillet2016-06-23105-19146/+108
|\ \ \
| * | | remove block added twiceThomas Citharel2016-06-091-85/+0
| * | | manage assets through npmThomas Citharel2016-06-09123-19197/+375
* | | | Try to find bad redirection after deleteJeremy Benoist2016-06-231-3/+4
* | | | Change ManyToMany between entry & tagJeremy Benoist2016-06-234-7/+68
* | | | Display a message when saving an entry failedJeremy Benoist2016-06-2312-27/+45
* | | | Move fixtures to the right placeJeremy Benoist2016-06-232-6/+8
* | | | Fix the deletion of Tags/Entries relation when delete an entryNicolas Lœuillet2016-06-231-1/+1
* | | | Add unread filter test to EntryControllerTestDaniel Bartram2016-06-231-0/+18
* | | | Add unread filter to entries pagesDaniel Bartram2016-06-2313-0/+32
* | | | Enhance option in commandNicolas Lœuillet2016-05-271-4/+2
* | | | Add CLI import for wallabag v2 filesNicolas Lœuillet2016-05-271-1/+12
| |/ / |/| |
* | | Improve English translationPoorchop2016-05-231-11/+11
|/ /
* | Merge pull request #2097 from bmillemathias/issue_2045Nicolas Lœuillet2016-05-191-1/+1
|\ \
| * | Forgot a double quoteBaptiste Mille-Mathias2016-05-191-1/+1
| * | Fix image path in 2-factor authentification emailBaptiste Mille-Mathias2016-05-181-1/+1
* | | CSJeremy Benoist2016-05-191-4/+3
* | | Merge pull request #2092 from Rurik19/issue2089Jeremy Benoist2016-05-192-4/+92
|\ \ \ | |/ / |/| |
| * | Tests for issue #2089Yuriy Evdokimov2016-05-181-0/+88
| * | PATCH also clears starred and archived signsYuriy Evdokimov2016-05-181-2/+2
| * | Starred and Archived clears if article is already existsYuriy Evdokimov2016-05-181-2/+2
* | | 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
|/
* Fix translation for validatorsNicolas Lœuillet2016-05-0722-77/+66
* Merge pull request #2020 from wallabag/fix-number-entries-per-tagJeremy Benoist2016-05-073-2/+14
|\
| * Rename getEntriesByUser method to getEntriesByUserIdNicolas Lœuillet2016-05-043-3/+3
| * Fix number of entries in tag/listNicolas Lœuillet2016-05-033-2/+14
* | Update messages.it.ymlDaniele Conca2016-05-051-62/+62
* | Update messages.it.ymlDaniele Conca2016-05-041-131/+131
* | Add pagination bar at the bottom of the pageNicolas Lœuillet2016-05-034-21/+25
* | Fix pagination bar on small devicesNicolas Lœuillet2016-05-031-0/+3
|/
* Create messages.it.ymlDaniele Conca2016-05-031-0/+425
* Merge pull request #2013 from wallabag/fix-display-all-tagsJeremy Benoist2016-05-034-36/+6
|\
| * Remove useless methodNicolas Lœuillet2016-05-031-15/+3
| * Fix tags listingNicolas Lœuillet2016-05-024-21/+3