aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/ImportBundle/Resources
Commit message (Collapse)AuthorAgeFilesLines
* Make English welcome message more naturalOlivier Mehani2016-02-251-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-translationsJeremy Benoist2016-02-111-1/+6
|\ | | | | lots of diverse translation stuff & some typos
| * lots of diverse translation stuff & some typosThomas Citharel2016-02-111-1/+6
| |
* | reimport v1 entries if they were not fetchedThomas Citharel2016-02-111-0/+2
|/
* Merge pull request #1612 from wallabag/v2-settings-pageNicolas Lœuillet2016-02-042-1/+7
|\ | | | | Settings page
| * Add warning message for PocketImportJeremy Benoist2016-01-311-0/+6
| | | | | | | | Warn user if pocket_consumer_key isn't defined
| * Add CraueConfig for internal settingsJeremy Benoist2016-01-311-1/+1
| |
* | [#1590] Add JSON import from wallabag v2Nicolas Lœuillet2016-01-202-0/+11
|/
* updated testsNicolas Lœuillet2016-01-074-5/+3
|
* Added french translationsNicolas Lœuillet2016-01-054-3/+5
|
* Add tagged services for importJeremy Benoist2016-01-024-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 importJeremy Benoist2016-01-023-0/+38
|
* Rewrote Pocket ImportJeremy Benoist2016-01-023-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 mergeJeremy Benoist2016-01-021-0/+26
| | | | PR #1443 was merged into this branch to handle all import type in the same place.
* First test on PocketImportJeremy Benoist2016-01-021-0/+11
| | | | Giving ability to define the Client add abitliy to easliy test the import.
* Update url & service nameJeremy Benoist2016-01-023-6/+6
| | | | | Prefix ur with service namel: [service]_[route name] Add comment in Interface
* - remove importers configurationNicolas Lœuillet2016-01-021-1/+0
| | | | - add check on userId for findOneByURL for entries
* fix #1502 avoid duplicate entry and store pocket url in configNicolas Lœuillet2016-01-021-0/+1
|
* assign tags to entries and add lastPocketImport attribute to userNicolas Lœuillet2016-01-021-1/+1
|
* create ImportController to list importersNicolas Lœuillet2016-01-021-0/+16
|
* refactor pocket importNicolas Lœuillet2016-01-021-0/+8
|
* 1st draft for Pocket import via APINicolas Lœuillet2016-01-021-0/+16