Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into 2.1 | Jeremy Benoist | 2016-06-23 | 46 | -6063/+20 |
|\ | |||||
| * | Merge pull request #2157 from wallabag/lower-upper-readingtime | Jeremy Benoist | 2016-06-23 | 1 | -7/+16 |
| |\ | |||||
| | * | fixup! Handle only upper or only lower reading filter | Jeremy Benoist | 2016-06-23 | 1 | -2/+2 |
| | * | Handle only upper or only lower reading filter | Jeremy Benoist | 2016-06-23 | 1 | -7/+16 |
| * | | Fix a few french translations typos | Thomas Citharel | 2016-06-23 | 1 | -4/+4 |
| |/ | |||||
| * | Jump to Symfony 3.1 | Jeremy Benoist | 2016-06-22 | 45 | -6058/+0 |
| * | Try to find bad redirection after delete | Jeremy Benoist | 2016-06-17 | 1 | -3/+4 |
| * | Merge pull request #2122 from wallabag/fix-tags-deletion | Nicolas Lœuillet | 2016-05-31 | 17 | -41/+122 |
| |\ | |||||
| | * | Change ManyToMany between entry & tag | Jeremy Benoist | 2016-05-31 | 4 | -7/+68 |
| | * | Display a message when saving an entry failed | Jeremy Benoist | 2016-05-30 | 12 | -27/+45 |
| | * | Move fixtures to the right place | Jeremy Benoist | 2016-05-30 | 2 | -6/+8 |
| | * | Fix the deletion of Tags/Entries relation when delete an entry | Nicolas Lœuillet | 2016-05-28 | 1 | -1/+1 |
| * | | Merge pull request #2052 from danbartram/feature-filter-unread | Jeremy Benoist | 2016-05-27 | 14 | -0/+50 |
| |\ \ | | |/ | |/| | |||||
| | * | Add unread filter test to EntryControllerTest | Daniel Bartram | 2016-05-09 | 1 | -0/+18 |
| | * | Add unread filter to entries pages | Daniel Bartram | 2016-05-09 | 13 | -0/+32 |
* | | | Merge pull request #2142 from wallabag/v2-use-npm | Nicolas Lœuillet | 2016-06-23 | 105 | -19146/+108 |
|\ \ \ | |||||
| * | | | remove block added twice | Thomas Citharel | 2016-06-09 | 1 | -85/+0 |
| * | | | manage assets through npm | Thomas Citharel | 2016-06-09 | 123 | -19197/+375 |
* | | | | Try to find bad redirection after delete | Jeremy Benoist | 2016-06-23 | 1 | -3/+4 |
* | | | | Change ManyToMany between entry & tag | Jeremy Benoist | 2016-06-23 | 4 | -7/+68 |
* | | | | Display a message when saving an entry failed | Jeremy Benoist | 2016-06-23 | 12 | -27/+45 |
* | | | | Move fixtures to the right place | Jeremy Benoist | 2016-06-23 | 2 | -6/+8 |
* | | | | Fix the deletion of Tags/Entries relation when delete an entry | Nicolas Lœuillet | 2016-06-23 | 1 | -1/+1 |
* | | | | Add unread filter test to EntryControllerTest | Daniel Bartram | 2016-06-23 | 1 | -0/+18 |
* | | | | Add unread filter to entries pages | Daniel Bartram | 2016-06-23 | 13 | -0/+32 |
* | | | | Enhance option in command | Nicolas Lœuillet | 2016-05-27 | 1 | -4/+2 |
* | | | | Add CLI import for wallabag v2 files | Nicolas Lœuillet | 2016-05-27 | 1 | -1/+12 |
| |/ / |/| | | |||||
* | | | Improve English translation | Poorchop | 2016-05-23 | 1 | -11/+11 |
|/ / | |||||
* | | Merge pull request #2097 from bmillemathias/issue_2045 | Nicolas Lœuillet | 2016-05-19 | 1 | -1/+1 |
|\ \ | |||||
| * | | Forgot a double quote | Baptiste Mille-Mathias | 2016-05-19 | 1 | -1/+1 |
| * | | Fix image path in 2-factor authentification email | Baptiste Mille-Mathias | 2016-05-18 | 1 | -1/+1 |
* | | | CS | Jeremy Benoist | 2016-05-19 | 1 | -4/+3 |
* | | | Merge pull request #2092 from Rurik19/issue2089 | Jeremy Benoist | 2016-05-19 | 2 | -4/+92 |
|\ \ \ | |/ / |/| | | |||||
| * | | Tests for issue #2089 | Yuriy Evdokimov | 2016-05-18 | 1 | -0/+88 |
| * | | PATCH also clears starred and archived signs | Yuriy Evdokimov | 2016-05-18 | 1 | -2/+2 |
| * | | Starred and Archived clears if article is already exists | Yuriy Evdokimov | 2016-05-18 | 1 | -2/+2 |
* | | | Replace vertical dots in material theme with horizontal dots | Nicolas Lœuillet | 2016-05-18 | 1 | -1/+1 |
|/ / | |||||
* / | Do not specify language in Firefox addon link | Merouane Atig | 2016-05-13 | 1 | -1/+1 |
|/ | |||||
* | Fix translation for validators | Nicolas Lœuillet | 2016-05-07 | 22 | -77/+66 |
* | Merge pull request #2020 from wallabag/fix-number-entries-per-tag | Jeremy Benoist | 2016-05-07 | 3 | -2/+14 |
|\ | |||||
| * | Rename getEntriesByUser method to getEntriesByUserId | Nicolas Lœuillet | 2016-05-04 | 3 | -3/+3 |
| * | Fix number of entries in tag/list | Nicolas Lœuillet | 2016-05-03 | 3 | -2/+14 |
* | | Update messages.it.yml | Daniele Conca | 2016-05-05 | 1 | -62/+62 |
* | | Update messages.it.yml | Daniele Conca | 2016-05-04 | 1 | -131/+131 |
* | | Add pagination bar at the bottom of the page | Nicolas Lœuillet | 2016-05-03 | 4 | -21/+25 |
* | | Fix pagination bar on small devices | Nicolas Lœuillet | 2016-05-03 | 1 | -0/+3 |
|/ | |||||
* | Create messages.it.yml | Daniele Conca | 2016-05-03 | 1 | -0/+425 |
* | Merge pull request #2013 from wallabag/fix-display-all-tags | Jeremy Benoist | 2016-05-03 | 4 | -36/+6 |
|\ | |||||
| * | Remove useless method | Nicolas Lœuillet | 2016-05-03 | 1 | -15/+3 |
| * | Fix tags listing | Nicolas Lœuillet | 2016-05-02 | 4 | -21/+3 |