aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Assets workThomas Citharel2016-09-2823-417/+445
* 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
|\ \ | |/ |/|
| * 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-257-7/+89
| * Fix tags count in menuJeremy Benoist2016-09-254-47/+47
|/
* Merge pull request #2306 from wallabag/redis-rabbit-checkThomas Citharel2016-09-2519-16/+89
|\
| * Avoid failing test for user who didn’t install RedisJeremy Benoist2016-09-245-0/+19
| * Display a message when async import won’t workJeremy Benoist2016-09-2413-16/+69
| * Disable deprecation that fail testJeremy Benoist2016-09-241-0/+1
|/
* 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
* | Merge pull request #2239 from wallabag/documentation-2.1Nicolas Lœuillet2016-09-2013-32/+61
|\ \
| * | Fixed version in documentationNicolas Lœuillet2016-09-192-2/+2
| * | Fix wallabag version in documentationNicolas Lœuillet2016-09-196-31/+13
| * | Add documentation about article sharingNicolas Lœuillet2016-09-1910-17/+64
* | | Merge pull request #2299 from mruminski/2.1Thomas Citharel2016-09-203-13/+24
|\ \ \ | |/ / |/| |
| * | Update CraueConfigBundle.pl.ymlMateusz Rumiński2016-09-191-1/+1
| * | Update CraueConfigBundle.pl.ymlMateusz Rumiński2016-09-191-8/+8
| * | 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
|/ /
* | Update generated files from SymfonyJeremy Benoist2016-09-191-3/+3
* | Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-09-1912-18/+76
|\|
| * Merge pull request #2297 from morhelluin/epub-export-special-charsJeremy Benoist2016-09-191-1/+5
| |\
| | * Fix issue #2296: epub export with `+` in the title.Étienne Gilli2016-09-181-1/+5
| |/
| * Update md5 checksum for 2.0.8 in documentationNicolas Lœuillet2016-09-076-6/+6
| * Merge pull request #2271 from wallabag/prepare-208Nicolas Lœuillet2016-09-079-11/+29
| |\
| | * Prepare wallabag 2.0.8Nicolas Lœuillet2016-09-079-11/+29
| |/
| * Update install documentationNicolas Lœuillet2016-09-066-9/+21
| * Merge pull request #2262 from wallabag/install-check-db-connectionNicolas Lœuillet2016-09-032-3/+27
| |\
| | * CSJeremy Benoist2016-09-031-1/+1
| | * Update testJeremy Benoist2016-09-032-4/+12
| | * Add a check for the database connectionJeremy Benoist2016-09-031-2/+18
| |/