Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Unescape content for Material card | Jeremy Benoist | 2016-02-03 | 1 | -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-v2 | Jeremy Benoist | 2016-02-01 | 10 | -16/+329 |
|\ | | | | | [#1590] Add JSON import from wallabag v2 | ||||
| * | [#1590] Add JSON import from wallabag v2 | Nicolas Lœuillet | 2016-01-20 | 10 | -16/+329 |
| | | |||||
* | | Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsight | Jeremy Benoist | 2016-02-01 | 14 | -23/+9 |
|\ \ | | | | | | | [#1604] First draft to fix SensioLabsInsight report | ||||
| * | | SensioLabsInsight fixes | Nicolas Lœuillet | 2016-01-22 | 4 | -4/+4 |
| | | | |||||
| * | | [#1604] First draft to fix SensioLabsInsight report | Nicolas Lœuillet | 2016-01-22 | 13 | -19/+5 |
| | | | |||||
* | | | Fix fos_user | Nicolas Lœuillet | 2016-02-01 | 1 | -0/+5 |
| | | | |||||
* | | | Merge pull request #1629 from wallabag/fixexportformats | Nicolas Lœuillet | 2016-01-24 | 2 | -10/+11 |
|\ \ \ | | | | | | | | | fix #1620 and introduce new parameters to export | ||||
| * | | | fix #1620 and introduce new parameters to export | Thomas Citharel | 2016-01-24 | 2 | -10/+11 |
| |/ / | |||||
* / / | Add Turkish translation | Ogün Karakuş | 2016-01-24 | 2 | -0/+233 |
|/ / | | | | | | | Signed-off-by: Ogün Karakuş <kirk5bucuk@gmail.com> | ||||
* | | Move public assets for themes | Jeremy Benoist | 2016-01-22 | 90 | -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/...` | ||||
* | | CS | Jeremy Benoist | 2016-01-22 | 2 | -3/+3 |
| | | |||||
* | | Add for deleting rule from an other user | Jeremy Benoist | 2016-01-22 | 1 | -6/+49 |
| | | |||||
* | | Use FOSUserEvents instead of c/p a controller | Jeremy Benoist | 2016-01-21 | 3 | -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 findByUrlAndUserId | Jeremy Benoist | 2016-01-21 | 2 | -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 user | Jeremy Benoist | 2016-01-21 | 1 | -1/+1 |
| | | |||||
* | | Add tests on TagAllCommand | Jeremy Benoist | 2016-01-21 | 2 | -1/+61 |
| | | | | | | | | Some simple tests | ||||
* | | Use PHP7 random_bytes to generate RSS Token | Jeremy Benoist | 2016-01-21 | 1 | -11/+4 |
| | | | | | | | | random_bytes is a PHP 7 function wich has been ported to PHP 5 using paragonie/random_compat | ||||
* | | Update HTML 2FA template | Jeremy Benoist | 2016-01-21 | 6 | -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-Mails | Alexandr Danilov | 2016-01-21 | 1 | -3/+97 |
| | | |||||
* | | CS | Jeremy Benoist | 2016-01-21 | 2 | -9/+6 |
| | | |||||
* | | Use HTML email for 2FA | Jeremy Benoist | 2016-01-21 | 6 | -39/+62 |
| | | | | | | | | Related to #1490 | ||||
* | | Remove tag relation when removing an entry | Jeremy Benoist | 2016-01-20 | 1 | -1/+1 |
|/ | | | | Fix #1453 | ||||
* | Use translator interface instead of final class | Jeremy Benoist | 2016-01-17 | 3 | -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-flattr | Jeremy Benoist | 2016-01-15 | 4 | -7/+1 |
|\ | | | | | Remove Flattr references | ||||
| * | remove flattr on about page | Nicolas Lœuillet | 2016-01-15 | 4 | -7/+1 |
| | | |||||
* | | Merge pull request #1583 from wallabag/v2-fix-delete | Nicolas Lœuillet | 2016-01-15 | 8 | -18/+33 |
|\ \ | |/ |/| | Fix `findOneByUrl` side effect in tests | ||||
| * | Fix `findOneByUrl` side effect in tests | Jeremy Benoist | 2016-01-15 | 8 | -18/+33 |
| | | | | | | | | Fix #1566 | ||||
* | | Merge pull request #1524 from wallabag/sf2.8 | Nicolas Lœuillet | 2016-01-15 | 50 | -170/+202 |
|\ \ | |/ |/| | Upgrade to Symfony 3.0 | ||||
| * | Update readme & fix console permission | Jeremy Benoist | 2016-01-15 | 1 | -2/+1 |
| | | |||||
| * | Fix Pocket generateUrl parameters | Jeremy Benoist | 2016-01-15 | 1 | -2/+2 |
| | | |||||
| * | Fix recent update | Jeremy Benoist | 2016-01-15 | 8 | -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 file | Jeremy Benoist | 2016-01-15 | 15 | -43/+40 |
| | | | | | | | | | | | | - update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition) - update bundle to latest release - remove security on profiler | ||||
| * | Symfony Upgrade Fixer FTW | Jeremy Benoist | 2016-01-15 | 41 | -112/+136 |
| | | | | | | | | symfony-upgrade-fixer fix src/Wallabag/ | ||||
* | | Quickstart for beginners | Nicolas Lœuillet | 2016-01-15 | 10 | -13/+212 |
|/ | |||||
* | Merge pull request #1563 from wallabag/v2-fix-1394 | Jeremy Benoist | 2016-01-10 | 2 | -2/+2 |
|\ | | | | | #1394 Fixed 'mark as read' and 'mark as unread' links | ||||
| * | Fixed 'mark as read' and 'mark as unread' links | Nicolas Lœuillet | 2016-01-09 | 2 | -2/+2 |
| | | |||||
* | | add import link on baggy theme | Nicolas Lœuillet | 2016-01-09 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #1493 from wallabag/v2-pocket-import2.0.0-alpha.1 | Jeremy Benoist | 2016-01-07 | 37 | -15/+1687 |
|\ | | | | | v2 – 1st draft for Pocket import via API & Wallabag v1 import | ||||
| * | updated tests | Nicolas Lœuillet | 2016-01-07 | 9 | -17/+10 |
| | | |||||
| * | Added french translations | Nicolas Lœuillet | 2016-01-05 | 7 | -8/+28 |
| | | |||||
| * | Few phpDoc fix | Jeremy Benoist | 2016-01-03 | 6 | -16/+27 |
| | | | | | | | | And some little mistakes | ||||
| * | Fix tag related test for Pocket | Jeremy Benoist | 2016-01-03 | 2 | -3/+6 |
| | | |||||
| * | Add tagged services for import | Jeremy Benoist | 2016-01-02 | 24 | -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 import | Jeremy Benoist | 2016-01-02 | 12 | -94/+404 |
| | | |||||
| * | Rewrote Pocket Import | Jeremy Benoist | 2016-01-02 | 9 | -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 entry | Jeremy Benoist | 2016-01-02 | 1 | -2/+2 |
| | | | | | | | | Instead of requiring more than 1 entry (> 1) we have to check for at least one entry (> 0) | ||||
| * | Update after previous merge | Jeremy Benoist | 2016-01-02 | 10 | -112/+83 |
| | | | | | | | | PR #1443 was merged into this branch to handle all import type in the same place. | ||||
| * | First test on PocketImport | Jeremy Benoist | 2016-01-02 | 3 | -77/+202 |
| | | | | | | | | Giving ability to define the Client add abitliy to easliy test the import. | ||||
| * | Update url & service name | Jeremy Benoist | 2016-01-02 | 6 | -13/+56 |
| | | | | | | | | | | Prefix ur with service namel: [service]_[route name] Add comment in Interface |