5 commits

Author	SHA1	Message	Date
Jeremy Benoist	77a7752a59	Update after previous merge ... PR #1443 was merged into this branch to handle all import type in the same place.	2016-01-02 23:27:41 +01:00
Nicolas Lœuillet	d275bdf4d3	form to upload file	2016-01-02 23:24:17 +01:00
Nicolas Lœuillet	8c3c77c1bd	create controller to launch import command	2016-01-02 23:24:17 +01:00
Nicolas Lœuillet	a1bb1b3c2a	userId is now set in parameters	2016-01-02 23:24:17 +01:00
Nicolas Lœuillet	56ea1de99b	first draft for json import, needed for wallabag v1 migration	2016-01-02 23:24:17 +01:00