aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Update depsJeremy Benoist2016-01-152-170/+406
* Fix recent updateJeremy Benoist2016-01-158-19/+31
* TwoFactorBundle -> 2.0Jeremy Benoist2016-01-152-75/+81
* Switch to psr-4Jeremy Benoist2016-01-152-11/+10
* Update bundle & stock fileJeremy Benoist2016-01-1528-203/+208
* Symfony Upgrade Fixer FTWJeremy Benoist2016-01-1541-112/+136
* Improve composer.jsonJeremy Benoist2016-01-152-64/+57
* Wallabag now require PHP >= 5.5Jeremy Benoist2016-01-152-4/+4
* Remove weak deprecation :boom:Jeremy Benoist2016-01-151-1/+2
* Update depsJeremy Benoist2016-01-152-75/+627
* Merge pull request #1574 from jjanvier/readmeJeremy Benoist2016-01-141-6/+7
|\
| * Fix typo and set version in the READMEJulien Janvier (jjanvier)2016-01-141-6/+7
|/
* Merge pull request #1561 from FabienM/docker-composeNicolas Lœuillet2016-01-119-0/+231
|\
| * Add documentation to run docker-composeFabien MEURILLON2016-01-101-0/+51
| * Add Docker configuration for Postgres and MariaDBFabien MEURILLON2016-01-106-1/+62
| * Add basic docker-compose configurationFabien MEURILLON2016-01-104-0/+119
* | Merge pull request #1563 from wallabag/v2-fix-1394Jeremy Benoist2016-01-102-2/+2
|\ \
| * | Fixed 'mark as read' and 'mark as unread' linksNicolas Lœuillet2016-01-092-2/+2
| |/
* | Merge pull request #1562 from wallabag/v2-add-import-baggyJeremy Benoist2016-01-101-0/+1
|\ \ | |/ |/|
| * add import link on baggy themeNicolas Lœuillet2016-01-091-0/+1
|/
* Merge pull request #1558 from wallabag/v2-documentationNicolas Lœuillet2016-01-0952-2262/+106
|\
| * documentation cleaningNicolas Lœuillet2016-01-0952-2262/+106
* | Merge pull request #1559 from wallabag/v2-doctrine-migrationsJeremy Benoist2016-01-094-23/+156
|\ \ | |/ |/|
| * Update depsJeremy Benoist2016-01-091-19/+18
| * Installation & configuration of Doctrine MigrationsNicolas Lœuillet2016-01-084-4/+138
|/
* Merge pull request #1493 from wallabag/v2-pocket-import2.0.0-alpha.1Jeremy Benoist2016-01-0751-35/+1770
|\
| * updated testsNicolas Lœuillet2016-01-079-17/+10
| * Added french translationsNicolas Lœuillet2016-01-057-8/+28
| * Few phpDoc fixJeremy Benoist2016-01-036-16/+27
| * Fix tag related test for PocketJeremy Benoist2016-01-032-3/+6
| * Update depsJeremy Benoist2016-01-021-17/+17
| * Remove real consumer keyJeremy Benoist2016-01-024-4/+4
| * Add tagged services for importJeremy Benoist2016-01-0225-43/+394
| * Rewrote Wallabag v1 importJeremy Benoist2016-01-0214-94/+405
| * Rewrote Pocket ImportJeremy Benoist2016-01-029-210/+357
| * Fix the way to check for an existing entryJeremy Benoist2016-01-021-2/+2
| * Update after previous mergeJeremy Benoist2016-01-0211-114/+86
| * First test on PocketImportJeremy Benoist2016-01-024-84/+209
| * Update url & service nameJeremy Benoist2016-01-026-13/+56
| * Change the way to check for an existing entryJeremy Benoist2016-01-024-12/+20
| * Update depsJeremy Benoist2016-01-021-41/+39
| * - remove importers configurationNicolas Lœuillet2016-01-027-45/+31
| * fix #1502 avoid duplicate entry and store pocket url in configNicolas Lœuillet2016-01-027-36/+87
| * assign tags to entries and add lastPocketImport attribute to userNicolas Lœuillet2016-01-023-12/+89
| * create ImportController to list importersNicolas Lœuillet2016-01-025-5/+49
| * service callNicolas Lœuillet2016-01-021-2/+2
| * forgot test parametersNicolas Lœuillet2016-01-023-0/+9
| * refactor pocket importNicolas Lœuillet2016-01-027-105/+202
| * 1st draft for Pocket import via APINicolas Lœuillet2016-01-029-34/+219
| * add docs for Import featureNicolas Lœuillet2016-01-025-13/+60