39 Commits

Author	SHA1	Message	Date
jbtbnl	0129e59024	Hide upload iframe and fix merge flaws	2014-08-26 19:28:45 +02:00
jbtbnl	a9ade3079d	Merge remote-tracking branch 'origin/master' into import-new-ui ... Conflicts: css/contacts.css lib/controller/importcontroller.php	2014-08-26 17:42:14 +02:00
Bernhard Reiter	1e015d9872	Rename $this->tagMgr to $this->tags as that's what they are. ... They're instances of OCP\ITags, not of OCP\ITagManager.	2014-08-19 14:29:46 +02:00
Thomas Müller	0549c01fe8	Merge pull request #568 from owncloud/adding-php-lint ... adding php-lint	2014-07-30 11:33:10 +02:00
Clark Tomlinson	e7755dcc32	Extracting closures into methods to solve php 5.3 issue #546	2014-07-30 11:07:44 +02:00
Bernhard Reiter	dd2c0f7c14	Use OCP\ITags in lib/controller/importcontroller.php.	2014-07-23 20:43:32 +02:00
root	5c5bc56ae4	fix TagMgr access ... remove unwanted error_log	2014-07-04 10:51:59 -04:00
babelouest	da0d990472	adapted import ui to fit in the ocdialog ... might be some bugs left though	2014-05-07 22:46:22 -04:00
babelouest	f3272ad159	reimplemented import ui in a ocdialog	2014-05-07 16:54:58 -04:00
Thomas Tanghus	a50b1b4860	Add use OCP\ICache to ImportController	2014-04-18 02:00:17 +02:00
Thomas Tanghus	c5bdc2f74d	Scrutinizer fixes	2014-04-08 01:19:30 +02:00
Thomas Tanghus	70438c997d	Align controllers to owncloud/core#8017	2014-04-07 22:29:24 +02:00
Thomas Tanghus	a1c8fe7f1e	Merge pull request #444 from owncloud/import_multi_format2 ... Import from multiple formats	2014-03-23 14:18:48 +01:00
babelouest	d7f8b57025	added standard vcard connector ... cleaned code according to scrutinizer log fixed import message on UI	2014-03-21 01:59:19 -04:00
Thomas Tanghus	f7811490a2	Add missing use arg to closure	2014-03-18 16:20:25 +01:00
babelouest	c85b284208	Revert "a little code cleaning, removed {count} value during the import process" ... This reverts commit 2a43562229.	2014-03-12 14:23:42 -04:00
babelouest	2a43562229	a little code cleaning, removed {count} value during the import process	2014-03-12 13:32:09 -04:00
babelouest	919f540d01	Import from multiple formats	2014-03-11 16:43:32 +01:00
Thomas Tanghus	45aa3198f7	More cleanups	2014-03-09 15:03:29 +01:00
Thomas Tanghus	9abdeb75ce	2014	2014-01-26 00:40:22 +01:00
Thomas Tanghus	b0474d7da4	Fix empty FN. Related: #353	2014-01-22 17:46:58 +01:00
Thomas Tanghus	1ee1ca9dd2	Missing var. Refs #295	2013-12-13 09:14:29 +01:00
Thomas Tanghus	6fc07aad83	Don't useoc:// wrapper. Fix #261	2013-11-28 12:18:15 +01:00
Thomas Tanghus	f8c46f1ad1	Various route and request adjustments ... * All request bodies are now JSON. * Contact property add/update/delete uses the same PATCH route.	2013-10-03 04:15:12 +02:00
Thomas Tanghus	8b6f877fea	PATCH test WiP	2013-10-01 19:15:22 +02:00
Thomas Tanghus	a15430dd18	Fix fix of misleading import progress :P	2013-10-01 19:15:22 +02:00
Thomas Tanghus	efc3a9c7d8	Fix misleading import progress	2013-10-01 19:15:22 +02:00
Thomas Tanghus	67412f3679	Port controllers to OCP\AppFramework	2013-10-01 19:15:22 +02:00
Thomas Tanghus	cfd8cd02b3	Now loads with OCP\AppFramework	2013-10-01 19:15:22 +02:00
Thomas Tanghus	322357dba1	New FileActions script for importing from filesystem. Closes #190 ... Needs owncloud/core#4784 to work properly	2013-09-10 00:30:39 +02:00
Thomas Tanghus	2ae6f1ff32	Disable FS proxy on file_put_contents/file_get_contents ... owncloud/contacts#174	2013-08-15 20:11:40 +02:00
Thomas Tanghus	d5313e1237	Add TODO	2013-08-15 20:11:40 +02:00
Thomas Tanghus	b77f104447	Improve feedback on import.	2013-06-27 15:53:31 +02:00
Thomas Tanghus	bafb64870a	TODO comment.	2013-06-27 15:53:31 +02:00
Thomas Tanghus	06c4d611b2	Missing namespace separator in GroupController	2013-05-20 23:36:49 +02:00
Thomas Tanghus	f67d18b894	Return status on partially imported vcards	2013-05-18 04:58:41 +02:00
Thomas Tanghus	653ff015e8	Access check on import	2013-05-18 04:58:41 +02:00
Thomas Tanghus	e7267209ef	Backgroung load on import and async load on init. Closes #49	2013-05-08 06:47:36 +02:00
Thomas Tanghus	d4b18987ae	Contacts: Abstract js address book access and further simplify import.	2013-05-02 20:42:24 +02:00