aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1644 from wallabag/v2-enable-confirmation-parameterJeremy Benoist2016-02-046-2/+14
|\ | | | | Fix #1622: parameter for FosUser confirmation
| * CSNicolas Lœuillet2016-02-047-3/+11
| |
| * Fix #1622: parameter for FosUser confirmationNicolas Lœuillet2016-02-045-1/+5
| |
* | 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 auth
| * 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
|\ | | | | Settings page
| * 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
| | | | | | | | Warn user if pocket_consumer_key isn't defined
| * Add CraueConfig for internal settingsJeremy Benoist2016-01-3129-173/+208
| |
| * Always include warning messageJeremy Benoist2016-01-317-28/+9
| | | | | | | | We'll remove it later, on the stable release
| * Move default configuration out of parametersJeremy Benoist2016-01-3110-40/+33
| | | | | | | | These default configuration value shouldn't be in parameters.yml.
* | Merge pull request #1641 from wallabag/v2-doc-typoJeremy Benoist2016-02-011-1/+1
|\ \ | | | | | | Update import.rst to fix a doc typo
| * | 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 v2
| * | [#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
|\ \ \ | | | | | | | | [#1604] First draft to fix SensioLabsInsight report
| * | | 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 #1635: change database name for test environments (mysql/pgsql)
| * | | 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 README
| * | | 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 export
| * | | 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 translation
| * | | Add Turkish translationOgün Karakuş2016-01-243-0/+234
|/ / / | | | | | | | | | Signed-off-by: Ogün Karakuş <kirk5bucuk@gmail.com>
* | | Merge pull request #1625 from wallabag/v2-fix-1621Jeremy Benoist2016-01-231-1/+3
|\ \ \ | |/ / |/| | [#1621] Add default address for FosUser
| * | [#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 themes
| * | Move public assets for themesJeremy Benoist2016-01-2293-58/+55
|/ / | | | | | | | | So they can be installed using the `assets:install` command and there'll no longer symlink in the repo They moved from `web/themes/...` to `bundles/wallabagcore/themes/...`
* | Merge pull request #1618 from wallabag/v2-readmeJeremy Benoist2016-01-221-4/+2
|\ \ | | | | | | Updated version in README
| * | 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
|\ \ | | | | | | Few fixes
| * | 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
| | | | | | | | | | | | | | | The `resetAction` was overriden to redirect user to the homepage instead of `fos_user_profile_show`. Instead of copying the whole method we can simply use FOSUserEvents to handle that.
| * | Fix bad type after using findByUrlAndUserIdJeremy Benoist2016-01-212-5/+30
| | | | | | | | | | | | | | | It returns an object since few commits this part of (untested) code still use an array. Also add test for that part of code.
| * | Fix bad redirection when adding a new userJeremy Benoist2016-01-211-1/+1
| | |
| * | Add tests on TagAllCommandJeremy Benoist2016-01-212-1/+61
| | | | | | | | | | | | Some simple tests
| * | Use PHP7 random_bytes to generate RSS TokenJeremy Benoist2016-01-212-12/+6
|/ / | | | | | | random_bytes is a PHP 7 function wich has been ported to PHP 5 using paragonie/random_compat
* | Merge pull request #1565 from wallabag/v2-2fa-htmlNicolas Lœuillet2016-01-217-53/+179
|\ \ | | | | | | Use HTML email for 2FA
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 05:22:09 +0000