aboutsummaryrefslogtreecommitdiffhomepage
path: root/composer.json
Commit message (Expand)AuthorAgeFilesLines
* Switch back to latest guzzle-site-authenticatorJeremy Benoist2017-05-241-1/+1
* Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-05-191-1/+1
|\
| * Lock guzzle-site-authenticator to avoid errorJeremy Benoist2017-05-161-1/+1
* | Upgraded CraueConfigBundle to 2.0Nicolas Lœuillet2017-05-121-1/+1
* | Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-05-011-1/+1
|\|
| * Make symfony-assets-install use `relative` symlinksOlivier Mehani2017-04-221-1/+1
* | Remove dev FOSUserBundleJeremy Benoist2017-04-181-1/+1
* | Merge pull request #2861 from wallabag/2.3-droping-5.5Jérémy Benoist2017-03-281-2/+2
|\ \ | |/ |/|
| * Dropping PHP 5.5Jeremy Benoist2017-02-111-2/+2
* | Use wallabag/tcpdfJeremy Benoist2017-02-241-1/+1
|/
* Update RulerZKévin Gomez2017-02-051-2/+1
* Restored correct version for framework-extra-bundleNicolas Lœuillet2017-02-041-1/+1
* Freezed sensio/framework-extra-bundle versionNicolas Lœuillet2017-02-021-1/+1
* Lock kphoen/rulerz to avoid breaking changesJeremy Benoist2017-01-261-0/+1
* Use latest bdunogier/guzzle-site-authenticatorJeremy Benoist2017-01-101-1/+1
* Use simple-phpunit instead of phpunitJeremy Benoist2016-12-131-1/+0
* Upgrade to Symfony 3.2Nicolas Lœuillet2016-11-301-1/+1
* Fix MonologBundle deprecationJeremy Benoist2016-11-221-1/+1
* Re-use FOSUser master branchJeremy Benoist2016-11-221-1/+1
* Added authentication for restricted access articlesBertrand Dunogier2016-11-221-1/+2
* Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-11-211-2/+5
|\
| * Lock down PHPUnit for PHP 5.5Jeremy Benoist2016-11-211-1/+1
| * Force composer to run as PHP 5.5.9Jeremy Benoist2016-11-201-1/+4
| * Fix clear-cache problem using —no-devJeremy Benoist2016-11-191-2/+2
* | Install assets for shortcutsJeremy Benoist2016-11-181-0/+2
* | Added shortcutsNicolas Lœuillet2016-11-151-1/+2
* | Removed Maintenance bundleNicolas Lœuillet2016-11-061-1/+0
* | Download pictures successfullyThomas Citharel2016-10-291-1/+2
* | use new tcpdf library versionThomas Citharel2016-10-221-1/+1
* | ApiDoc & Route annotation were conflictedJeremy Benoist2016-10-151-2/+2
|/
* Lock deps for FOSUserJeremy Benoist2016-10-111-2/+2
* Remove mouf/nodejs-installer from composerJeremy Benoist2016-10-041-4/+1
* Enable Redis async importJeremy Benoist2016-09-111-2/+5
* 1st draft for rabbitMQNicolas Lœuillet2016-09-111-1/+2
* Upgrade PHPUnit to version 5Jeremy Benoist2016-08-221-1/+1
* Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-07-201-1/+1
|\
| * Run PHP 7.1 on TravisJeremy Benoist2016-07-181-1/+1
* | Merge branch 'master' into 2.1Jeremy Benoist2016-06-231-2/+6
|\|
| * Fix bad loading fixturesJeremy Benoist2016-06-221-0/+1
| * Jump to Symfony 3.1Jeremy Benoist2016-06-221-2/+5
| * Use friendsofphp instead of fabpotJeremy Benoist2016-06-171-1/+1
* | Merge pull request #2142 from wallabag/v2-use-npmNicolas Lœuillet2016-06-231-4/+2
|\ \
| * | manage assets through npmThomas Citharel2016-06-091-4/+2
| |/
* / Use friendsofphp instead of fabpotJeremy Benoist2016-06-231-1/+1
|/
* Merge pull request #1918 from wallabag/improve-paginationJeremy Benoist2016-04-131-1/+2
|\
| * Improve pagination when user has lot of entriesNicolas Lœuillet2016-04-121-1/+2
* | Remove useless dependancyNicolas Lœuillet2016-04-121-1/+0
|/
* Merge pull request #1824 from wallabag/v2-alternative-envJeremy Benoist2016-04-081-11/+2
|\
| * Remove SMTP configuration environment overridesMathieu Bruyen2016-03-291-11/+2
* | Lock ocramius/proxy-managerJeremy Benoist2016-04-061-1/+2
|/