aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2169 from wallabag/fix-fontsJeremy Benoist2016-06-242-2/+3
|\
| * fix font pathsThomas Citharel2016-06-232-2/+3
|/
* Merge pull request #2168 from wallabag/fix-npm-dep-old-nodejsNicolas Lœuillet2016-06-231-1/+3
|\
| * Add modules when NodeJS versions are too low.Thomas Citharel2016-06-231-1/+3
|/
* Merge branch 'master' into 2.1Jeremy Benoist2016-06-2354-102/+133
|\
| * Merge pull request #2157 from wallabag/lower-upper-readingtimeJeremy Benoist2016-06-232-7/+52
| |\
| | * Add some tests about readingTimeJeremy Benoist2016-06-231-0/+36
| | * 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
| * | Merge pull request #2165 from wallabag/translation-typosJeremy Benoist2016-06-231-4/+4
| |\ \ | | |/ | |/|
| | * Fix a few french translations typosThomas Citharel2016-06-231-4/+4
| |/
| * Merge pull request #2132 from wallabag/sf3.1Nicolas Lœuillet2016-06-2353-91/+77
| |\
| | * Fix bad loading fixturesJeremy Benoist2016-06-221-0/+1
| | * Jump to Symfony 3.1Jeremy Benoist2016-06-2253-91/+76
| |/
| * Merge pull request #2160 from wallabag/bin-cs-fixerNicolas Lœuillet2016-06-201-1/+1
| |\
| | * Update symlink to php-cs-fixerJeremy Benoist2016-06-201-1/+1
| |/
| * Merge pull request #2155 from wallabag/php-cs-fixerNicolas Lœuillet2016-06-201-1/+1
| |\
| | * Use friendsofphp instead of fabpotJeremy Benoist2016-06-171-1/+1
| * | Merge pull request #2156 from wallabag/delete-redirectNicolas Lœuillet2016-06-201-3/+4
| |\ \ | | |/ | |/|
| | * Try to find bad redirection after deleteJeremy Benoist2016-06-171-3/+4
| |/
| * Merge pull request #2148 from wallabag/start-german-docuJeremy Benoist2016-06-1623-2/+1443
| |\
| | * translate documentation to GermanSven Fischer2016-06-1623-2/+1443
| * | Merge pull request #2145 from even-allmighty/masterJeremy Benoist2016-06-131-1/+1
| |\|
| | * Corrected Regex for lighttpd rewriteEven Allmighty2016-06-131-1/+1
| |/
| * Merge pull request #2118 from wallabag/prepare-205Nicolas Lœuillet2016-05-315-4/+24
| |\
| | * Prepare wallabag 2.0.5Nicolas Lœuillet2016-05-315-5/+25
| * | 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-23135-17886/+2755
|\ \ \ \
| * | | | trailing commaThomas Citharel2016-06-091-1/+1
| * | | | remove block added twiceThomas Citharel2016-06-091-85/+0
| * | | | clean & lint stuffThomas Citharel2016-06-0911-390/+391
| * | | | manage assets through npmThomas Citharel2016-06-09160-17580/+2743
* | | | | Update symlink to php-cs-fixerJeremy Benoist2016-06-231-1/+1
* | | | | Try to find bad redirection after deleteJeremy Benoist2016-06-231-3/+4
* | | | | Use friendsofphp instead of fabpotJeremy Benoist2016-06-231-1/+1
* | | | | translate documentation to GermanSven Fischer2016-06-2323-2/+1443
* | | | | Corrected Regex for lighttpd rewriteEven Allmighty2016-06-231-1/+1
* | | | | Prepare wallabag 2.0.5Nicolas Lœuillet2016-06-235-4/+24
* | | | | 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