aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-08-286-3/+120
|\
| * Occitan versionQuent-in2016-08-271-0/+11
| | | | | | | | Occitan translation, I hope I properly put it where it has to be. If there reminds other textes to translate, please let me know!
| * Fix issue #1991: correction of the height field to add articlesAlexandr Danilov2016-08-261-0/+4
| |
| * A new version of the plugin tinydot with update on window resizeAlexandr Danilov2016-08-253-17/+81
| |
| * Changes in the login form:Alexandr Danilov2016-08-252-1/+2
| | | | | | | | | | * The alignment of the login form centered in WebKit * Indent after the reference password recovery
| * Merge pull request #2230 from modos189/issue_2055Nicolas Lœuillet2016-08-235-1/+48
| |\ | | | | | | Cut entries title in card view: continued
| | * Replacement plugin dotdotdot (6.7 KB) on my tinydot (315 bytes)Alexandr Danilov2016-08-235-773/+41
| | |
| | * Simplify the initialization of the plugin dotdotdotAlexandr Danilov2016-08-222-2/+1
| | |
| | * Added the jquery library dotdotdot ( http://dotdotdot.frebsite.nl/ ) that ↵Alexandr Danilov2016-08-225-0/+780
| | | | | | | | | | | | allows you to clip a text on the second line and fixed cut entries title in card view
| | * Don't cut entries title in card viewBaptiste Mille-Mathias2016-05-211-1/+1
| | | | | | | | | | | | Stop cutting titles arbitrary at caracter 42.
* | | Add missing translationsJeremy Benoist2016-08-2810-0/+11
| | |
* | | Add untagged entriesNicolas Lœuillet2016-08-2817-1/+57
| | | | | | | | | | | | Fix #1631
* | | Changed where page title is displayedNicolas Lœuillet2016-08-263-26/+15
| | |
* | | Add icon for public share linkNicolas Lœuillet2016-08-251-1/+1
| | |
* | | 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-2518-2/+200
|\ \ \ | | | | | | | | Share entry with a public URL
| * | | Update testJeremy Benoist2016-08-242-17/+15
| | | | | | | | | | | | | | | | and some cleanup
| * | | 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-2314-7/+70
| | | |
| * | | Add translationsNicolas Lœuillet2016-08-2312-3/+13
| | | |
| * | | Add test and fix migrationNicolas Lœuillet2016-08-231-1/+2
| | | |
| * | | Add Cache on Share ActionNicolas Lœuillet2016-08-232-3/+3
| | | |
| * | | Add migrationNicolas Lœuillet2016-08-235-4/+16
| | | |
| * | | Share entry with a public URLNicolas Lœuillet2016-08-234-1/+115
| | | |
* | | | Merge pull request #2186 from wallabag/addRegistrationJeremy Benoist2016-08-245-1/+51
|\ \ \ \ | |/ / / |/| | | Add option to disable registration
| * | | CSJeremy Benoist2016-08-232-2/+2
| | | |
| * | | Proper parameter name, simplify logic & phpdocThomas Citharel2016-08-232-5/+6
| | | |
| * | | Add option to disable registrationThomas Citharel2016-08-235-1/+50
| | | |
* | | | Remove duplicate pager on baggyJeremy Benoist2016-08-231-14/+0
| | | |
* | | | Add some testsJeremy Benoist2016-08-231-23/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-232-1/+12
| | | |
* | | | 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-2231-133/+284
|\| |
| * | 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
| * / / Avoid breaking import when fetching failJeremy Benoist2016-08-203-32/+63
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | CSJeremy Benoist2016-08-173-5/+7
| | |
| * | Fix form user display for baggy themeNicolas Lœuillet2016-08-171-1/+2
| | |