aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Merge pull request #1564 from wallabag/v2-remove-flattrJeremy Benoist2016-01-155-8/+1
|\ \ | | | | | | Remove Flattr references
| * | 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 tests
| * Fix `findOneByUrl` side effect in testsJeremy Benoist2016-01-158-18/+33
| | | | | | | | Fix #1566
* | Merge pull request #1524 from wallabag/sf2.8Nicolas Lœuillet2016-01-1583-669/+1280
|\ \ | |/ |/| Upgrade to Symfony 3.0
| * 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
| | | | | | | | | | To avoid : > Twig_Error_Syntax: Unknown "asset" function in
| * 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
| | | | | | | | | | | | LexikFormFilterBundle & RulerZBundle are now Symfony 3 compatible There are still some issue with FOSOAuthServerBundle
| * Fix recent updateJeremy Benoist2016-01-158-19/+31
| | | | | | | | | | | | - some missing url parameters from WallabagRestController & EntryController - use a service for `EntryFilterType` to use fully qualified name instead (so changing class signature) - update ImportBundle (url & form)
| * 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
| | | | | | | | | | | | - update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition) - update bundle to latest release - remove security on profiler
| * Symfony Upgrade Fixer FTWJeremy Benoist2016-01-1541-112/+136
| | | | | | | | symfony-upgrade-fixer fix src/Wallabag/
| * Improve composer.jsonJeremy Benoist2016-01-152-64/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following great article from Jordi: http://seld.be/notes/new-composer-patterns Changelogs summary: - paragonie/random_compat updated from 1.1.1 to 1.1.4 See changes: https://github.com/paragonie/random_compat/compare/1.1.1...1.1.4 Release notes: https://github.com/paragonie/random_compat/releases/tag/1.1.4 - doctrine/cache updated from v1.5.2 to v1.5.4 See changes: https://github.com/doctrine/cache/compare/v1.5.2...v1.5.4 Release notes: https://github.com/doctrine/cache/releases/tag/v1.5.4 - sensio/framework-extra-bundle updated from v3.0.11 to v3.0.12 See changes: https://github.com/sensiolabs/SensioFrameworkExtraBundle/compare/v3.0.11...v3.0.12 Release notes: https://github.com/sensiolabs/SensioFrameworkExtraBundle/releases/tag/v3.0.12 - nelmio/cors-bundle updated from 1.4.0 to 1.4.1 See changes: https://github.com/nelmio/NelmioCorsBundle/compare/1.4.0...1.4.1 Release notes: https://github.com/nelmio/NelmioCorsBundle/releases/tag/1.4.1 - friendsofsymfony/rest-bundle updated from 1.7.4 to 1.7.6 See changes: https://github.com/FriendsOfSymfony/FOSRestBundle/compare/1.7.4...1.7.6 Release notes: https://github.com/FriendsOfSymfony/FOSRestBundle/releases/tag/1.7.6 - nelmio/api-doc-bundle updated from 2.11.0 to 2.11.1 See changes: https://github.com/nelmio/NelmioApiDocBundle/compare/2.11.0...2.11.1 Release notes: https://github.com/nelmio/NelmioApiDocBundle/releases/tag/2.11.1 - neitanod/forceutf8 updated from v1.5 to v2.0 See changes: https://github.com/neitanod/forceutf8/compare/v1.5...v2.0 Release notes: https://github.com/neitanod/forceutf8/releases/tag/v2.0 - j0k3r/graby-site-config updated from 1.0.9 to 1.0.10 See changes: https://github.com/j0k3r/graby-site-config/compare/1.0.9...1.0.10 Release notes: https://github.com/j0k3r/graby-site-config/releases/tag/1.0.10 - j0k3r/graby updated from 1.0.6 to 1.0.7 See changes: https://github.com/j0k3r/graby/compare/1.0.6...1.0.7 Release notes: https://github.com/j0k3r/graby/releases/tag/1.0.7 - sebastian/diff updated from 1.4.0 to 1.4.1 See changes: https://github.com/sebastianbergmann/diff/compare/1.4.0...1.4.1 Release notes: https://github.com/sebastianbergmann/diff/releases/tag/1.4.1 - phpunit/phpunit updated from 4.8.19 to 4.8.21 See changes: https://github.com/sebastianbergmann/phpunit/compare/4.8.19...4.8.21 Release notes: https://github.com/sebastianbergmann/phpunit/releases/tag/4.8.21 - kphoen/rulerz updated from 0.16.1 to 0.16.2 See changes: https://github.com/K-Phoen/rulerz/compare/0.16.1...0.16.2 Release notes: https://github.com/K-Phoen/rulerz/releases/tag/0.16.2
| * Wallabag now require PHP >= 5.5Jeremy Benoist2016-01-152-4/+4
| | | | | | | | See https://github.com/K-Phoen/rulerz/pull/21/files#diff-b5d0ee8c97c7abd7e3fa29b9a27d1780
| * Remove weak deprecation :boom:Jeremy Benoist2016-01-151-1/+2
| |