Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Add missing @ in version number | Jeremy Benoist | 2016-02-12 | 1 | -1/+1 | |
| | | | | | | | | [UnexpectedValueException] Could not parse version constraint 2.0.*alpha: Invalid version string "2.0.*alpha" | |||||
* | | 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 | 9 | -18/+74 | |
|\ \ | | | | | | | lots of diverse translation stuff & some typos | |||||
| * | | translate craue config button | Thomas Citharel | 2016-02-11 | 2 | -0/+6 | |
| | | | ||||||
| * | | translation craue_config_panel | Thomas Citharel | 2016-02-11 | 1 | -0/+4 | |
| | | | ||||||
| * | | 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 | |
|\ \ | | | | | | | reimport v1 entries if they were not fetched | |||||
| * | | 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 | |||||
| * | 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 | |
|\ | | | | | 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 | |
| |/ | ||||||
* | | 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: | |||||
| * | 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 | |
|\ | | | | | Fix project version in installation command | |||||
| * | 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 | |||||
| * | | Force prod env on project creation | Jeremy Benoist | 2016-02-04 | 1 | -1/+1 | |
|/ / | | | | | | | | | | | | | | | | | So the only solution I found so far is to force the `prod` env when create the project with composer. There is other solution. Since the `cache:clear` task is using `dev` env by default, so it tries to load dev bundle, which aren't there since we specify `--no-dev`. Fix #1617 | |||||
| * | 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 | |
|\ | | | | | Exporttxt | |||||
| * | Adjust export order | Jeremy Benoist | 2016-02-04 | 2 | -7/+8 | |
| | | | | | | | | | | 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 | 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 | |||||
| * | 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. | |||||
* | | Merge pull request #1644 from wallabag/v2-enable-confirmation-parameter | Jeremy Benoist | 2016-02-04 | 6 | -2/+14 | |
|\ \ | | | | | | | Fix #1622: parameter for FosUser confirmation | |||||
| * | | 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 | |||||
| * | | Fix #1643: fix the way to load the HTML template in 2factor auth | Nicolas Lœuillet | 2016-02-04 | 3 | -4/+4 | |
|/ / |