aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| * Update HTML 2FA templateJeremy Benoist2016-01-217-39/+51
| | | | | | | | | | | | Split paragraph in translation Inject wallabag_url for image in HTML template Remove username & password from config_dev.yml (null are already the default value)
| * #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
|/ | | | Related to #1490
* Merge pull request #1610 from wallabag/v2-composer-lock-releaseNicolas Lœuillet2016-01-213-6769/+8
|\ | | | | Disable xdebug all the time
| * Disable xdebug all the timeJeremy Benoist2016-01-213-6769/+8
|/ | | | | | Use travis_wait to avoid travis timeout on `composer up` Jump to `memory_limit -1` for `composer up` Also, since composer.lock is ignored, we can remove it.
* Merge pull request #1606 from wallabag/v2-tag-cascadeNicolas Lœuillet2016-01-211-1/+1
|\ | | | | Remove tag relation when removing an entry
| * Remove tag relation when removing an entryJeremy Benoist2016-01-201-1/+1
| | | | | | | | Fix #1453
* | Merge pull request #1607 from wallabag/v2-composer-lockNicolas Lœuillet2016-01-212-1/+4
|\ \ | |/ |/| Ignore composer.lock
| * Ignore composer.lockJeremy Benoist2016-01-202-1/+4
|/ | | | | | | | | | | Having a big composer.lock on a final project can have side effect on incoming PR that add a new vendor. Mostly because conflict are too frequent. By ignoring composer.lock we ease the PR submission and rebase. BUT we need to be careful when we release a new version of wallabag. We should manually `git add -f composer.lock` to update it. Since composer.lock will no longer be commited I switch the `composer install` to a `composer up` in the travis configuration.
* Merge pull request #1599 from wallabag/v2-fix-pt-documentationNicolas Lœuillet2016-01-204-66/+59
|\ | | | | Add configuration for portuguese documentation
| * 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.rst
| * 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 class
| * Use translator interface instead of final classJeremy Benoist2016-01-173-17/+14
|/ | | | | | | | | Symfony use a different class when in dev mode and prod mode. Prod loads `Symfony\Bundle\FrameworkBundle\Translation\Translator`. Dev loads `Symfony\Component\Translation\DataCollectorTranslator` to gather information for the debug bar. Fix #1585
* Merge pull request #1584 from wallabag/v2-cleanupJeremy Benoist2016-01-1510-274/+5
|\ | | | | some cleanup
| * some cleanup:Nicolas Lœuillet2016-01-1510-274/+5
| | | | | | | | | | * move capistrano config files * remove useless files
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 04:51:39 +0000