Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2218 from wallabag/api-delete-tags-1982 | Nicolas Lœuillet | 2016-08-23 | 24 | -16/+357 |
|\ | |||||
| * | Remove duplicate pager on baggy | Jeremy Benoist | 2016-08-23 | 1 | -14/+0 |
| * | Add some tests | Jeremy Benoist | 2016-08-23 | 2 | -26/+145 |
| * | CS | Thomas Citharel | 2016-08-23 | 2 | -6/+5 |
| * | Delete tag or tags by label | Thomas Citharel | 2016-08-23 | 2 | -0/+74 |
| * | Fix typos in field name | Jeremy Benoist | 2016-08-23 | 1 | -1/+1 |
| * | added name on client | Thomas Citharel | 2016-08-23 | 1 | -1/+1 |
| * | Add tests for tag list routes | Nicolas Lœuillet | 2016-08-23 | 3 | -1/+43 |
| * | Translations and baggy view for tags | Nicolas Lœuillet | 2016-08-23 | 13 | -5/+44 |
| * | Links on each tag in Tags view | Nicolas Lœuillet | 2016-08-23 | 7 | -6/+88 |
|/ | |||||
* | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-08-22 | 45 | -153/+494 |
|\ | |||||
| * | Merge pull request #2226 from wallabag/prepare-207 | Nicolas Lœuillet | 2016-08-22 | 6 | -5/+22 |
| |\ | |||||
| | * | Prepare wallabag 2.0.7 | Nicolas Lœuillet | 2016-08-22 | 6 | -5/+22 |
| |/ | |||||
| * | Merge pull request #2222 from wallabag/add-date-on-article-view | Nicolas Lœuillet | 2016-08-22 | 13 | -0/+55 |
| |\ | |||||
| | * | Display text on baggy | Jeremy Benoist | 2016-08-21 | 13 | -5/+20 |
| | * | Changed code indentation | Nicolas Lœuillet | 2016-08-18 | 2 | -6/+14 |
| | * | Added creation date and reading time on article view | Nicolas Lœuillet | 2016-08-18 | 13 | -0/+32 |
| * | | Merge pull request #2221 from wallabag/replace-favorite-star | Jeremy Benoist | 2016-08-21 | 16 | -22/+22 |
| |\ \ | |||||
| | * | | Fixed some translations | Nicolas Lœuillet | 2016-08-18 | 3 | -4/+4 |
| | * | | Replaced favorite word/icon with star one | Nicolas Lœuillet | 2016-08-18 | 16 | -22/+22 |
| | |/ | |||||
| * | | Merge pull request #2224 from wallabag/avoid-exception-import | Thomas Citharel | 2016-08-20 | 6 | -32/+154 |
| |\ \ | | |/ | |/| | |||||
| | * | Avoid breaking import when fetching fail | Jeremy Benoist | 2016-08-20 | 6 | -32/+154 |
| |/ | |||||
| * | Merge pull request #2220 from Rurik19/master | Jeremy Benoist | 2016-08-18 | 1 | -1/+1 |
| |\ | |||||
| | * | Enable PATCH method for CORS in API part | Rurik19 | 2016-08-18 | 1 | -1/+1 |
| * | | Merge pull request #2134 from wallabag/hhvm | Jeremy Benoist | 2016-08-17 | 1 | -7/+23 |
| |\ \ | |||||
| | * | | Run tests on an uptodate HHVM | Jeremy Benoist | 2016-08-17 | 1 | -7/+23 |
| |/ / | |||||
| * | | 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 |
| |/ / | |||||
* | | | Added name on client | Thomas Citharel | 2016-08-22 | 13 | -24/+110 |
* | | | Upgrade PHPUnit to version 5 | Jeremy Benoist | 2016-08-22 | 3 | -2/+7 |
* | | | Merge pull request #2202 from wallabag/fix-phpdoc | Jeremy Benoist | 2016-07-24 | 1 | -0/+2 |
|\ \ \ |