aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1658 from wallabag/v2-import-v1-tagsJeremy Benoist2016-02-123-3/+44
|\ | | | | import tags from v1 (#1657)
| * import tags from v1 (#1657)Thomas Citharel2016-02-123-3/+44
| |
* | Merge pull request #1656 from wallabag/v2-fix-new-user-password-promptsJeremy Benoist2016-02-113-1/+7
|\ \ | |/ |/| fix labels on new user prompt
| * fix labels on new user promptThomas Citharel2016-02-113-1/+7
| | | | | | | | | | | | | | | | fix tests nl add translation validation length
* | Merge pull request #1654 from wallabag/fix-add-button-mobile-viewJeremy Benoist2016-02-111-4/+6
|\ \ | | | | | | fix #1636
| * | fix #1636Thomas Citharel2016-02-081-4/+6
| |/
* | Better design of the close buttonAlexandr Danilov2016-02-112-1/+5
| |
* | 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-117-18/+64
|\ \ | | | | | | lots of diverse translation stuff & some typos
| * | better translationThomas Citharel2016-02-111-1/+1
| | |
| * | lots of diverse translation stuff & some typosThomas Citharel2016-02-117-18/+64
| |/
* | 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 #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
| |/
* / User created via wallabag:install is now a SUPER_ADMIN :crown:Nicolas Lœuillet2016-02-051-0/+1
|/
* Adjust export orderJeremy Benoist2016-02-041-7/+7
| | | | | 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-042-1/+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.
* | 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-0427-74/+405
|\ \ | |/ |/| Settings page
| * Fix from_email & fos_userJeremy Benoist2016-01-311-0/+5
| |
| * Add new export configJeremy Benoist2016-01-313-7/+47
| |
| * Fix permission to settings pageJeremy Benoist2016-01-311-0/+32
| |
| * 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
| |
| * 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-3116-40/+65
| |
| * Always include warning messageJeremy Benoist2016-01-312-11/+9
| | | | | | | | We'll remove it later, on the stable release
| * Move default configuration out of parametersJeremy Benoist2016-01-315-12/+29
| | | | | | | | These default configuration value shouldn't be in parameters.yml.
* | Merge pull request #1601 from wallabag/v2-import-from-v2Jeremy Benoist2016-02-0110-16/+329
|\ \ | | | | | | [#1590] Add JSON import from wallabag v2
| * | [#1590] Add JSON import from wallabag v2Nicolas Lœuillet2016-01-2010-16/+329
| | |
* | | Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsightJeremy Benoist2016-02-0114-23/+9
|\ \ \ | | | | | | | | [#1604] First draft to fix SensioLabsInsight report
| * | | SensioLabsInsight fixesNicolas Lœuillet2016-01-224-4/+4
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 17:45:09 +0000