| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | 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 |
| * | Always include warning message | Jeremy Benoist | 2016-01-31 | 7 | -28/+9 |
| * | Move default configuration out of parameters | Jeremy Benoist | 2016-01-31 | 10 | -40/+33 |
* | | Merge pull request #1641 from wallabag/v2-doc-typo | Jeremy Benoist | 2016-02-01 | 1 | -1/+1 |
|\ \ |
|
| * | | Update import.rst | Nicolas Lœuillet | 2016-02-01 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #1601 from wallabag/v2-import-from-v2 | Jeremy Benoist | 2016-02-01 | 12 | -20/+344 |
|\ \ |
|
| * | | [#1590] Add JSON import from wallabag v2 | Nicolas Lœuillet | 2016-01-20 | 12 | -20/+344 |
* | | | Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsight | Jeremy Benoist | 2016-02-01 | 16 | -24/+10 |
|\ \ \ |
|
| * | | | SensioLabsInsight fixes | Nicolas Lœuillet | 2016-01-22 | 9 | -12/+4 |
| * | | | [#1604] First draft to fix SensioLabsInsight report | Nicolas Lœuillet | 2016-01-22 | 17 | -20/+14 |
* | | | | Merge pull request #1639 from wallabag/v2-change-test-dbname | Jeremy Benoist | 2016-02-01 | 3 | -2/+7 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Fix fos_user | Nicolas Lœuillet | 2016-02-01 | 1 | -0/+5 |
| * | | | Fix #1635: change database name for test environments (mysql/pgsql) | Nicolas Lœuillet | 2016-02-01 | 2 | -2/+2 |
|/ / / |
|