aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #2183 from wallabag/tags-entries-view-baggyJeremy Benoist2016-07-184-75/+137
|\ \ \ \
| * | | | Bring tags on entries view to baggyThomas Citharel2016-07-014-75/+137
|/ / / /
* | | | Merge pull request #2174 from wallabag/api-filter-tagsNicolas Lœuillet2016-07-013-2/+32
|\ \ \ \
| * | | | fix merge issueThomas Citharel2016-06-291-1/+2
| * | | | Add filter for tags on APIThomas Citharel2016-06-293-2/+31
|/ / / /
* | | | Merge pull request #2176 from wallabag/add-since-parameterNicolas Lœuillet2016-06-293-2/+53
|\ \ \ \
| * | | | CSThomas Citharel2016-06-251-1/+1
| * | | | Add since parameterThomas Citharel2016-06-253-2/+53
|/ / / /
* | | | Merge pull request #2170 from wallabag/addTagsOnEntriesViewNicolas Lœuillet2016-06-2414-5/+75
|\ \ \ \
| * | | | uniformize tags on article view tooThomas Citharel2016-06-241-2/+3
| * | | | add line to other languagesThomas Citharel2016-06-249-0/+9
| * | | | minor ui fixesThomas Citharel2016-06-232-5/+6
| * | | | fix typo on iconsThomas Citharel2016-06-231-2/+2
| * | | | Add tags on entries viewThomas Citharel2016-06-234-0/+59
* | | | | 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