Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2240 from wallabag/add-icon-public-share | Jeremy Benoist | 2016-08-26 | 2 | -1/+5 |
|\ | | | | | Add icon for public share link | ||||
| * | Add icon for public share link | Nicolas Lœuillet | 2016-08-25 | 2 | -1/+5 |
|/ | |||||
* | Merge pull request #2237 from wallabag/add-original-url-public-entry | Nicolas Lœuillet | 2016-08-25 | 1 | -0/+1 |
|\ | | | | | Add original link in public view of the article | ||||
| * | Remove text about original URL in public view | Nicolas Lœuillet | 2016-08-25 | 1 | -1/+1 |
| | | |||||
| * | Add original link in public view of the article | Nicolas Lœuillet | 2016-08-25 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #1904 from wallabag/feature-public-mode | Jeremy Benoist | 2016-08-25 | 33 | -9/+346 |
|\ | | | | | Share entry with a public URL | ||||
| * | Update test | Jeremy Benoist | 2016-08-24 | 3 | -18/+41 |
| | | | | | | | | and some cleanup | ||||
| * | Handle share_entry | Jeremy Benoist | 2016-08-24 | 11 | -0/+27 |
| | | | | | | | | | | - share_entry needs to be in the migration too - and it needs a translation | ||||
| * | Handle table prefix in migration | Jeremy Benoist | 2016-08-24 | 2 | -7/+29 |
| | | | | | | | | and fix migration for name field in oauth table | ||||
| * | Change annotation for uuid field | Nicolas Lœuillet | 2016-08-24 | 1 | -3/+3 |
| | | |||||
| * | Change links on baggy theme | Nicolas Lœuillet | 2016-08-23 | 1 | -1/+1 |
| | | |||||
| * | Change share entry behavior | Nicolas Lœuillet | 2016-08-23 | 17 | -23/+81 |
| | | |||||
| * | Add translations | Nicolas Lœuillet | 2016-08-23 | 12 | -3/+13 |
| | | |||||
| * | Improve migration | Nicolas Lœuillet | 2016-08-23 | 1 | -9/+7 |
| | | |||||
| * | Add test and fix migration | Nicolas Lœuillet | 2016-08-23 | 3 | -5/+51 |
| | | |||||
| * | Add Cache on Share Action | Nicolas Lœuillet | 2016-08-23 | 2 | -3/+3 |
| | | |||||
| * | Add migration | Nicolas Lœuillet | 2016-08-23 | 6 | -4/+42 |
| | | |||||
| * | Share entry with a public URL | Nicolas Lœuillet | 2016-08-23 | 5 | -1/+116 |
| | | |||||
* | | Merge pull request #2186 from wallabag/addRegistration | Jeremy Benoist | 2016-08-24 | 9 | -2/+71 |
|\ \ | |/ |/| | Add option to disable registration | ||||
| * | Add simple test | Nicolas Lœuillet | 2016-08-24 | 2 | -1/+16 |
| | | |||||
| * | CS | Jeremy Benoist | 2016-08-23 | 2 | -2/+2 |
| | | |||||
| * | Proper parameter name, simplify logic & phpdoc | Thomas Citharel | 2016-08-23 | 3 | -6/+7 |
| | | |||||
| * | Add option to disable registration | Thomas Citharel | 2016-08-23 | 7 | -1/+54 |
| | | |||||
* | | Merge pull request #2218 from wallabag/api-delete-tags-1982 | Nicolas Lœuillet | 2016-08-23 | 24 | -16/+357 |
|\ \ | |/ |/| | Delete tag or tags by label | ||||
| * | Remove duplicate pager on baggy | Jeremy Benoist | 2016-08-23 | 1 | -14/+0 |
| | | |||||
| * | Add some tests | Jeremy Benoist | 2016-08-23 | 2 | -26/+145 |
| | | | | | | | | | | | | | | | | | | | | | | Also, retrieve tag from the request instead of the query (which will be the same but it's more easy to test). Moved down `deleteTagAction` because it conflicted with the new action: api_delete_tag => /api/tags/{tag}.{_format} api_delete_tags_label => /api/tags/label.{_format} And finally, throw exception when a tag is not found before removing it. | ||||
| * | CS | Thomas Citharel | 2016-08-23 | 2 | -6/+5 |
| | | |||||
| * | Delete tag or tags by label | Thomas Citharel | 2016-08-23 | 2 | -0/+74 |
| | | | | | | | | Tests not included | ||||
| * | 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 | ||||
| | * | 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 |
| |\ | | | | | | | Added creation date and reading time on article view | ||||
| | * | Display text on baggy | Jeremy Benoist | 2016-08-21 | 13 | -5/+20 |
| | | | | | | | | | | | | Instead of using icons (which aren't available) display real text for reading time & creation date | ||||
| | * | 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 |
| | | | | | | | | | | | | Fix #2034 | ||||
| * | | Merge pull request #2221 from wallabag/replace-favorite-star | Jeremy Benoist | 2016-08-21 | 16 | -22/+22 |
| |\ \ | | | | | | | | | Replaced favorite word/icon with star one | ||||
| | * | | 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 |
| | |/ | | | | | | | | | | Fix #2041 | ||||
| * | | Merge pull request #2224 from wallabag/avoid-exception-import | Thomas Citharel | 2016-08-20 | 6 | -32/+154 |
| |\ \ | | |/ | |/| | Avoid breaking import when fetching fail | ||||
| | * | Avoid breaking import when fetching fail | Jeremy Benoist | 2016-08-20 | 6 | -32/+154 |
| |/ | | | | | | | | | | | | | | | | | graby will throw an Exception in some case (like a bad url, a restricted url or a secured pdf). Import doesn't handle that case and break the whole import. With that commit the import isn't stopped but the entry is just skipped. Also, as a bonus, I've added extra test on WallabagImportV2 when the json is empty. | ||||
| * | Merge pull request #2220 from Rurik19/master | Jeremy Benoist | 2016-08-18 | 1 | -1/+1 |
| |\ | | | | | | | Enable PATCH method for CORS in API part | ||||
| | * | 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 | ||||
| | * | | Run tests on an uptodate HHVM | Jeremy Benoist | 2016-08-17 | 1 | -7/+23 |
| |/ / | | | | | | | | | | Using some tricks from symfony/symfony | ||||
| * | | Merge pull request #2095 from wallabag/fix-2auth-form | Jeremy Benoist | 2016-08-17 | 7 | -10/+32 |
| |\ \ | | | | | | | | | Fix form user display when 2FA is disabled |