aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1663 from wallabag/v2-remove-tags-from-entryJeremy Benoist2016-02-116-3/+77
|\ | | | | remove tag from entry #1377
| * improve test and change method name. Also, display number of entries for ↵Thomas Citharel2016-02-103-3/+5
| | | | | | | | each tag
| * remove tag from entry #1377Thomas Citharel2016-02-105-2/+74
| |
* | Merge pull request #1665 from wallabag/v2-translationsJeremy Benoist2016-02-119-18/+74
|\ \ | | | | | | lots of diverse translation stuff & some typos
| * | translate craue config buttonThomas Citharel2016-02-112-0/+6
| | |
| * | translation craue_config_panelThomas Citharel2016-02-111-0/+4
| | |
| * | better translationThomas Citharel2016-02-111-1/+1
| | |
| * | lots of diverse translation stuff & some typosThomas Citharel2016-02-117-18/+64
| |/
* | Merge pull request #1666 from wallabag/v2-reimport-v1-articles-if-not-fetchedJeremy Benoist2016-02-116-13/+99
|\ \ | | | | | | reimport v1 entries if they were not fetched
| * | add testsThomas Citharel2016-02-115-12/+75
| | |
| * | CSThomas Citharel2016-02-113-7/+5
| | |
| * | reimport v1 entries if they were not fetchedThomas Citharel2016-02-114-7/+32
| |/
* | Merge pull request #1659 from 0wnrepo/patch-1Jeremy Benoist2016-02-091-2/+2
|\ \ | |/ |/| Update README.md with the environment parameters
| * Update README.md with the environment parameters0wnrepo2016-02-091-2/+2
|/
* 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 08:52:17 +0000