aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* We don't need migration yetJeremy Benoist2016-01-312-51/+0
* Add warning message for PocketImportJeremy Benoist2016-01-312-0/+7
* Add CraueConfig for internal settingsJeremy Benoist2016-01-3129-173/+208
* Always include warning messageJeremy Benoist2016-01-317-28/+9
* Move default configuration out of parametersJeremy Benoist2016-01-3110-40/+33
* Merge pull request #1630 from wallabag/v2-add-gitter-badgeNicolas Lœuillet2016-01-241-0/+1
|\
| * Add @GitterHQ badge on READMENicolas Lœuillet2016-01-241-0/+1
|/
* Merge pull request #1629 from wallabag/fixexportformatsNicolas Lœuillet2016-01-247-10/+31
|\
| * fix #1620 and introduce new parameters to exportThomas Citharel2016-01-247-10/+31
* | Merge pull request #1628 from ogunkarakus/v2-turkish-translationNicolas Lœuillet2016-01-243-0/+234
|\ \ | |/ |/|
| * Add Turkish translationOgün Karakuş2016-01-243-0/+234
|/
* Merge pull request #1625 from wallabag/v2-fix-1621Jeremy Benoist2016-01-231-1/+3
|\
| * [#1621] Add default address for FosUserNicolas Lœuillet2016-01-231-1/+3
|/
* Merge pull request #1619 from wallabag/v2-themes-folderNicolas Lœuillet2016-01-2293-58/+55
|\
| * Move public assets for themesJeremy Benoist2016-01-2293-58/+55
|/
* Merge pull request #1618 from wallabag/v2-readmeJeremy Benoist2016-01-221-4/+2
|\
| * Updated version in READMENicolas Lœuillet2016-01-221-4/+2
|/
* Merge pull request #1614 from wallabag/v2-few-fixesNicolas Lœuillet2016-01-2211-100/+195
|\
| * CSJeremy Benoist2016-01-222-3/+3
| * Add for deleting rule from an other userJeremy Benoist2016-01-221-6/+49
| * Use FOSUserEvents instead of c/p a controllerJeremy Benoist2016-01-213-75/+48
| * Fix bad type after using findByUrlAndUserIdJeremy Benoist2016-01-212-5/+30
| * Fix bad redirection when adding a new userJeremy Benoist2016-01-211-1/+1
| * Add tests on TagAllCommandJeremy Benoist2016-01-212-1/+61
| * Use PHP7 random_bytes to generate RSS TokenJeremy Benoist2016-01-212-12/+6
|/
* 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