aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* 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-017-9/+107
|\
| * Customize errors templatesJeremy Benoist2016-10-017-9/+107
* | Merge pull request #2320 from wallabag/user-configNicolas Lœuillet2016-10-017-43/+51
|\ \ | |/ |/|
| * Fix bad template nameJeremy Benoist2016-09-301-0/+0
| * Create user config in one placeJeremy Benoist2016-09-306-43/+51
|/
* Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-09-304-5/+6
|\
| * Merge pull request #2319 from pmartin/docker-php-gd-extensionJeremy Benoist2016-09-304-5/+6
| |\
| | * Add PHP 'gd' extension to dockerPascal MARTIN2016-09-301-2/+3
| | * Fix doc: 'bin/console' instead of 'app/console'Pascal MARTIN2016-09-303-3/+3
| |/
* | Merge pull request #2318 from wallabag/refactor-templatesNicolas Lœuillet2016-09-3026-494/+18
|\ \
| * | Removed duplicated templates filesNicolas Lœuillet2016-09-3026-494/+18
|/ /
* | Merge pull request #2315 from wallabag/fixes-about-upgradeNicolas Lœuillet2016-09-2923-33/+555
|\ \
| * | Added french documentation about Redis and RabbitMQNicolas Lœuillet2016-09-296-11/+195
| * | Added links to async config in german docSven Fischer2016-09-291-0/+2
| * | add German redis.rstSven Fischer2016-09-291-0/+62
| * | add German rabbitmq.rstSven Fischer2016-09-291-0/+67
| * | Added links to async config in french docNicolas Lœuillet2016-09-281-0/+2
| * | Added links to async config in english docNicolas Lœuillet2016-09-281-0/+2
| * | Little improvements to the german translationJulian Oster2016-09-281-4/+4
| * | update German upgrade-2.0.x-2.1.y.rstStrubbl2016-09-281-3/+3
| * | Fixed reviewNicolas Lœuillet2016-09-287-7/+49
| * | Reordered upgrade documentationNicolas Lœuillet2016-09-2810-22/+172
| * | Some fixes about upgrade from 2.0.x -> 2.1.0Nicolas Lœuillet2016-09-2811-11/+22
* | | Merge pull request #2316 from mruminski/2.1Jeremy Benoist2016-09-291-2/+2
|\ \ \ | |/ / |/| |
| * | Update messages.pl.ymlMateusz Rumiński2016-09-291-2/+2
|/ /
* | Merge pull request #2313 from wallabag/fix-long-loadingJeremy Benoist2016-09-271-1/+0
|\ \
| * | Remove CSS class who caused long loading on FirefoxNicolas Lœuillet2016-09-271-1/+0
|/ /
* | Add Instapaper translationsJeremy Benoist2016-09-2711-52/+96
* | Add Instapaper docsJeremy Benoist2016-09-272-9/+30
* | Add controller test for InstapaperJeremy Benoist2016-09-276-0/+221
* | Add Instapaper importJeremy Benoist2016-09-2713-5/+547
* | Merge pull request #2309 from mruminski/2.1Jeremy Benoist2016-09-271-12/+12
|\ \
| * | Update messages.pl.ymlMateusz Rumiński2016-09-271-12/+12
|/ /
* | Merge pull request #2192 from wallabag/import-browser-bookmarksJeremy Benoist2016-09-2635-11/+1657
|\ \
| * | Added tags for Firefox importNicolas Lœuillet2016-09-262-1/+2
| * | Move prepareEntry to dedicated placeJeremy Benoist2016-09-263-35/+42
| * | Update Firefox fileJeremy Benoist2016-09-254-78/+91
| * | Fix bad date format in Browser importJeremy Benoist2016-09-255-62/+31
| * | Fix bad parameter for testsJeremy Benoist2016-09-251-1/+1
| * | Fixed tests by removing clear()Nicolas Lœuillet2016-09-251-4/+0
| * | fix testsThomas Citharel2016-09-256-52/+51
| * | cs & fixesThomas Citharel2016-09-256-33/+40
| * | bring chrome and firefox as separate importsThomas Citharel2016-09-2529-224/+1237
| * | Added tests for Chrome bookmarks importNicolas Lœuillet2016-09-254-3/+75
| * | Indentation and renamed fixtures fileNicolas Lœuillet2016-09-2511-28/+28
| * | Add Chrome path for Mac OSNicolas Lœuillet2016-09-256-15/+5
| * | Import Firefox & Chrome bookmarks into wallabagThomas Citharel2016-09-2519-7/+586
* | | Merge pull request #2308 from wallabag/tags-duplicateThomas Citharel2016-09-2511-58/+136
|\ \ \ | |/ / |/| |