aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2333 from wallabag/translation-german-for-2.1Jeremy Benoist2016-10-031-51/+51
|\
| * Update messages.de.ymlJeremy Benoist2016-10-031-1/+1
| * Fixed typosNicolas Lœuillet2016-10-031-2/+1
| * Better translation for the weird sentenceJulian Oster2016-10-021-1/+2
| * Improve the german translation a bitJulian Oster2016-10-021-10/+10
| * translate all strings to German, which haven't been translated yetSven Fischer2016-10-021-51/+51
* | Merge pull request #2314 from wallabag/assetsNicolas Lœuillet2016-10-033-21/+3
|\ \ | |/ |/|
| * Assets workThomas Citharel2016-09-283-21/+3
* | Merge pull request #2331 from wallabag/api-linksThomas Citharel2016-10-022-3/+16
|\ \
| * | Fix parameters in API _linksJeremy Benoist2016-10-022-3/+16
* | | Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-10-021-1/+1
|\ \ \ | |/ / |/| |
| * | Remove error message when creating ePub versionsPaulino Michelazzo2016-10-021-1/+1
* | | Merge pull request #2327 from wallabag/user-managementJeremy Benoist2016-10-0227-232/+829
|\ \ \
| * | | Disabled delete button for the logged userJeremy Benoist2016-10-021-1/+1
| * | | Cleanup & add link on baggy menuJeremy Benoist2016-10-023-60/+1
| * | | Add users management UIJeremy Benoist2016-10-0226-223/+879
* | | | Merge pull request #2325 from wallabag/api-entries-existsNicolas Lœuillet2016-10-021-0/+32
|\ \ \ \
| * | | | CSJeremy Benoist2016-10-021-1/+1
| * | | | Add an exists endpoint in APIJeremy Benoist2016-10-011-0/+32
* | | | | Merge pull request #2328 from wallabag/avoid-duplicate-urlNicolas Lœuillet2016-10-021-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Avoid duplicate url with accentsJeremy Benoist2016-10-011-1/+1
| |/ / /
* | | | Merge pull request #2326 from wallabag/update-quickstartJeremy Benoist2016-10-0212-50/+168
|\ \ \ \
| * | | | Fixed french translationNicolas Lœuillet2016-10-011-3/+3
| * | | | Changed translationsNicolas Lœuillet2016-10-0111-10/+11
| * | | | Changed quickstart layoutNicolas Lœuillet2016-10-0112-50/+167
* | | | | Merge pull request #2324 from wallabag/edit-tagging-ruleJeremy Benoist2016-10-0213-4/+58
|\ \ \ \ \
| * | | | | CSJeremy Benoist2016-10-011-2/+2
| * | | | | Introduce validateRuleActionJeremy Benoist2016-10-011-5/+13
| * | | | | Add ability to edit a tagging ruleJeremy Benoist2016-10-0113-1/+47
| | |/ / / | |/| | |
* | | | | Merge pull request #2323 from wallabag/footer-statsJeremy Benoist2016-10-0213-4/+64
|\ \ \ \ \
| * | | | | Add simple stats in footerJeremy Benoist2016-10-0113-4/+64
| | |/ / / | |/| | |
* | | | | Fix OC typosJeremy Benoist2016-10-0211-20/+20
* | | | | Occitan version updateQuent-in2016-10-011-24/+26
| |/ / / |/| | |
* | | | Merge pull request #2322 from wallabag/v2-404Nicolas Lœuillet2016-10-015-4/+103
|\ \ \ \
| * | | | Customize errors templatesJeremy Benoist2016-10-015-4/+103
| |/ / /
* | | | Fix bad template nameJeremy Benoist2016-09-301-0/+0
* | | | Create user config in one placeJeremy Benoist2016-09-305-36/+42
|/ / /
* | | Removed duplicated templates filesNicolas Lœuillet2016-09-3026-494/+18
* | | Merge pull request #2315 from wallabag/fixes-about-upgradeNicolas Lœuillet2016-09-291-1/+1
|\ \ \
| * | | Reordered upgrade documentationNicolas Lœuillet2016-09-281-1/+0
| * | | Some fixes about upgrade from 2.0.x -> 2.1.0Nicolas Lœuillet2016-09-281-0/+1
* | | | Update messages.pl.ymlMateusz Rumiński2016-09-291-2/+2
|/ / /
* | | Add Instapaper translationsJeremy Benoist2016-09-2711-52/+96
* | | Add controller test for InstapaperJeremy Benoist2016-09-274-0/+12
* | | Add Instapaper importJeremy Benoist2016-09-279-3/+308
| |/ |/|
* | Update messages.pl.ymlMateusz Rumiński2016-09-271-12/+12
* | Merge pull request #2192 from wallabag/import-browser-bookmarksJeremy Benoist2016-09-2624-7/+747
|\ \
| * | Move prepareEntry to dedicated placeJeremy Benoist2016-09-263-35/+42
| * | Update Firefox fileJeremy Benoist2016-09-251-12/+24
| * | Fix bad date format in Browser importJeremy Benoist2016-09-253-62/+23