Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make English welcome message more natural | Olivier Mehani | 2016-02-25 | 1 | -1/+1 |
| | | | | | | sed -i "s/Welcome on wallabag/Welcome to wallabag/" Signed-off-by: Olivier Mehani <shtrom@ssji.net> | ||||
* | Merge pull request #1665 from wallabag/v2-translations | Jeremy Benoist | 2016-02-11 | 1 | -1/+6 |
|\ | | | | | lots of diverse translation stuff & some typos | ||||
| * | lots of diverse translation stuff & some typos | Thomas Citharel | 2016-02-11 | 1 | -1/+6 |
| | | |||||
* | | reimport v1 entries if they were not fetched | Thomas Citharel | 2016-02-11 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #1612 from wallabag/v2-settings-page | Nicolas Lœuillet | 2016-02-04 | 2 | -1/+7 |
|\ | | | | | Settings page | ||||
| * | Add warning message for PocketImport | Jeremy Benoist | 2016-01-31 | 1 | -0/+6 |
| | | | | | | | | Warn user if pocket_consumer_key isn't defined | ||||
| * | Add CraueConfig for internal settings | Jeremy Benoist | 2016-01-31 | 1 | -1/+1 |
| | | |||||
* | | [#1590] Add JSON import from wallabag v2 | Nicolas Lœuillet | 2016-01-20 | 2 | -0/+11 |
|/ | |||||
* | updated tests | Nicolas Lœuillet | 2016-01-07 | 4 | -5/+3 |
| | |||||
* | Added french translations | Nicolas Lœuillet | 2016-01-05 | 4 | -3/+5 |
| | |||||
* | Add tagged services for import | Jeremy Benoist | 2016-01-02 | 4 | -13/+32 |
| | | | | | | | | | - 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 | 3 | -0/+38 |
| | |||||
* | Rewrote Pocket Import | Jeremy Benoist | 2016-01-02 | 3 | -38/+13 |
| | | | | | | | 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). | ||||
* | Update after previous merge | Jeremy Benoist | 2016-01-02 | 1 | -0/+26 |
| | | | | 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 | 1 | -0/+11 |
| | | | | Giving ability to define the Client add abitliy to easliy test the import. | ||||
* | Update url & service name | Jeremy Benoist | 2016-01-02 | 3 | -6/+6 |
| | | | | | Prefix ur with service namel: [service]_[route name] Add comment in Interface | ||||
* | - remove importers configuration | Nicolas Lœuillet | 2016-01-02 | 1 | -1/+0 |
| | | | | - add check on userId for findOneByURL for entries | ||||
* | fix #1502 avoid duplicate entry and store pocket url in config | Nicolas Lœuillet | 2016-01-02 | 1 | -0/+1 |
| | |||||
* | assign tags to entries and add lastPocketImport attribute to user | Nicolas Lœuillet | 2016-01-02 | 1 | -1/+1 |
| | |||||
* | create ImportController to list importers | Nicolas Lœuillet | 2016-01-02 | 1 | -0/+16 |
| | |||||
* | refactor pocket import | Nicolas Lœuillet | 2016-01-02 | 1 | -0/+8 |
| | |||||
* | 1st draft for Pocket import via API | Nicolas Lœuillet | 2016-01-02 | 1 | -0/+16 |