aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1565 from wallabag/v2-2fa-htmlNicolas Lœuillet2016-01-217-53/+179
|\
| * Update HTML 2FA templateJeremy Benoist2016-01-217-39/+51
| * #1490 HTML in E-MailsAlexandr Danilov2016-01-211-3/+97
| * CSJeremy Benoist2016-01-212-9/+6
| * Use HTML email for 2FAJeremy Benoist2016-01-216-39/+62
|/
* Merge pull request #1610 from wallabag/v2-composer-lock-releaseNicolas Lœuillet2016-01-213-6769/+8
|\
| * Disable xdebug all the timeJeremy Benoist2016-01-213-6769/+8
|/
* Merge pull request #1606 from wallabag/v2-tag-cascadeNicolas Lœuillet2016-01-211-1/+1
|\
| * Remove tag relation when removing an entryJeremy Benoist2016-01-201-1/+1
* | Merge pull request #1607 from wallabag/v2-composer-lockNicolas Lœuillet2016-01-212-1/+4
|\ \ | |/ |/|
| * Ignore composer.lockJeremy Benoist2016-01-202-1/+4
|/
* Merge pull request #1599 from wallabag/v2-fix-pt-documentationNicolas Lœuillet2016-01-204-66/+59
|\
| * Add configuration for portuguese documentationNicolas Lœuillet2016-01-204-66/+59
|/
* Merge pull request #1594 from araujo0205/patch-1Nicolas Lœuillet2016-01-201-0/+36
|\
| * Create index.rstaraujo02052016-01-191-0/+36
|/
* Merge pull request #1587 from wallabag/v2-translatorNicolas Lœuillet2016-01-183-17/+14
|\
| * Use translator interface instead of final classJeremy Benoist2016-01-173-17/+14
|/
* Merge pull request #1584 from wallabag/v2-cleanupJeremy Benoist2016-01-1510-274/+5
|\
| * some cleanup:Nicolas Lœuillet2016-01-1510-274/+5
* | Merge pull request #1564 from wallabag/v2-remove-flattrJeremy Benoist2016-01-155-8/+1
|\ \
| * | remove flattr on about pageNicolas Lœuillet2016-01-155-8/+1
| |/
* | Merge pull request #1583 from wallabag/v2-fix-deleteNicolas Lœuillet2016-01-158-18/+33
|\ \ | |/ |/|
| * Fix `findOneByUrl` side effect in testsJeremy Benoist2016-01-158-18/+33
* | Merge pull request #1524 from wallabag/sf2.8Nicolas Lœuillet2016-01-1583-669/+1280
|\ \ | |/ |/|
| * Update graby stuffJeremy Benoist2016-01-151-11/+11
| * Update readme & fix console permissionJeremy Benoist2016-01-154-13/+11
| * Last deps updateJeremy Benoist2016-01-152-47/+47
| * Add assets configJeremy Benoist2016-01-151-0/+1
| * Update path in build fileJeremy Benoist2016-01-151-9/+9
| * Update to Symfony 3.0.xJeremy Benoist2016-01-152-249/+31
| * Switch to Symfony 3 structureJeremy Benoist2016-01-1521-33/+65
| * Remove some commented codeJeremy Benoist2016-01-156-50/+20
| * Update to friendsofsymfony/oauth-server-bundle@1.5.0-BETAJeremy Benoist2016-01-151-20/+20
| * Fix Pocket generateUrl parametersJeremy Benoist2016-01-151-2/+2
| * 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 #1560 from wallabag/v2-quickstartJeremy Benoist2016-01-1512-15/+227
|\ \ | |/ |/|
| * Quickstart for beginnersNicolas Lœuillet2016-01-1512-15/+227
* | 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