aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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)
| * Update bundle & stock fileJeremy Benoist2016-01-1515-43/+40
| | | | | | | | | | | | - update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition) - update bundle to latest release - remove security on profiler
| * Symfony Upgrade Fixer FTWJeremy Benoist2016-01-1541-112/+136
| | | | | | | | symfony-upgrade-fixer fix src/Wallabag/
* | Quickstart for beginnersNicolas Lœuillet2016-01-1510-13/+212
|/
* Merge pull request #1563 from wallabag/v2-fix-1394Jeremy Benoist2016-01-102-2/+2
|\ | | | | #1394 Fixed 'mark as read' and 'mark as unread' links
| * Fixed 'mark as read' and 'mark as unread' linksNicolas Lœuillet2016-01-092-2/+2
| |
* | add import link on baggy themeNicolas Lœuillet2016-01-091-0/+1
|/
* Merge pull request #1493 from wallabag/v2-pocket-import2.0.0-alpha.1Jeremy Benoist2016-01-0737-15/+1687
|\ | | | | v2 – 1st draft for Pocket import via API & Wallabag v1 import
| * updated testsNicolas Lœuillet2016-01-079-17/+10
| |
| * Added french translationsNicolas Lœuillet2016-01-057-8/+28
| |
| * Few phpDoc fixJeremy Benoist2016-01-036-16/+27
| | | | | | | | And some little mistakes
| * Fix tag related test for PocketJeremy Benoist2016-01-032-3/+6
| |
| * Add tagged services for importJeremy Benoist2016-01-0224-42/+393
| | | | | | | | | | | | | | | | | | - list services in /import - add url to import service - ImportBundle routing are now prefixed by /import - optimize flush in each import (flushing each 20 contents) - improve design of each import - add more tests
| * Rewrote Wallabag v1 importJeremy Benoist2016-01-0212-94/+404
| |
| * Rewrote Pocket ImportJeremy Benoist2016-01-029-210/+357
| | | | | | | | | | | | | | For the moment, we won't do a queue system, just a plain synchronous import. We also use ContentProxy to grab content for each article from Pocket. Error from Pocket are now logged using the logger. The ImportInterface need to be simple and not related to oAuth (not all import will use that method).
| * Fix the way to check for an existing entryJeremy Benoist2016-01-021-2/+2
| | | | | | | | Instead of requiring more than 1 entry (> 1) we have to check for at least one entry (> 0)
| * Update after previous mergeJeremy Benoist2016-01-0210-112/+83
| | | | | | | | PR #1443 was merged into this branch to handle all import type in the same place.
| * First test on PocketImportJeremy Benoist2016-01-023-77/+202
| | | | | | | | Giving ability to define the Client add abitliy to easliy test the import.
| * Update url & service nameJeremy Benoist2016-01-026-13/+56
| | | | | | | | | | Prefix ur with service namel: [service]_[route name] Add comment in Interface