Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1629 from wallabag/fixexportformats | Nicolas Lœuillet | 2016-01-24 | 7 | -10/+31 |
|\ | |||||
| * | fix #1620 and introduce new parameters to export | Thomas Citharel | 2016-01-24 | 7 | -10/+31 |
* | | Merge pull request #1628 from ogunkarakus/v2-turkish-translation | Nicolas Lœuillet | 2016-01-24 | 3 | -0/+234 |
|\ \ | |/ |/| | |||||
| * | Add Turkish translation | Ogün Karakuş | 2016-01-24 | 3 | -0/+234 |
|/ | |||||
* | Merge pull request #1625 from wallabag/v2-fix-1621 | Jeremy Benoist | 2016-01-23 | 1 | -1/+3 |
|\ | |||||
| * | [#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 | Jeremy Benoist | 2016-01-22 | 93 | -58/+55 |
|/ | |||||
* | Merge pull request #1618 from wallabag/v2-readme | Jeremy Benoist | 2016-01-22 | 1 | -4/+2 |
|\ | |||||
| * | 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 |
|\ | |||||
| * | 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 |
| * | Fix bad type after using findByUrlAndUserId | Jeremy Benoist | 2016-01-21 | 2 | -5/+30 |
| * | 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 |
| * | Use PHP7 random_bytes to generate RSS Token | Jeremy Benoist | 2016-01-21 | 2 | -12/+6 |
|/ | |||||
* | Merge pull request #1565 from wallabag/v2-2fa-html | Nicolas Lœuillet | 2016-01-21 | 7 | -53/+179 |
|\ | |||||
| * | Update HTML 2FA template | Jeremy Benoist | 2016-01-21 | 7 | -39/+51 |
| * | #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 |
|/ | |||||
* | Merge pull request #1610 from wallabag/v2-composer-lock-release | Nicolas Lœuillet | 2016-01-21 | 3 | -6769/+8 |
|\ | |||||
| * | Disable xdebug all the time | Jeremy Benoist | 2016-01-21 | 3 | -6769/+8 |
|/ | |||||
* | 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 | Jeremy Benoist | 2016-01-20 | 1 | -1/+1 |
* | | Merge pull request #1607 from wallabag/v2-composer-lock | Nicolas Lœuillet | 2016-01-21 | 2 | -1/+4 |
|\ \ | |/ |/| | |||||
| * | Ignore composer.lock | Jeremy Benoist | 2016-01-20 | 2 | -1/+4 |
|/ | |||||
* | Merge pull request #1599 from wallabag/v2-fix-pt-documentation | Nicolas Lœuillet | 2016-01-20 | 4 | -66/+59 |
|\ | |||||
| * | 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 | 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 | Jeremy Benoist | 2016-01-17 | 3 | -17/+14 |
|/ | |||||
* | Merge pull request #1584 from wallabag/v2-cleanup | Jeremy Benoist | 2016-01-15 | 10 | -274/+5 |
|\ | |||||
| * | some cleanup: | Nicolas Lœuillet | 2016-01-15 | 10 | -274/+5 |
* | | Merge pull request #1564 from wallabag/v2-remove-flattr | Jeremy Benoist | 2016-01-15 | 5 | -8/+1 |
|\ \ | |||||
| * | | 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 | Jeremy Benoist | 2016-01-15 | 8 | -18/+33 |
* | | Merge pull request #1524 from wallabag/sf2.8 | Nicolas Lœuillet | 2016-01-15 | 83 | -669/+1280 |
|\ \ | |/ |/| | |||||
| * | 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 |
| * | 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 |