Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Move assignTagsToEntry in ContentProxy helper | Jeremy Benoist | 2016-02-19 | 3 | -59/+13 | |
| | ||||||
* | import tags from v1 (#1657) | Thomas Citharel | 2016-02-12 | 3 | -3/+44 | |
| | ||||||
* | Merge pull request #1665 from wallabag/v2-translations | Jeremy Benoist | 2016-02-11 | 2 | -2/+7 | |
|\ | | | | | lots of diverse translation stuff & some typos | |||||
| * | lots of diverse translation stuff & some typos | Thomas Citharel | 2016-02-11 | 2 | -2/+7 | |
| | | ||||||
* | | add tests | Thomas Citharel | 2016-02-11 | 5 | -12/+75 | |
| | | ||||||
* | | CS | Thomas Citharel | 2016-02-11 | 3 | -7/+5 | |
| | | ||||||
* | | reimport v1 entries if they were not fetched | Thomas Citharel | 2016-02-11 | 4 | -7/+32 | |
|/ | ||||||
* | an other test for non empty fields | Nicolas Lœuillet | 2016-02-05 | 1 | -3/+15 | |
| | ||||||
* | add test to check empty fields | Nicolas Lœuillet | 2016-02-05 | 1 | -0/+12 | |
| | ||||||
* | updated fixtures | Nicolas Lœuillet | 2016-02-05 | 1 | -1/+1 | |
| | ||||||
* | Test if some keys are missing in v2 import | Nicolas Lœuillet | 2016-02-05 | 1 | -3/+9 | |
| | ||||||
* | Merge pull request #1612 from wallabag/v2-settings-page | Nicolas Lœuillet | 2016-02-04 | 5 | -4/+21 | |
|\ | | | | | Settings page | |||||
| * | Add warning message for PocketImport | Jeremy Benoist | 2016-01-31 | 2 | -0/+7 | |
| | | | | | | | | Warn user if pocket_consumer_key isn't defined | |||||
| * | Add CraueConfig for internal settings | Jeremy Benoist | 2016-01-31 | 3 | -4/+14 | |
| | | ||||||
* | | 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 | |
| |/ | ||||||
* / | [#1604] First draft to fix SensioLabsInsight report | Nicolas Lœuillet | 2016-01-22 | 1 | -4/+0 | |
|/ | ||||||
* | Merge pull request #1583 from wallabag/v2-fix-delete | Nicolas Lœuillet | 2016-01-15 | 4 | -4/+4 | |
|\ | | | | | Fix `findOneByUrl` side effect in tests | |||||
| * | Fix `findOneByUrl` side effect in tests | Jeremy Benoist | 2016-01-15 | 4 | -4/+4 | |
| | | | | | | | | Fix #1566 | |||||
* | | Fix Pocket generateUrl parameters | Jeremy Benoist | 2016-01-15 | 1 | -2/+2 | |
| | | ||||||
* | | Fix recent update | Jeremy Benoist | 2016-01-15 | 3 | -6/+9 | |
|/ | | | | | | - 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) | |||||
* | updated tests | Nicolas Lœuillet | 2016-01-07 | 8 | -16/+9 | |
| | ||||||
* | Added french translations | Nicolas Lœuillet | 2016-01-05 | 6 | -8/+16 | |
| | ||||||
* | Few phpDoc fix | Jeremy Benoist | 2016-01-03 | 2 | -2/+3 | |
| | | | | 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 | 23 | -41/+388 | |
| | | | | | | | | | - 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 | 8 | -199/+356 | |
| | | | | | | | 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 | 6 | -2/+234 | |
| | | | | 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 | |||||
* | Change the way to check for an existing entry | Jeremy Benoist | 2016-01-02 | 1 | -2/+2 | |
| | | | | The repository method return the entry found or false if nothing exists. | |||||
* | - remove importers configuration | Nicolas Lœuillet | 2016-01-02 | 4 | -33/+10 | |
| | | | | - 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 | 4 | -13/+65 | |
| | ||||||
* | assign tags to entries and add lastPocketImport attribute to user | Nicolas Lœuillet | 2016-01-02 | 2 | -12/+66 | |
| | ||||||
* | create ImportController to list importers | Nicolas Lœuillet | 2016-01-02 | 5 | -5/+49 | |
| | ||||||
* | service call | Nicolas Lœuillet | 2016-01-02 | 1 | -2/+2 | |
| | ||||||
* | refactor pocket import | Nicolas Lœuillet | 2016-01-02 | 6 | -105/+201 | |
| | ||||||
* | 1st draft for Pocket import via API | Nicolas Lœuillet | 2016-01-02 | 3 | -0/+164 | |