| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #2170 from wallabag/addTagsOnEntriesView | Nicolas Lœuillet | 2016-06-24 | 14 | -5/+75 |
|\ |
|
| * | uniformize tags on article view too | Thomas Citharel | 2016-06-24 | 1 | -2/+3 |
| * | add line to other languages | Thomas Citharel | 2016-06-24 | 9 | -0/+9 |
| * | minor ui fixes | Thomas Citharel | 2016-06-23 | 2 | -5/+6 |
| * | fix typo on icons | Thomas Citharel | 2016-06-23 | 1 | -2/+2 |
| * | Add tags on entries view | Thomas Citharel | 2016-06-23 | 4 | -0/+59 |
* | | Merge pull request #2169 from wallabag/fix-fonts | Jeremy Benoist | 2016-06-24 | 2 | -2/+3 |
|\ \
| |/
|/| |
|
| * | fix font paths | Thomas Citharel | 2016-06-23 | 2 | -2/+3 |
|/ |
|
* | Merge pull request #2168 from wallabag/fix-npm-dep-old-nodejs | Nicolas Lœuillet | 2016-06-23 | 1 | -1/+3 |
|\ |
|
| * | Add modules when NodeJS versions are too low. | Thomas Citharel | 2016-06-23 | 1 | -1/+3 |
|/ |
|
* | Merge branch 'master' into 2.1 | Jeremy Benoist | 2016-06-23 | 54 | -102/+133 |
|\ |
|
| * | Merge pull request #2157 from wallabag/lower-upper-readingtime | Jeremy Benoist | 2016-06-23 | 2 | -7/+52 |
| |\ |
|
| | * | Add some tests about readingTime | Jeremy Benoist | 2016-06-23 | 1 | -0/+36 |
| | * | 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 |
| * | | Merge pull request #2165 from wallabag/translation-typos | Jeremy Benoist | 2016-06-23 | 1 | -4/+4 |
| |\ \
| | |/
| |/| |
|
| | * | Fix a few french translations typos | Thomas Citharel | 2016-06-23 | 1 | -4/+4 |
| |/ |
|
| * | Merge pull request #2132 from wallabag/sf3.1 | Nicolas Lœuillet | 2016-06-23 | 53 | -91/+77 |
| |\ |
|
| | * | Fix bad loading fixtures | Jeremy Benoist | 2016-06-22 | 1 | -0/+1 |
| | * | Jump to Symfony 3.1 | Jeremy Benoist | 2016-06-22 | 53 | -91/+76 |
| |/ |
|
| * | Merge pull request #2160 from wallabag/bin-cs-fixer | Nicolas Lœuillet | 2016-06-20 | 1 | -1/+1 |
| |\ |
|
| | * | Update symlink to php-cs-fixer | Jeremy Benoist | 2016-06-20 | 1 | -1/+1 |
| |/ |
|
| * | Merge pull request #2155 from wallabag/php-cs-fixer | Nicolas Lœuillet | 2016-06-20 | 1 | -1/+1 |
| |\ |
|
| | * | Use friendsofphp instead of fabpot | Jeremy Benoist | 2016-06-17 | 1 | -1/+1 |
| * | | Merge pull request #2156 from wallabag/delete-redirect | Nicolas Lœuillet | 2016-06-20 | 1 | -3/+4 |
| |\ \
| | |/
| |/| |
|
| | * | Try to find bad redirection after delete | Jeremy Benoist | 2016-06-17 | 1 | -3/+4 |
| |/ |
|
| * | Merge pull request #2148 from wallabag/start-german-docu | Jeremy Benoist | 2016-06-16 | 23 | -2/+1443 |
| |\ |
|
| | * | translate documentation to German | Sven Fischer | 2016-06-16 | 23 | -2/+1443 |
| * | | Merge pull request #2145 from even-allmighty/master | Jeremy Benoist | 2016-06-13 | 1 | -1/+1 |
| |\| |
|
| | * | Corrected Regex for lighttpd rewrite | Even Allmighty | 2016-06-13 | 1 | -1/+1 |
| |/ |
|
| * | Merge pull request #2118 from wallabag/prepare-205 | Nicolas Lœuillet | 2016-05-31 | 5 | -4/+24 |
| |\ |
|
| | * | Prepare wallabag 2.0.5 | Nicolas Lœuillet | 2016-05-31 | 5 | -5/+25 |
| * | | 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 | 135 | -17886/+2755 |
|\ \ \ \ |
|
| * | | | | trailing comma | Thomas Citharel | 2016-06-09 | 1 | -1/+1 |
| * | | | | remove block added twice | Thomas Citharel | 2016-06-09 | 1 | -85/+0 |
| * | | | | clean & lint stuff | Thomas Citharel | 2016-06-09 | 11 | -390/+391 |
| * | | | | manage assets through npm | Thomas Citharel | 2016-06-09 | 160 | -17580/+2743 |
* | | | | | Update symlink to php-cs-fixer | Jeremy Benoist | 2016-06-23 | 1 | -1/+1 |
* | | | | | Try to find bad redirection after delete | Jeremy Benoist | 2016-06-23 | 1 | -3/+4 |
* | | | | | Use friendsofphp instead of fabpot | Jeremy Benoist | 2016-06-23 | 1 | -1/+1 |
* | | | | | translate documentation to German | Sven Fischer | 2016-06-23 | 23 | -2/+1443 |
* | | | | | Corrected Regex for lighttpd rewrite | Even Allmighty | 2016-06-23 | 1 | -1/+1 |