aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Use HTML email for 2FAJeremy Benoist2016-01-216-39/+62
| | | | | | | | Related to #1490
* | Remove tag relation when removing an entryJeremy Benoist2016-01-201-1/+1
|/ | | | Fix #1453
* Use translator interface instead of final classJeremy Benoist2016-01-173-17/+14
| | | | | | | | | Symfony use a different class when in dev mode and prod mode. Prod loads `Symfony\Bundle\FrameworkBundle\Translation\Translator`. Dev loads `Symfony\Component\Translation\DataCollectorTranslator` to gather information for the debug bar. Fix #1585
* Merge pull request #1564 from wallabag/v2-remove-flattrJeremy Benoist2016-01-154-7/+1
|\ | | | | Remove Flattr references
| * remove flattr on about pageNicolas Lœuillet2016-01-154-7/+1
| |
* | Merge pull request #1583 from wallabag/v2-fix-deleteNicolas Lœuillet2016-01-158-18/+33
|\ \ | |/ |/| Fix `findOneByUrl` side effect in tests
| * Fix `findOneByUrl` side effect in testsJeremy Benoist2016-01-158-18/+33
| | | | | | | | Fix #1566
* | Merge pull request #1524 from wallabag/sf2.8Nicolas Lœuillet2016-01-1550-170/+202
|\ \ | |/ |/| Upgrade to Symfony 3.0
| * Update readme & fix console permissionJeremy Benoist2016-01-151-2/+1
| |
| * Fix Pocket generateUrl parametersJeremy Benoist2016-01-151-2/+2
| |
| * Fix recent updateJeremy Benoist2016-01-158-19/+31
| | | | | | | | | | | | - some missing url parameters from WallabagRestController & EntryController - use a service for `EntryFilterType` to use fully qualified name instead (so changing class signature) - update ImportBundle (url & form)