aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Disabled delete button for the logged userJeremy Benoist2016-10-022-1/+12
* Remove NewUser test from ConfigJeremy Benoist2016-10-021-114/+0
* Cleanup & add link on baggy menuJeremy Benoist2016-10-023-60/+1
* Add users management UIJeremy Benoist2016-10-0229-223/+956
* Merge pull request #2326 from wallabag/update-quickstartJeremy Benoist2016-10-0214-53/+171
|\
| * Update testJeremy Benoist2016-10-021-1/+1
| * Fixed french translationNicolas Lœuillet2016-10-011-3/+3
| * Changed translationsNicolas Lœuillet2016-10-0111-10/+11
| * Changed quickstart layoutNicolas Lœuillet2016-10-0113-52/+169
* | Merge pull request #2324 from wallabag/edit-tagging-ruleJeremy Benoist2016-10-0214-17/+106
|\ \
| * | CSJeremy Benoist2016-10-011-2/+2
| * | Introduce validateRuleActionJeremy Benoist2016-10-011-5/+13
| * | Add ability to edit a tagging ruleJeremy Benoist2016-10-0114-14/+95
* | | Merge pull request #2323 from wallabag/footer-statsJeremy Benoist2016-10-0215-5/+82
|\ \ \
| * | | Add simple stats in footerJeremy Benoist2016-10-0115-5/+82
* | | | Merge pull request #2329 from wallabag/Quent-in-patch-1Jeremy Benoist2016-10-0211-35/+37
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
|\ \