aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #1651 from wallabag/v2-fix-wllbgv2-importJeremy Benoist2016-02-053-4/+34
|\ | | | | Test if some keys are missing in v2 import
| * an other test for non empty fieldsNicolas Lœuillet2016-02-051-3/+15
| |
| * add test to check empty fieldsNicolas Lœuillet2016-02-051-0/+12
| |
| * updated fixturesNicolas Lœuillet2016-02-051-1/+1
| |
| * Test if some keys are missing in v2 importNicolas Lœuillet2016-02-051-3/+9
| |
* | Merge pull request #1650 from wallabag/v2-fix-duplicate-exportsJeremy Benoist2016-02-051-7/+8
|\ \ | | | | | | Exported entries were added twice in export file
| * | Exported entries were added twice in export fileNicolas Lœuillet2016-02-051-7/+8
| |/
* | Merge pull request #1652 from wallabag/v2-superadminJeremy Benoist2016-02-051-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œuillet2016-02-051-0/+1
|/
* Merge pull request #1648 from lologhi/patch-1Jeremy Benoist2016-02-051-1/+1
|\ | | | | Fix project version in installation command
| * Merge branch 'v2' into patch-1Laurent2016-02-051-1/+1
| |\ | |/ |/|
* | Merge pull request #1647 from wallabag/v2-install-prodNicolas Lœuillet2016-02-051-1/+1
|\ \ | | | | | | Force prod env on project creation
| * | Force prod env on project creationJeremy Benoist2016-02-041-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 commandLaurent2016-02-051-1/+1
| |
| * Fix project version in installation commandLaurent2016-02-051-1/+1
|/
* Merge pull request #1633 from wallabag/exporttxtNicolas Lœuillet2016-02-044-10/+49
|\ | | | | Exporttxt
| * Adjust export orderJeremy Benoist2016-02-042-7/+8
| | | | | | | | | | To be the same as on the entry page. Also, export name doesn't need to be translated.
| * CSJeremy Benoist2016-02-041-4/+4
| |
| * put the equals bar outside the loopThomas Citharel2016-02-041-1/+2
| |
| * remove old dependancyThomas Citharel2016-02-041-1/+0
| |
| * fix testsThomas Citharel2016-02-041-2/+19
| |
| * better display for txtThomas Citharel2016-02-042-3/+3
| |
| * add txt exportThomas Citharel2016-02-043-2/+23
|/
* Merge pull request #1642 from wallabag/v2-escape-previewJeremy Benoist2016-02-041-13/+15
|\ | | | | Unescape content for Material card
| * Unescape content for Material cardJeremy Benoist2016-02-031-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-parameterJeremy Benoist2016-02-046-2/+14
|\ \ | | | | | | Fix #1622: parameter for FosUser confirmation
| * | CSNicolas Lœuillet2016-02-047-3/+11
| | |
| * | Fix #1622: parameter for FosUser confirmationNicolas Lœuillet2016-02-045-1/+5
| | |
* | | Merge pull request #1645 from wallabag/v2-fix-loadtemplate-sendemailJeremy Benoist2016-02-043-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 authNicolas Lœuillet2016-02-043-4/+4
|/ /
* | Merge pull request #1612 from wallabag/v2-settings-pageNicolas Lœuillet2016-02-0440-245/+510
|\ \ | |/ |/| Settings page
| * Fix Shaarli url traductionJeremy Benoist2016-02-011-1/+1
| |
| * Fix from_email & fos_userJeremy Benoist2016-01-316-1/+14
| |
| * Add new export configJeremy Benoist2016-01-316-8/+56
| |
| * Fix permission to settings pageJeremy Benoist2016-01-312-1/+33
| |
| * CSJeremy Benoist2016-01-313-3/+3
| |
| * Fix testsJeremy Benoist2016-01-312-2/+11
| |
| * Use alias to get container parametersJeremy Benoist2016-01-312-5/+5
| |
| * Create internal setting on install & fixturesJeremy Benoist2016-01-312-0/+203
| |
| * We don't need migration yetJeremy Benoist2016-01-312-51/+0
| |
| * Add warning message for PocketImportJeremy Benoist2016-01-312-0/+7
| | | | | | | | Warn user if pocket_consumer_key isn't defined
| * Add CraueConfig for internal settingsJeremy Benoist2016-01-3129-173/+208
| |
| * Always include warning messageJeremy Benoist2016-01-317-28/+9
| | | | | | | | We'll remove it later, on the stable release
| * Move default configuration out of parametersJeremy Benoist2016-01-3110-40/+33
| | | | | | | | These default configuration value shouldn't be in parameters.yml.
* | Merge pull request #1641 from wallabag/v2-doc-typoJeremy Benoist2016-02-011-1/+1
|\ \ | | | | | | Update import.rst to fix a doc typo
| * | Update import.rstNicolas Lœuillet2016-02-011-1/+1
|/ /
* | Merge pull request #1601 from wallabag/v2-import-from-v2Jeremy Benoist2016-02-0112-20/+344
|\ \ | | | | | | [#1590] Add JSON import from wallabag v2
| * | [#1590] Add JSON import from wallabag v2Nicolas Lœuillet2016-01-2012-20/+344
| | |
* | | Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsightJeremy Benoist2016-02-0116-24/+10
|\ \ \ | | | | | | | | [#1604] First draft to fix SensioLabsInsight report
| * | | SensioLabsInsight fixesNicolas Lœuillet2016-01-229-12/+4
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 06:36:18 +0000