Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1668 from wallabag/v2-stuff | Nicolas Lœuillet | 2016-02-16 | 13 | -62/+107 |
|\ | | | | | Few updates | ||||
| * | Typos | Jeremy Benoist | 2016-02-16 | 3 | -6/+6 |
| | | |||||
| * | More translations | Jeremy Benoist | 2016-02-12 | 9 | -46/+81 |
| | | |||||
| * | CS | Jeremy Benoist | 2016-02-12 | 2 | -3/+4 |
| | | |||||
| * | Add env=prod for server:run on install | Jeremy Benoist | 2016-02-12 | 1 | -1/+1 |
| | | |||||
| * | Add missing translations | Jeremy Benoist | 2016-02-12 | 2 | -2/+5 |
| | | |||||
| * | Redirect to the right tab on /config | Jeremy Benoist | 2016-02-12 | 2 | -7/+13 |
| | | |||||
* | | Merge pull request #1672 from wallabag/v2-improve-baggy-theme | Nicolas Lœuillet | 2016-02-15 | 4 | -15/+38 |
|\ \ | | | | | | | improve baggy theme (add new tag panel) | ||||
| * | | fix typos | Thomas Citharel | 2016-02-15 | 1 | -3/+3 |
| | | | |||||
| * | | improve baggy theme (add new tag panel) | Thomas Citharel | 2016-02-14 | 4 | -15/+38 |
| | | | |||||
* | | | display pictures properly | Thomas Citharel | 2016-02-14 | 1 | -0/+5 |
|/ / | |||||
* | | Merge pull request #1658 from wallabag/v2-import-v1-tags | Jeremy Benoist | 2016-02-12 | 3 | -3/+44 |
|\ \ | |/ |/| | import tags from v1 (#1657) | ||||
| * | import tags from v1 (#1657) | Thomas Citharel | 2016-02-12 | 3 | -3/+44 |
| | | |||||
* | | Merge pull request #1656 from wallabag/v2-fix-new-user-password-prompts | Jeremy Benoist | 2016-02-11 | 3 | -1/+7 |
|\ \ | |/ |/| | fix labels on new user prompt | ||||
| * | fix labels on new user prompt | Thomas Citharel | 2016-02-11 | 3 | -1/+7 |
| | | | | | | | | | | | | | | | | fix tests nl add translation validation length | ||||
* | | Merge pull request #1654 from wallabag/fix-add-button-mobile-view | Jeremy Benoist | 2016-02-11 | 1 | -4/+6 |
|\ \ | | | | | | | fix #1636 | ||||
| * | | fix #1636 | Thomas Citharel | 2016-02-08 | 1 | -4/+6 |
| |/ | |||||
* | | Better design of the close button | Alexandr Danilov | 2016-02-11 | 2 | -1/+5 |
| | | |||||
* | | Merge pull request #1663 from wallabag/v2-remove-tags-from-entry | Jeremy Benoist | 2016-02-11 | 6 | -3/+77 |
|\ \ | | | | | | | remove tag from entry #1377 | ||||
| * | | improve test and change method name. Also, display number of entries for ↵ | Thomas Citharel | 2016-02-10 | 3 | -3/+5 |
| | | | | | | | | | | | | each tag | ||||
| * | | remove tag from entry #1377 | Thomas Citharel | 2016-02-10 | 5 | -2/+74 |
| |/ | |||||
* | | Merge pull request #1665 from wallabag/v2-translations | Jeremy Benoist | 2016-02-11 | 7 | -18/+64 |
|\ \ | | | | | | | lots of diverse translation stuff & some typos | ||||
| * | | 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 |
| |/ | |||||
* | | 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 #1651 from wallabag/v2-fix-wllbgv2-import | Jeremy Benoist | 2016-02-05 | 3 | -4/+34 |
|\ | | | | | Test if some keys are missing in v2 import | ||||
| * | 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 | ||||
| * | | Exported entries were added twice in export file | Nicolas Lœuillet | 2016-02-05 | 1 | -7/+8 |
| |/ | |||||
* / | 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 |
| | | | | | To be the same as on the entry page. Also, export name doesn't need to be translated. | ||||
* | 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 | ||||
| * | Unescape content for Material card | Jeremy Benoist | 2016-02-03 | 1 | -13/+15 |
| | | | | | | | | | | | | Using slice & striptags, the content is automatically escaped. If some html character need to be displayed, they'll be escape too, sth like `&`. Using |raw, the content isn't escape twice and is well displayed. | ||||
* | | 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 |
|\ \ | |/ |/| | Settings page | ||||
| * | 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 |
| | |