| Commit message (Expand) | Author | Age | Files | Lines |
* | Make English welcome message more natural | Olivier Mehani | 2016-02-25 | 1 | -1/+1 |
* | 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 | 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 |
|\ |
|
| * | Add warning message for PocketImport | Jeremy Benoist | 2016-01-31 | 2 | -0/+7 |
| * | 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 | 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 | Jeremy Benoist | 2016-01-15 | 4 | -4/+4 |
* | | Fix Pocket generateUrl parameters | Jeremy Benoist | 2016-01-15 | 1 | -2/+2 |
* | | Fix recent update | Jeremy Benoist | 2016-01-15 | 3 | -6/+9 |
|/ |
|
* | 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 |
* | 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 |
* | Rewrote Wallabag v1 import | Jeremy Benoist | 2016-01-02 | 12 | -94/+404 |
* | Rewrote Pocket Import | Jeremy Benoist | 2016-01-02 | 8 | -199/+356 |
* | Update after previous merge | Jeremy Benoist | 2016-01-02 | 6 | -2/+234 |
* | First test on PocketImport | Jeremy Benoist | 2016-01-02 | 3 | -77/+202 |
* | Update url & service name | Jeremy Benoist | 2016-01-02 | 6 | -13/+56 |
* | Change the way to check for an existing entry | Jeremy Benoist | 2016-01-02 | 1 | -2/+2 |
* | - remove importers configuration | Nicolas Lœuillet | 2016-01-02 | 4 | -33/+10 |
* | 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 |