Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1625 from wallabag/v2-fix-1621 | Jeremy Benoist | 2016-01-23 | 1 | -1/+3 |
|\ | | | | | [#1621] Add default address for FosUser | ||||
| * | [#1621] Add default address for FosUser | Nicolas Lœuillet | 2016-01-23 | 1 | -1/+3 |
|/ | |||||
* | Merge pull request #1619 from wallabag/v2-themes-folder | Nicolas Lœuillet | 2016-01-22 | 93 | -58/+55 |
|\ | | | | | Move public assets for themes | ||||
| * | Move public assets for themes | Jeremy Benoist | 2016-01-22 | 93 | -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-readme | Jeremy Benoist | 2016-01-22 | 1 | -4/+2 |
|\ | | | | | Updated version in README | ||||
| * | Updated version in README | Nicolas Lœuillet | 2016-01-22 | 1 | -4/+2 |
|/ | |||||
* | Merge pull request #1614 from wallabag/v2-few-fixes | Nicolas Lœuillet | 2016-01-22 | 11 | -100/+195 |
|\ | | | | | Few fixes | ||||
| * | CS | Jeremy Benoist | 2016-01-22 | 2 | -3/+3 |
| | | |||||
| * | Add for deleting rule from an other user | Jeremy Benoist | 2016-01-22 | 1 | -6/+49 |
| | | |||||
| * | Use FOSUserEvents instead of c/p a controller | Jeremy Benoist | 2016-01-21 | 3 | -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 findByUrlAndUserId | Jeremy Benoist | 2016-01-21 | 2 | -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 user | Jeremy Benoist | 2016-01-21 | 1 | -1/+1 |
| | | |||||
| * | Add tests on TagAllCommand | Jeremy Benoist | 2016-01-21 | 2 | -1/+61 |
| | | | | | | | | Some simple tests | ||||
| * | Use PHP7 random_bytes to generate RSS Token | Jeremy Benoist | 2016-01-21 | 2 | -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-html | Nicolas Lœuillet | 2016-01-21 | 7 | -53/+179 |
|\ | | | | | Use HTML email for 2FA | ||||
| * | Update HTML 2FA template | Jeremy Benoist | 2016-01-21 | 7 | -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-Mails | Alexandr Danilov | 2016-01-21 | 1 | -3/+97 |
| | | |||||
| * | CS | Jeremy Benoist | 2016-01-21 | 2 | -9/+6 |
| | | |||||
| * | Use HTML email for 2FA | Jeremy Benoist | 2016-01-21 | 6 | -39/+62 |
|/ | | | | Related to #1490 | ||||
* | Merge pull request #1610 from wallabag/v2-composer-lock-release | Nicolas Lœuillet | 2016-01-21 | 3 | -6769/+8 |
|\ | | | | | Disable xdebug all the time | ||||
| * | Disable xdebug all the time | Jeremy Benoist | 2016-01-21 | 3 | -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-cascade | Nicolas Lœuillet | 2016-01-21 | 1 | -1/+1 |
|\ | | | | | Remove tag relation when removing an entry | ||||
| * | Remove tag relation when removing an entry | Jeremy Benoist | 2016-01-20 | 1 | -1/+1 |
| | | | | | | | | Fix #1453 | ||||
* | | Merge pull request #1607 from wallabag/v2-composer-lock | Nicolas Lœuillet | 2016-01-21 | 2 | -1/+4 |
|\ \ | |/ |/| | Ignore composer.lock | ||||
| * | Ignore composer.lock | Jeremy Benoist | 2016-01-20 | 2 | -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-documentation | Nicolas Lœuillet | 2016-01-20 | 4 | -66/+59 |
|\ | | | | | Add configuration for portuguese documentation | ||||
| * | Add configuration for portuguese documentation | Nicolas Lœuillet | 2016-01-20 | 4 | -66/+59 |
|/ | |||||
* | Merge pull request #1594 from araujo0205/patch-1 | Nicolas Lœuillet | 2016-01-20 | 1 | -0/+36 |
|\ | | | | | Create index.rst | ||||
| * | Create index.rst | araujo0205 | 2016-01-19 | 1 | -0/+36 |
|/ | |||||
* | Merge pull request #1587 from wallabag/v2-translator | Nicolas Lœuillet | 2016-01-18 | 3 | -17/+14 |
|\ | | | | | Use translator interface instead of final class | ||||
| * | Use translator interface instead of final class | Jeremy Benoist | 2016-01-17 | 3 | -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-cleanup | Jeremy Benoist | 2016-01-15 | 10 | -274/+5 |
|\ | | | | | some cleanup | ||||
| * | some cleanup: | Nicolas Lœuillet | 2016-01-15 | 10 | -274/+5 |
| | | | | | | | | | | * move capistrano config files * remove useless files | ||||
* | | Merge pull request #1564 from wallabag/v2-remove-flattr | Jeremy Benoist | 2016-01-15 | 5 | -8/+1 |
|\ \ | | | | | | | Remove Flattr references | ||||
| * | | remove flattr on about page | Nicolas Lœuillet | 2016-01-15 | 5 | -8/+1 |
| |/ | |||||
* | | Merge pull request #1583 from wallabag/v2-fix-delete | Nicolas Lœuillet | 2016-01-15 | 8 | -18/+33 |
|\ \ | |/ |/| | Fix `findOneByUrl` side effect in tests | ||||
| * | Fix `findOneByUrl` side effect in tests | Jeremy Benoist | 2016-01-15 | 8 | -18/+33 |
| | | | | | | | | Fix #1566 | ||||
* | | Merge pull request #1524 from wallabag/sf2.8 | Nicolas Lœuillet | 2016-01-15 | 83 | -669/+1280 |
|\ \ | |/ |/| | Upgrade to Symfony 3.0 | ||||
| * | Update graby stuff | Jeremy Benoist | 2016-01-15 | 1 | -11/+11 |
| | | |||||
| * | Update readme & fix console permission | Jeremy Benoist | 2016-01-15 | 4 | -13/+11 |
| | | |||||
| * | Last deps update | Jeremy Benoist | 2016-01-15 | 2 | -47/+47 |
| | | |||||
| * | Add assets config | Jeremy Benoist | 2016-01-15 | 1 | -0/+1 |
| | | | | | | | | | | To avoid : > Twig_Error_Syntax: Unknown "asset" function in | ||||
| * | Update path in build file | Jeremy Benoist | 2016-01-15 | 1 | -9/+9 |
| | | |||||
| * | Update to Symfony 3.0.x | Jeremy Benoist | 2016-01-15 | 2 | -249/+31 |
| | | |||||
| * | Switch to Symfony 3 structure | Jeremy Benoist | 2016-01-15 | 21 | -33/+65 |
| | | |||||
| * | Remove some commented code | Jeremy Benoist | 2016-01-15 | 6 | -50/+20 |
| | | |||||
| * | Update to friendsofsymfony/oauth-server-bundle@1.5.0-BETA | Jeremy Benoist | 2016-01-15 | 1 | -20/+20 |
| | | |||||
| * | Fix Pocket generateUrl parameters | Jeremy Benoist | 2016-01-15 | 1 | -2/+2 |
| | | |||||
| * | Update deps | Jeremy Benoist | 2016-01-15 | 2 | -170/+406 |
| | | | | | | | | | | | | LexikFormFilterBundle & RulerZBundle are now Symfony 3 compatible There are still some issue with FOSOAuthServerBundle | ||||
| * | Fix recent update | Jeremy Benoist | 2016-01-15 | 8 | -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) |