Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2202 from wallabag/fix-phpdoc | Jeremy Benoist | 2016-07-24 | 1 | -0/+2 |
|\ | |||||
| * | add some missing phpdoc parameters | Thomas Citharel | 2016-07-24 | 1 | -0/+2 |
|/ | |||||
* | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-07-20 | 26 | -64/+149 |
|\ | |||||
| * | Merge pull request #2195 from wallabag/remove-bin | Nicolas Lœuillet | 2016-07-20 | 10 | -9/+6 |
| |\ | |||||
| | * | Remove binary from repo | Jeremy Benoist | 2016-07-20 | 10 | -9/+6 |
| |/ | |||||
| * | Merge pull request #2048 from wallabag/travis-php-7.1 | Nicolas Lœuillet | 2016-07-19 | 3 | -2/+3 |
| |\ | |||||
| | * | Run PHP 7.1 on Travis | Jeremy Benoist | 2016-07-18 | 3 | -2/+3 |
| * | | Merge pull request #2194 from benages/patch-2 | Jeremy Benoist | 2016-07-18 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | Fixed spelling Artúclos --> Artículos | benages | 2016-07-18 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #2185 from wallabag/fix-3rd-party-links | Thomas Citharel | 2016-07-02 | 1 | -2/+2 |
| |\ | |||||
| | * | Remove fr part | Thomas Citharel | 2016-07-02 | 1 | -1/+1 |
| | * | Fix 3rd-Party Apps links (Chrome & Firefox) | Thomas Citharel | 2016-07-02 | 1 | -2/+2 |
| |/ | |||||
| * | Merge pull request #2172 from wallabag/more-tests | Nicolas Lœuillet | 2016-06-24 | 11 | -51/+138 |
| |\ | |||||
| | * | Change the way to login user in tests | Jeremy Benoist | 2016-06-24 | 6 | -9/+90 |
| | * | Remove useless spaces | Jeremy Benoist | 2016-06-24 | 6 | -42/+48 |
| |/ | |||||
* | | Merge pull request #2183 from wallabag/tags-entries-view-baggy | Jeremy Benoist | 2016-07-18 | 4 | -75/+137 |
|\ \ | |||||
| * | | Bring tags on entries view to baggy | Thomas Citharel | 2016-07-01 | 4 | -75/+137 |
|/ / | |||||
* | | Merge pull request #2174 from wallabag/api-filter-tags | Nicolas Lœuillet | 2016-07-01 | 3 | -2/+32 |
|\ \ | |||||
| * | | fix merge issue | Thomas Citharel | 2016-06-29 | 1 | -1/+2 |
| * | | Add filter for tags on API | Thomas Citharel | 2016-06-29 | 3 | -2/+31 |
|/ / | |||||
* | | Merge pull request #2176 from wallabag/add-since-parameter | Nicolas Lœuillet | 2016-06-29 | 3 | -2/+53 |
|\ \ | |||||
| * | | CS | Thomas Citharel | 2016-06-25 | 1 | -1/+1 |
| * | | Add since parameter | Thomas Citharel | 2016-06-25 | 3 | -2/+53 |
|/ / | |||||
* | | 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 |
| |\ |