aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1663 from wallabag/v2-remove-tags-from-entryJeremy Benoist2016-02-116-3/+77
|\
| * improve test and change method name. Also, display number of entries for each...Thomas Citharel2016-02-103-3/+5
| * remove tag from entry #1377Thomas Citharel2016-02-105-2/+74
* | Merge pull request #1665 from wallabag/v2-translationsJeremy Benoist2016-02-117-18/+64
|\ \
| * | 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
|\
| * 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 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
* 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 cardJeremy Benoist2016-02-031-13/+15
* | 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
|\ \ | |/ |/|
| * 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
| * Add CraueConfig for internal settingsJeremy Benoist2016-01-3116-40/+65
| * Always include warning messageJeremy Benoist2016-01-312-11/+9
| * Move default configuration out of parametersJeremy Benoist2016-01-315-12/+29
* | Merge pull request #1601 from wallabag/v2-import-from-v2Jeremy Benoist2016-02-0110-16/+329
|\ \
| * | [#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
|\ \ \
| * | | SensioLabsInsight fixesNicolas Lœuillet2016-01-224-4/+4
| * | | [#1604] First draft to fix SensioLabsInsight reportNicolas Lœuillet2016-01-2213-19/+5
* | | | Fix fos_userNicolas Lœuillet2016-02-011-0/+5
| |_|/ |/| |
* | | Merge pull request #1629 from wallabag/fixexportformatsNicolas Lœuillet2016-01-242-10/+11
|\ \ \
| * | | fix #1620 and introduce new parameters to exportThomas Citharel2016-01-242-10/+11
| |/ /
* / / Add Turkish translationOgün Karakuş2016-01-242-0/+233
|/ /
* | Move public assets for themesJeremy Benoist2016-01-2290-55/+55
* | CSJeremy Benoist2016-01-222-3/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 00:49:31 +0000