aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Fix OC typosJeremy Benoist2016-10-0211-20/+20
| | | | + remove extra sentence
* Occitan version updateQuent-in2016-10-011-24/+26
| | | to be ready for the future of Wallabag :)
* Merge pull request #2322 from wallabag/v2-404Nicolas Lœuillet2016-10-017-9/+107
|\ | | | | Customize errors templates
| * Customize errors templatesJeremy Benoist2016-10-017-9/+107
| | | | | | | | All error goes to the same template which only display the error message and the status code.
* | Merge pull request #2320 from wallabag/user-configNicolas Lœuillet2016-10-017-43/+51
|\ \ | |/ |/| Create user config in one place.
| * Fix bad template nameJeremy Benoist2016-09-301-0/+0
| | | | | | | | | | When a user register, the template displayed saying it should now check its email was misspelled. Resulting in displaying the default one (with margin issue).
| * Create user config in one placeJeremy Benoist2016-09-306-43/+51
|/ | | | | | | | Using a listener, user config is now created when a user: - is created from the command line - register (with or without email confirmation) - is created from the config panel
* 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
| |\ | | | | | | Docker : install PHP 'gd' extension
| | * Add PHP 'gd' extension to dockerPascal MARTIN2016-09-301-2/+3
| | | | | | | | | | | | The gd extension is required to export entries as EPUB.
| | * 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 files
| * | 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
|\ \ | | | | | | Fixes about upgrade
| * | 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.yml
| * | Update messages.pl.ymlMateusz Rumiński2016-09-291-2/+2
|/ / | | | | add missing translation for Instapaper importer
* | Merge pull request #2313 from wallabag/fix-long-loadingJeremy Benoist2016-09-271-1/+0
|\ \ | | | | | | Remove CSS class who caused long loading on Firefox
| * | Remove CSS class who caused long loading on FirefoxNicolas Lœuillet2016-09-271-1/+0
|/ / | | | | | | Fix #2302 #2281
* | 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
| | | | | | | | Also update ImportController with latest import (chrome, firefox & instapaper).
* | Merge pull request #2309 from mruminski/2.1Jeremy Benoist2016-09-271-12/+12
|\ \ | | | | | | Update messages.pl.yml
| * | Update messages.pl.ymlMateusz Rumiński2016-09-271-12/+12
|/ / | | | | add missing translation for Firefox and Chrome imports
* | Merge pull request #2192 from wallabag/import-browser-bookmarksJeremy Benoist2016-09-2635-11/+1657
|\ \ | | | | | | Import Firefox & Chrome bookmarks into wallabag
| * | Added tags for Firefox importNicolas Lœuillet2016-09-262-1/+2
| | |
| * | Move prepareEntry to dedicated placeJeremy Benoist2016-09-263-35/+42
| | | | | | | | | | | | | | | Yeah first try was ugly, now each part are in the dedicated place. Also, the date is hardly truncated to 10 chars because Firefox date are 16 chars long and Chrome are 17 chars long. So instead of divised them by a huge number, I prefer to truncate them.
| * | Update Firefox fileJeremy Benoist2016-09-254-78/+91
| | | | | | | | | | | | | | | With real data, the previous looks more than a Chrome converted file. Also, fix date conversion (hope so).
| * | 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
|\ \ \ | |/ / |/| | Fix duplicate tags on import
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 01:38:48 +0000