Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2095 from wallabag/fix-2auth-form | Jeremy Benoist | 2016-08-17 | 7 | -10/+32 |
|\ | |||||
| * | CS | Jeremy Benoist | 2016-08-17 | 3 | -5/+7 |
| * | Fix tests | Jeremy Benoist | 2016-08-17 | 2 | -3/+22 |
| * | Fix form user display for baggy theme | Nicolas Lœuillet | 2016-08-17 | 1 | -1/+2 |
| * | Fix form user display when 2FA is disabled | Nicolas Lœuillet | 2016-08-17 | 1 | -1/+1 |
* | | Disable autobranch & commit | Jeremy Benoist | 2016-08-17 | 1 | -0/+2 |
* | | Enable Zappr | Jeremy Benoist | 2016-08-17 | 1 | -0/+24 |
|/ | |||||
* | Merge pull request #2216 from Rurik19/master | Nicolas Lœuillet | 2016-08-16 | 1 | -0/+5 |
|\ | |||||
| * | Enable CORS headers for OAUTH part | Rurik19 | 2016-08-12 | 1 | -0/+5 |
* | | Changed URL for scrutinizer in README | Nicolas Lœuillet | 2016-08-11 | 1 | -1/+1 |
* | | Merge pull request #2212 from wallabag/prepare-206 | Nicolas Lœuillet | 2016-08-10 | 6 | -6/+22 |
|\ \ | |||||
| * | | Prepare release 2.0.6 | Nicolas Lœuillet | 2016-08-10 | 6 | -6/+22 |
|/ / | |||||
* | | Merge pull request #2200 from charno6/patch-1 | Thomas Citharel | 2016-07-23 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fixed typo in entry:notice:entry_saved | charno6 | 2016-07-23 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #2199 from Simounet/facto/social-links | Jeremy Benoist | 2016-07-21 | 8 | -52/+95 |
|\ \ | |||||
| * | | php-cs-fixer pass | Simounet | 2016-07-20 | 2 | -2/+4 |
| * | | Chrome extension URL updated | Simounet | 2016-07-20 | 1 | -1/+1 |
| * | | Handling socials links into a config file | Simounet | 2016-07-20 | 8 | -52/+93 |
* | | | Merge pull request #2198 from Simounet/fix/image-inside-figure | Thomas Citharel | 2016-07-20 | 2 | -2/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | FIX image inside a figure element max-width (baggy theme) | Simounet | 2016-07-20 | 1 | -1/+1 |
| * | | FIX image inside a figure element max-width | Simounet | 2016-07-20 | 1 | -1/+2 |
|/ / | |||||
* | | 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 #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 |