aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
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
| |/
* / 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
| | | |
| * | | [#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 export
| * | | fix #1620 and introduce new parameters to exportThomas Citharel2016-01-242-10/+11
| |/ /
* / / Add Turkish translationOgün Karakuş2016-01-242-0/+233
|/ / | | | | | | Signed-off-by: Ogün Karakuş <kirk5bucuk@gmail.com>
* | Move public assets for themesJeremy Benoist2016-01-2290-55/+55
| | | | | | | | | | So they can be installed using the `assets:install` command and there'll no longer symlink in the repo They moved from `web/themes/...` to `bundles/wallabagcore/themes/...`
* | CSJeremy Benoist2016-01-222-3/+3
| |
* | Add for deleting rule from an other userJeremy Benoist2016-01-221-6/+49
| |
* | Use FOSUserEvents instead of c/p a controllerJeremy Benoist2016-01-213-75/+48
| | | | | | | | | | The `resetAction` was overriden to redirect user to the homepage instead of `fos_user_profile_show`. Instead of copying the whole method we can simply use FOSUserEvents to handle that.
* | Fix bad type after using findByUrlAndUserIdJeremy Benoist2016-01-212-5/+30
| | | | | | | | | | It returns an object since few commits this part of (untested) code still use an array. Also add test for that part of code.
* | Fix bad redirection when adding a new userJeremy Benoist2016-01-211-1/+1
| |
* | Add tests on TagAllCommandJeremy Benoist2016-01-212-1/+61
| | | | | | | | Some simple tests
* | Use PHP7 random_bytes to generate RSS TokenJeremy Benoist2016-01-211-11/+4
| | | | | | | | random_bytes is a PHP 7 function wich has been ported to PHP 5 using paragonie/random_compat
* | Update HTML 2FA templateJeremy Benoist2016-01-216-36/+51
| | | | | | | | | | | | Split paragraph in translation Inject wallabag_url for image in HTML template Remove username & password from config_dev.yml (null are already the default value)
* | #1490 HTML in E-MailsAlexandr Danilov2016-01-211-3/+97
| |
* | CSJeremy Benoist2016-01-212-9/+6
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 10:54:04 +0000