Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Run PHP 7.1 on Travis | Jeremy Benoist | 2016-07-18 | 3 | -2/+3 |
* | 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 #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 #2112 from Poorchop/docs-proposal | Nicolas Lœuillet | 2016-05-26 | 2 | -19/+78 |
|\ \ \ | |||||
| * | | | Update installation instructions | Poorchop | 2016-05-23 | 1 | -11/+57 |
| * | | | Update FAQ | Poorchop | 2016-05-23 | 1 | -8/+21 |
| | |/ | |/| | |||||
* | | | Merge pull request #2111 from wallabag/translate-android-docu-pics-to-english | Nicolas Lœuillet | 2016-05-24 | 11 | -10/+10 |
|\ \ \ | |/ / |/| | | |||||
| * | | add screenshots of android docu in English | Sven Fischer | 2016-05-23 | 11 | -10/+10 |
|/ / | |||||
* | | Merge pull request #2109 from Poorchop/grammar | Nicolas Lœuillet | 2016-05-23 | 1 | -11/+11 |
|\ \ | |||||
| * | | 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 |
* | | | Merge pull request #2098 from wallabag/cs-2092 | Nicolas Lœuillet | 2016-05-19 | 1 | -4/+3 |
|\ \ \ | |||||
| * | | | 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 |