Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Move annotatorjs to the bottom of the body | Thomas Citharel | 2016-02-26 | 1 | -22/+23 | |
| | | | | So that the "article" tag is loaded before | |||||
* | Add annotator in baggy theme | Nicolas Lœuillet | 2016-02-26 | 2 | -3/+20 | |
| | | | | + Documentation about annotations | |||||
* | Comment work with annotator v2 | Thomas Citharel | 2016-02-26 | 2 | -1/+29 | |
| | | | | | | - add missing annotator.js file and fix typo - edit & delete routes, started tests - basic tests | |||||
* | Change remove tag icon in entry view with material theme | Nicolas Lœuillet | 2016-02-26 | 1 | -1/+1 | |
| | ||||||
* | Make English welcome message more natural | Olivier Mehani | 2016-02-25 | 2 | -2/+2 | |
| | | | | | | sed -i "s/Welcome on wallabag/Welcome to wallabag/" Signed-off-by: Olivier Mehani <shtrom@ssji.net> | |||||
* | replace contributors with a link to github | Nicolas Lœuillet | 2016-02-23 | 2 | -127/+2 | |
| | ||||||
* | Add contributors and 3rd party libraries | Nicolas Lœuillet | 2016-02-23 | 2 | -0/+382 | |
| | ||||||
* | Use a different way to use piwik | Jeremy Benoist | 2016-02-22 | 1 | -1/+4 | |
| | ||||||
* | Fix #1137: implemented Piwik | Nicolas Lœuillet | 2016-02-19 | 1 | -0/+1 | |
| | ||||||
* | translate estimated time minutes | Thomas Citharel | 2016-02-18 | 2 | -4/+15 | |
| | ||||||
* | Merge pull request #1668 from wallabag/v2-stuff | Nicolas Lœuillet | 2016-02-16 | 9 | -49/+71 | |
|\ | | | | | Few updates | |||||
| * | Typos | Jeremy Benoist | 2016-02-16 | 2 | -3/+3 | |
| | | ||||||
| * | More translations | Jeremy Benoist | 2016-02-12 | 8 | -46/+68 | |
| | | ||||||
* | | fix typos | Thomas Citharel | 2016-02-15 | 1 | -3/+3 | |
| | | ||||||
* | | improve baggy theme (add new tag panel) | Thomas Citharel | 2016-02-14 | 2 | -11/+18 | |
|/ | ||||||
* | Better design of the close button | Alexandr Danilov | 2016-02-11 | 1 | -1/+1 | |
| | ||||||
* | 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 | |
| | | ||||||
* | | lots of diverse translation stuff & some typos | Thomas Citharel | 2016-02-11 | 4 | -15/+7 | |
|/ | ||||||
* | 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 | 7 | -41/+43 | |
|\ \ | |/ |/| | Settings page | |||||
| * | Add new export config | Jeremy Benoist | 2016-01-31 | 1 | -7/+7 | |
| | | ||||||
| * | Add CraueConfig for internal settings | Jeremy Benoist | 2016-01-31 | 4 | -23/+27 | |
| | | ||||||
| * | Always include warning message | Jeremy Benoist | 2016-01-31 | 2 | -11/+9 | |
| | | | | | | | | We'll remove it later, on the stable release | |||||
* | | Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsight | Jeremy Benoist | 2016-02-01 | 4 | -2/+2 | |
|\ \ | |/ |/| | [#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 | 4 | -0/+0 | |
| | | ||||||
* | | fix #1620 and introduce new parameters to export | Thomas Citharel | 2016-01-24 | 2 | -10/+11 | |
|/ | ||||||
* | Move public assets for themes | Jeremy Benoist | 2016-01-22 | 88 | -18919/+38 | |
| | | | | | 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 | 2 | -4/+0 | |
| | ||||||
* | Merge pull request #1524 from wallabag/sf2.8 | Nicolas Lœuillet | 2016-01-15 | 1 | -1/+1 | |
|\ | | | | | Upgrade to Symfony 3.0 | |||||
| * | Update bundle & stock file | Jeremy Benoist | 2016-01-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | - update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition) - update bundle to latest release - remove security on profiler | |||||
* | | Quickstart for beginners | Nicolas Lœuillet | 2016-01-15 | 3 | -1/+91 | |
|/ | ||||||
* | 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 | 2 | -1/+6 | |
|\ | | | | | v2 – 1st draft for Pocket import via API & Wallabag v1 import | |||||
| * | 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. | |||||
| * | 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 | |
|/ | ||||||
* | Backport all icomoon from v1 | Jeremy Benoist | 2015-12-30 | 6 | -37/+42 | |
| | | | | And add a reload icon | |||||
* | Ability to reload an entry | Jeremy Benoist | 2015-12-30 | 2 | -0/+9 | |
| | | | | | | Could be useful when we want to update the content or when the content failed to be fetched. Fix #1503 |