| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | better translation | Thomas Citharel | 2016-02-11 | 1 | -1/+1 |
| * | | lots of diverse translation stuff & some typos | Thomas Citharel | 2016-02-11 | 7 | -18/+64 |
| |/ |
|
* | | Merge pull request #1666 from wallabag/v2-reimport-v1-articles-if-not-fetched | Jeremy Benoist | 2016-02-11 | 6 | -13/+99 |
|\ \ |
|
| * | | add tests | Thomas Citharel | 2016-02-11 | 5 | -12/+75 |
| * | | CS | Thomas Citharel | 2016-02-11 | 3 | -7/+5 |
| * | | reimport v1 entries if they were not fetched | Thomas Citharel | 2016-02-11 | 4 | -7/+32 |
| |/ |
|
* | | Merge pull request #1659 from 0wnrepo/patch-1 | Jeremy Benoist | 2016-02-09 | 1 | -2/+2 |
|\ \
| |/
|/| |
|
| * | Update README.md with the environment parameters | 0wnrepo | 2016-02-09 | 1 | -2/+2 |
|/ |
|
* | Merge pull request #1651 from wallabag/v2-fix-wllbgv2-import | Jeremy Benoist | 2016-02-05 | 3 | -4/+34 |
|\ |
|
| * | an other test for non empty fields | Nicolas Lœuillet | 2016-02-05 | 1 | -3/+15 |
| * | add test to check empty fields | Nicolas Lœuillet | 2016-02-05 | 1 | -0/+12 |
| * | updated fixtures | Nicolas Lœuillet | 2016-02-05 | 1 | -1/+1 |
| * | Test if some keys are missing in v2 import | Nicolas Lœuillet | 2016-02-05 | 1 | -3/+9 |
* | | Merge pull request #1650 from wallabag/v2-fix-duplicate-exports | Jeremy Benoist | 2016-02-05 | 1 | -7/+8 |
|\ \ |
|
| * | | Exported entries were added twice in export file | Nicolas Lœuillet | 2016-02-05 | 1 | -7/+8 |
| |/ |
|
* | | Merge pull request #1652 from wallabag/v2-superadmin | Jeremy Benoist | 2016-02-05 | 1 | -0/+1 |
|\ \
| |/
|/| |
|
| * | User created via wallabag:install is now a SUPER_ADMIN :crown: | Nicolas Lœuillet | 2016-02-05 | 1 | -0/+1 |
|/ |
|
* | Merge pull request #1648 from lologhi/patch-1 | Jeremy Benoist | 2016-02-05 | 1 | -1/+1 |
|\ |
|
| * | Merge branch 'v2' into patch-1 | Laurent | 2016-02-05 | 1 | -1/+1 |
| |\
| |/
|/| |
|
* | | Merge pull request #1647 from wallabag/v2-install-prod | Nicolas Lœuillet | 2016-02-05 | 1 | -1/+1 |
|\ \ |
|
| * | | Force prod env on project creation | Jeremy Benoist | 2016-02-04 | 1 | -1/+1 |
|/ / |
|
| * | Working generic command | Laurent | 2016-02-05 | 1 | -1/+1 |
| * | Fix project version in installation command | Laurent | 2016-02-05 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #1633 from wallabag/exporttxt | Nicolas Lœuillet | 2016-02-04 | 4 | -10/+49 |
|\ |
|
| * | Adjust export order | Jeremy Benoist | 2016-02-04 | 2 | -7/+8 |
| * | 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 | 3 | -2/+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 |
* | | Merge pull request #1644 from wallabag/v2-enable-confirmation-parameter | Jeremy Benoist | 2016-02-04 | 6 | -2/+14 |
|\ \ |
|
| * | | CS | Nicolas Lœuillet | 2016-02-04 | 7 | -3/+11 |
| * | | Fix #1622: parameter for FosUser confirmation | Nicolas Lœuillet | 2016-02-04 | 5 | -1/+5 |
* | | | Merge pull request #1645 from wallabag/v2-fix-loadtemplate-sendemail | Jeremy Benoist | 2016-02-04 | 3 | -4/+4 |
|\ \ \
| |/ /
|/| | |
|
| * | | 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 | 40 | -245/+510 |
|\ \
| |/
|/| |
|
| * | Fix Shaarli url traduction | Jeremy Benoist | 2016-02-01 | 1 | -1/+1 |
| * | Fix from_email & fos_user | Jeremy Benoist | 2016-01-31 | 6 | -1/+14 |
| * | Add new export config | Jeremy Benoist | 2016-01-31 | 6 | -8/+56 |
| * | Fix permission to settings page | Jeremy Benoist | 2016-01-31 | 2 | -1/+33 |
| * | 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 |
| * | We don't need migration yet | Jeremy Benoist | 2016-01-31 | 2 | -51/+0 |
| * | Add warning message for PocketImport | Jeremy Benoist | 2016-01-31 | 2 | -0/+7 |
| * | Add CraueConfig for internal settings | Jeremy Benoist | 2016-01-31 | 29 | -173/+208 |