aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1645 from wallabag/v2-fix-loadtemplate-sendemailJeremy Benoist2016-02-043-4/+4
|\
| * Fix #1643: fix the way to load the HTML template in 2factor authNicolas Lœuillet2016-02-043-4/+4
|/
* Merge pull request #1612 from wallabag/v2-settings-pageNicolas Lœuillet2016-02-0440-245/+510
|\
| * Fix Shaarli url traductionJeremy Benoist2016-02-011-1/+1
| * Fix from_email & fos_userJeremy Benoist2016-01-316-1/+14
| * Add new export configJeremy Benoist2016-01-316-8/+56
| * Fix permission to settings pageJeremy Benoist2016-01-312-1/+33
| * CSJeremy Benoist2016-01-313-3/+3
| * Fix testsJeremy Benoist2016-01-312-2/+11
| * Use alias to get container parametersJeremy Benoist2016-01-312-5/+5
| * Create internal setting on install & fixturesJeremy Benoist2016-01-312-0/+203
| * 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 #1641 from wallabag/v2-doc-typoJeremy Benoist2016-02-011-1/+1
|\ \
| * | Update import.rstNicolas Lœuillet2016-02-011-1/+1
|/ /
* | Merge pull request #1601 from wallabag/v2-import-from-v2Jeremy Benoist2016-02-0112-20/+344
|\ \
| * | [#1590] Add JSON import from wallabag v2Nicolas Lœuillet2016-01-2012-20/+344
* | | Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsightJeremy Benoist2016-02-0116-24/+10
|\ \ \
| * | | SensioLabsInsight fixesNicolas Lœuillet2016-01-229-12/+4
| * | | [#1604] First draft to fix SensioLabsInsight reportNicolas Lœuillet2016-01-2217-20/+14
* | | | Merge pull request #1639 from wallabag/v2-change-test-dbnameJeremy Benoist2016-02-013-2/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix fos_userNicolas Lœuillet2016-02-011-0/+5
| * | | Fix #1635: change database name for test environments (mysql/pgsql)Nicolas Lœuillet2016-02-012-2/+2
|/ / /
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 05:56:48 +0000