Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | |
| | | ||||||
| * | 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 | |
| | | | | | | | | Warn user if pocket_consumer_key isn't defined | |||||
| * | 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 | |
| | | | | | | | | We'll remove it later, on the stable release | |||||
| * | Move default configuration out of parameters | Jeremy Benoist | 2016-01-31 | 5 | -12/+29 | |
| | | | | | | | | These default configuration value shouldn't be in parameters.yml. | |||||
* | | 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 | |||||
| * | | [#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 | |
|\ \ \ | | | | | | | | | [#1604] First draft to fix SensioLabsInsight report | |||||
| * | | | 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 |