aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Add users management UIJeremy Benoist2016-10-0226-223/+879
* 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
| * Fixed tests by removing clear()Nicolas Lœuillet2016-09-251-4/+0
| * fix testsThomas Citharel2016-09-253-24/+24
| * cs & fixesThomas Citharel2016-09-255-33/+14
| * bring chrome and firefox as separate importsThomas Citharel2016-09-2523-189/+558
| * Indentation and renamed fixtures fileNicolas Lœuillet2016-09-259-27/+27
| * Add Chrome path for Mac OSNicolas Lœuillet2016-09-255-14/+4
| * Import Firefox & Chrome bookmarks into wallabagThomas Citharel2016-09-2517-7/+431
* | Fix tag count for PostgreSQLJeremy Benoist2016-09-252-8/+6
* | CSJeremy Benoist2016-09-253-6/+4
* | Use scheduled entity insertions to avoid tag duplicateJeremy Benoist2016-09-253-7/+24
* | Fix tags count in menuJeremy Benoist2016-09-254-47/+47
|/
* Display a message when async import won’t workJeremy Benoist2016-09-2413-16/+69
* Merge pull request #2301 from wallabag/fix-rss-feedsJeremy Benoist2016-09-222-18/+2
|\
| * fix feeds not syncing on android appThomas Citharel2016-09-212-18/+2
* | Update messages.pl.ymlMateusz Rumiński2016-09-191-5/+5
* | Update wallabag_user.pl.ymlMateusz Rumiński2016-09-191-1/+1
* | polish versionMateusz Rumiński2016-09-191-0/+11
* | Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-09-192-4/+26
|\|
| * Fix issue #2296: epub export with `+` in the title.Étienne Gilli2016-09-181-1/+5
| * CSJeremy Benoist2016-09-031-1/+1