| Commit message (Expand) | Author | Age | Files | Lines |
* | User created via wallabag:install is now a SUPER_ADMIN :crown: | Nicolas Lœuillet | 2016-02-05 | 1 | -0/+1 |
* | Adjust export order | Jeremy Benoist | 2016-02-04 | 1 | -7/+7 |
* | CS | Jeremy Benoist | 2016-02-04 | 1 | -4/+4 |
* | put the equals bar outside the loop | Thomas Citharel | 2016-02-04 | 1 | -1/+2 |
* | remove old dependancy | Thomas Citharel | 2016-02-04 | 1 | -1/+0 |
* | fix tests | Thomas Citharel | 2016-02-04 | 1 | -2/+19 |
* | better display for txt | Thomas Citharel | 2016-02-04 | 2 | -3/+3 |
* | add txt export | Thomas Citharel | 2016-02-04 | 2 | -1/+23 |
* | Merge pull request #1642 from wallabag/v2-escape-preview | Jeremy Benoist | 2016-02-04 | 1 | -13/+15 |
|\ |
|
| * | Unescape content for Material card | Jeremy Benoist | 2016-02-03 | 1 | -13/+15 |
* | | Fix #1643: fix the way to load the HTML template in 2factor auth | Nicolas Lœuillet | 2016-02-04 | 3 | -4/+4 |
* | | Merge pull request #1612 from wallabag/v2-settings-page | Nicolas Lœuillet | 2016-02-04 | 27 | -74/+405 |
|\ \
| |/
|/| |
|
| * | Fix from_email & fos_user | Jeremy Benoist | 2016-01-31 | 1 | -0/+5 |
| * | Add new export config | Jeremy Benoist | 2016-01-31 | 3 | -7/+47 |
| * | Fix permission to settings page | Jeremy Benoist | 2016-01-31 | 1 | -0/+32 |
| * | CS | Jeremy Benoist | 2016-01-31 | 3 | -3/+3 |
| * | Fix tests | Jeremy Benoist | 2016-01-31 | 2 | -2/+11 |
| * | Use alias to get container parameters | Jeremy Benoist | 2016-01-31 | 2 | -5/+5 |
| * | Create internal setting on install & fixtures | Jeremy Benoist | 2016-01-31 | 2 | -0/+203 |
| * | Add warning message for PocketImport | Jeremy Benoist | 2016-01-31 | 2 | -0/+7 |
| * | Add CraueConfig for internal settings | Jeremy Benoist | 2016-01-31 | 16 | -40/+65 |
| * | Always include warning message | Jeremy Benoist | 2016-01-31 | 2 | -11/+9 |
| * | Move default configuration out of parameters | Jeremy Benoist | 2016-01-31 | 5 | -12/+29 |
* | | Merge pull request #1601 from wallabag/v2-import-from-v2 | Jeremy Benoist | 2016-02-01 | 10 | -16/+329 |
|\ \ |
|
| * | | [#1590] Add JSON import from wallabag v2 | Nicolas Lœuillet | 2016-01-20 | 10 | -16/+329 |
* | | | Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsight | Jeremy Benoist | 2016-02-01 | 14 | -23/+9 |
|\ \ \ |
|
| * | | | SensioLabsInsight fixes | Nicolas Lœuillet | 2016-01-22 | 4 | -4/+4 |
| * | | | [#1604] First draft to fix SensioLabsInsight report | Nicolas Lœuillet | 2016-01-22 | 13 | -19/+5 |
* | | | | Fix fos_user | Nicolas Lœuillet | 2016-02-01 | 1 | -0/+5 |
| |_|/
|/| | |
|
* | | | Merge pull request #1629 from wallabag/fixexportformats | Nicolas Lœuillet | 2016-01-24 | 2 | -10/+11 |
|\ \ \ |
|
| * | | | fix #1620 and introduce new parameters to export | Thomas Citharel | 2016-01-24 | 2 | -10/+11 |
| |/ / |
|
* / / | Add Turkish translation | Ogün Karakuş | 2016-01-24 | 2 | -0/+233 |
|/ / |
|
* | | Move public assets for themes | Jeremy Benoist | 2016-01-22 | 90 | -55/+55 |
* | | 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 | 1 | -11/+4 |
* | | Update HTML 2FA template | Jeremy Benoist | 2016-01-21 | 6 | -36/+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 |
* | | Remove tag relation when removing an entry | Jeremy Benoist | 2016-01-20 | 1 | -1/+1 |
|/ |
|
* | Use translator interface instead of final class | Jeremy Benoist | 2016-01-17 | 3 | -17/+14 |
* | Merge pull request #1564 from wallabag/v2-remove-flattr | Jeremy Benoist | 2016-01-15 | 4 | -7/+1 |
|\ |
|
| * | remove flattr on about page | Nicolas Lœuillet | 2016-01-15 | 4 | -7/+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 |