aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* CSS indentationNicolas Lœuillet2016-09-011-2/+2
|
* Fixed print view for baggy themeNicolas Lœuillet2016-08-262-21/+26
|
* Fix print / article viewsNicolas Lœuillet2016-08-262-5/+19
|
* Merge pull request #2240 from wallabag/add-icon-public-shareJeremy Benoist2016-08-262-1/+5
|\ | | | | Add icon for public share link
| * Add icon for public share linkNicolas Lœuillet2016-08-252-1/+5
|/
* Merge pull request #2237 from wallabag/add-original-url-public-entryNicolas Lœuillet2016-08-251-0/+1
|\ | | | | Add original link in public view of the article
| * Remove text about original URL in public viewNicolas Lœuillet2016-08-251-1/+1
| |
| * Add original link in public view of the articleNicolas Lœuillet2016-08-251-0/+1
|/
* Merge pull request #1904 from wallabag/feature-public-modeJeremy Benoist2016-08-2533-9/+346
|\ | | | | Share entry with a public URL
| * Update testJeremy Benoist2016-08-243-18/+41
| | | | | | | | and some cleanup
| * Handle share_entryJeremy Benoist2016-08-2411-0/+27
| | | | | | | | | | - share_entry needs to be in the migration too - and it needs a translation
| * Handle table prefix in migrationJeremy Benoist2016-08-242-7/+29
| | | | | | | | and fix migration for name field in oauth table
| * Change annotation for uuid fieldNicolas Lœuillet2016-08-241-3/+3
| |
| * Change links on baggy themeNicolas Lœuillet2016-08-231-1/+1
| |
| * Change share entry behaviorNicolas Lœuillet2016-08-2317-23/+81
| |
| * Add translationsNicolas Lœuillet2016-08-2312-3/+13
| |
| * Improve migrationNicolas Lœuillet2016-08-231-9/+7
| |
| * Add test and fix migrationNicolas Lœuillet2016-08-233-5/+51
| |
| * Add Cache on Share ActionNicolas Lœuillet2016-08-232-3/+3
| |
| * Add migrationNicolas Lœuillet2016-08-236-4/+42
| |
| * Share entry with a public URLNicolas Lœuillet2016-08-235-1/+116
| |
* | Merge pull request #2186 from wallabag/addRegistrationJeremy Benoist2016-08-249-2/+71
|\ \ | |/ |/| Add option to disable registration
| * Add simple testNicolas Lœuillet2016-08-242-1/+16
| |
| * CSJeremy Benoist2016-08-232-2/+2
| |
| * Proper parameter name, simplify logic & phpdocThomas Citharel2016-08-233-6/+7
| |
| * Add option to disable registrationThomas Citharel2016-08-237-1/+54
| |
* | Merge pull request #2218 from wallabag/api-delete-tags-1982Nicolas Lœuillet2016-08-2324-16/+357
|\ \ | |/ |/| Delete tag or tags by label
| * Remove duplicate pager on baggyJeremy Benoist2016-08-231-14/+0
| |
| * Add some testsJeremy Benoist2016-08-232-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.
| * CSThomas Citharel2016-08-232-6/+5
| |
| * Delete tag or tags by labelThomas Citharel2016-08-232-0/+74
| | | | | | | | Tests not included
| * Fix typos in field nameJeremy Benoist2016-08-231-1/+1
| |
| * added name on clientThomas Citharel2016-08-231-1/+1
| |
| * Add tests for tag list routesNicolas Lœuillet2016-08-233-1/+43
| |
| * Translations and baggy view for tagsNicolas Lœuillet2016-08-2313-5/+44
| |
| * Links on each tag in Tags viewNicolas Lœuillet2016-08-237-6/+88
|/
* Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-08-2245-153/+494
|\
| * Merge pull request #2226 from wallabag/prepare-207Nicolas Lœuillet2016-08-226-5/+22
| |\ | | | | | | Prepare wallabag 2.0.7
| | * Prepare wallabag 2.0.7Nicolas Lœuillet2016-08-226-5/+22
| |/
| * Merge pull request #2222 from wallabag/add-date-on-article-viewNicolas Lœuillet2016-08-2213-0/+55
| |\ | | | | | | Added creation date and reading time on article view
| | * Display text on baggyJeremy Benoist2016-08-2113-5/+20
| | | | | | | | | | | | Instead of using icons (which aren't available) display real text for reading time & creation date
| | * Changed code indentationNicolas Lœuillet2016-08-182-6/+14
| | |
| | * Added creation date and reading time on article viewNicolas Lœuillet2016-08-1813-0/+32
| | | | | | | | | | | | Fix #2034
| * | Merge pull request #2221 from wallabag/replace-favorite-starJeremy Benoist2016-08-2116-22/+22
| |\ \ | | | | | | | | Replaced favorite word/icon with star one
| | * | Fixed some translationsNicolas Lœuillet2016-08-183-4/+4
| | | |
| | * | Replaced favorite word/icon with star oneNicolas Lœuillet2016-08-1816-22/+22
| | |/ | | | | | | | | | Fix #2041
| * | Merge pull request #2224 from wallabag/avoid-exception-importThomas Citharel2016-08-206-32/+154
| |\ \ | | |/ | |/| Avoid breaking import when fetching fail
| | * Avoid breaking import when fetching failJeremy Benoist2016-08-206-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/masterJeremy Benoist2016-08-181-1/+1
| |\ | | | | | | Enable PATCH method for CORS in API part
| | * Enable PATCH method for CORS in API partRurik192016-08-181-1/+1
| | |