Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1672 from wallabag/v2-improve-baggy-theme | Nicolas Lœuillet | 2016-02-15 | 4 | -15/+38 |
|\ | | | | | improve baggy theme (add new tag panel) | ||||
| * | fix typos | Thomas Citharel | 2016-02-15 | 1 | -3/+3 |
| | | |||||
| * | improve baggy theme (add new tag panel) | Thomas Citharel | 2016-02-14 | 4 | -15/+38 |
| | | |||||
* | | display pictures properly | Thomas Citharel | 2016-02-14 | 1 | -0/+5 |
|/ | |||||
* | Merge pull request #1656 from wallabag/v2-fix-new-user-password-prompts | Jeremy Benoist | 2016-02-11 | 1 | -0/+3 |
|\ | | | | | fix labels on new user prompt | ||||
| * | fix labels on new user prompt | Thomas Citharel | 2016-02-11 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | fix tests nl add translation validation length | ||||
* | | Merge pull request #1654 from wallabag/fix-add-button-mobile-view | Jeremy Benoist | 2016-02-11 | 1 | -4/+6 |
|\ \ | | | | | | | fix #1636 | ||||
| * | | fix #1636 | Thomas Citharel | 2016-02-08 | 1 | -4/+6 |
| |/ | |||||
* | | Better design of the close button | Alexandr Danilov | 2016-02-11 | 2 | -1/+5 |
| | | |||||
* | | Merge pull request #1663 from wallabag/v2-remove-tags-from-entry | Jeremy Benoist | 2016-02-11 | 2 | -2/+2 |
|\ \ | | | | | | | remove tag from entry #1377 | ||||
| * | | improve test and change method name. Also, display number of entries for ↵ | Thomas Citharel | 2016-02-10 | 1 | -1/+1 |
| | | | | | | | | | | | | each tag | ||||
| * | | remove tag from entry #1377 | Thomas Citharel | 2016-02-10 | 1 | -1/+1 |
| |/ | |||||
* | | better translation | Thomas Citharel | 2016-02-11 | 1 | -1/+1 |
| | | |||||
* | | lots of diverse translation stuff & some typos | Thomas Citharel | 2016-02-11 | 5 | -16/+57 |
|/ | |||||
* | Adjust export order | Jeremy Benoist | 2016-02-04 | 1 | -7/+7 |
| | | | | | To be the same as on the entry page. Also, export name doesn't need to be translated. | ||||
* | better display for txt | Thomas Citharel | 2016-02-04 | 1 | -1/+1 |
| | |||||
* | add txt export | Thomas Citharel | 2016-02-04 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1642 from wallabag/v2-escape-preview | Jeremy Benoist | 2016-02-04 | 1 | -13/+15 |
|\ | | | | | Unescape content for Material card | ||||
| * | 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 #1612 from wallabag/v2-settings-page | Nicolas Lœuillet | 2016-02-04 | 9 | -47/+50 |
|\ \ | |/ |/| | Settings page | ||||
| * | Add new export config | Jeremy Benoist | 2016-01-31 | 1 | -7/+7 |
| | | |||||
| * | Add CraueConfig for internal settings | Jeremy Benoist | 2016-01-31 | 6 | -25/+30 |
| | | |||||
| * | Always include warning message | Jeremy Benoist | 2016-01-31 | 2 | -11/+9 |
| | | | | | | | | We'll remove it later, on the stable release | ||||
| * | Move default configuration out of parameters | Jeremy Benoist | 2016-01-31 | 1 | -4/+4 |
| | | | | | | | | These default configuration value shouldn't be in parameters.yml. | ||||
* | | Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsight | Jeremy Benoist | 2016-02-01 | 6 | -4/+4 |
|\ \ | |/ |/| | [#1604] First draft to fix SensioLabsInsight report | ||||
| * | SensioLabsInsight fixes | Nicolas Lœuillet | 2016-01-22 | 2 | -2/+2 |
| | | |||||
| * | [#1604] First draft to fix SensioLabsInsight report | Nicolas Lœuillet | 2016-01-22 | 6 | -2/+2 |
| | | |||||
* | | 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 | 1 | -0/+226 |
|/ | | | | Signed-off-by: Ogün Karakuş <kirk5bucuk@gmail.com> | ||||
* | Move public assets for themes | Jeremy Benoist | 2016-01-22 | 89 | -54/+54 |
| | | | | | 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/...` | ||||
* | remove flattr on about page | Nicolas Lœuillet | 2016-01-15 | 4 | -7/+1 |
| | |||||
* | Merge pull request #1524 from wallabag/sf2.8 | Nicolas Lœuillet | 2016-01-15 | 2 | -23/+19 |
|\ | | | | | Upgrade to Symfony 3.0 | ||||
| * | Fix recent update | Jeremy Benoist | 2016-01-15 | 1 | -0/+8 |
| | | | | | | | | | | | | - 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 | 2 | -16/+4 |
| | | | | | | | | | | | | - 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 | 1 | -11/+11 |
| | | | | | | | | symfony-upgrade-fixer fix src/Wallabag/ | ||||
* | | Quickstart for beginners | Nicolas Lœuillet | 2016-01-15 | 4 | -8/+122 |
|/ | |||||
* | 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 | 4 | -1/+19 |
|\ | | | | | v2 – 1st draft for Pocket import via API & Wallabag v1 import | ||||
| * | updated tests | Nicolas Lœuillet | 2016-01-07 | 1 | -1/+1 |
| | | |||||
| * | Added french translations | Nicolas Lœuillet | 2016-01-05 | 1 | -0/+12 |
| | | |||||
| * | Add tagged services for import | Jeremy Benoist | 2016-01-02 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | - 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 | ||||
| * | Update after previous merge | Jeremy Benoist | 2016-01-02 | 1 | -30/+0 |
| | | | | | | | | PR #1443 was merged into this branch to handle all import type in the same place. | ||||
| * | Change the way to check for an existing entry | Jeremy Benoist | 2016-01-02 | 1 | -0/+1 |
| | | | | | | | | The repository method return the entry found or false if nothing exists. | ||||
| * | add docs for Import feature | Nicolas Lœuillet | 2016-01-02 | 1 | -13/+20 |
| | | |||||
| * | form to upload file | Nicolas Lœuillet | 2016-01-02 | 1 | -0/+23 |
| | | |||||
| * | create controller to launch import command | Nicolas Lœuillet | 2016-01-02 | 1 | -0/+1 |
| | | |||||
* | | Hide export button if we are not on entries list | Nicolas Lœuillet | 2016-01-06 | 1 | -0/+3 |
|/ |