905 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas Tanghus	97e65da810	Various file path fixes.	2012-04-30 01:48:01 +02:00
Thomas Tanghus	6843364719	Contacts: Small css tweaks.	2012-04-30 01:01:24 +02:00
Thomas Tanghus	3c3ad0d45f	Contacts: Forgot to add the import template.	2012-04-29 23:26:14 +02:00
Thomas Tanghus	82a2011dc2	Contacts: Ensure TYPE parameters on email aren't deleted on edit. They are still not shown in the UI. ... Remove an obsolute file and did some cleanup.	2012-04-29 22:12:27 +02:00
Thomas Tanghus	20734b60a9	Contacts: removed unused method and ajax file.	2012-04-29 22:12:27 +02:00
Thomas Tanghus	1f59f4c25a	jquery.combobox: Added 'showButton' option	2012-04-29 22:12:27 +02:00
Georg Ehrke	758a3d7800	Merge branch 'master' into movable_apps_2	2012-04-27 14:22:12 +02:00
Thomas Tanghus	d8cf49215a	Contacts: Added convinience method for notifications.	2012-04-27 10:35:31 +02:00
Thomas Tanghus	845cf4b51a	jquery.combobox: Added 'editable' option and cleaned up a bit.	2012-04-27 10:35:31 +02:00
Thomas Tanghus	d1b73983de	Contacts: Updated first run page.	2012-04-27 10:35:31 +02:00
Georg Ehrke	77c3143a0a	make *DAV work with movable apps	2012-04-26 21:56:29 +02:00
Georg Ehrke	849099d724	fix merge conflicts	2012-04-26 18:08:49 +02:00
Georg Ehrke	4b3864dfc1	fixes for contacts app	2012-04-26 15:20:01 +02:00
Thomas Tanghus	bd5acfaa1a	Contacts: Some js cleanup.	2012-04-26 10:38:39 +02:00
Thomas Tanghus	f01fc2e855	Contacts: Added import with with file picker.	2012-04-26 03:21:52 +02:00
Thomas Tanghus	fefe8aa158	Contacts: Fixed some file paths.	2012-04-25 10:44:27 +02:00
Georg Ehrke	ca1ab993d8	some fixes in contacts javascript files	2012-04-25 10:17:54 +02:00
Georg Ehrke	bb9a090659	fix merge conflicts	2012-04-24 21:59:56 +02:00
Georg Ehrke	a2b23b0c8a	fix pathes in contacts	2012-04-24 21:33:34 +02:00
Thomas Tanghus	d5a0940733	Added loading indicator.	2012-04-24 11:38:11 +02:00
Thomas Tanghus	887747394b	Contacts: Check that UIDs really are unique on import. Better solution would be to suggest to merge contacts, but that will have to wait to OC5 ;-)	2012-04-24 11:35:56 +02:00
Thomas Tanghus	e4eef8a698	Contacts: In app import (for Chrome and Firefox only)	2012-04-24 01:44:07 +02:00
Thomas Tanghus	953770407a	Contacts: Tried to format NOTE field a bit. Needs to be improved more though.	2012-04-24 01:44:07 +02:00
Thomas Tanghus	b543d03321	Contacts: In app import. Cleanup still needed.	2012-04-24 01:44:07 +02:00
Thomas Tanghus	5e735201b6	Applied patches by Nicolas progweb at free.fr - https://mail.kde.org/pipermail/owncloud/2012-April/002900.html	2012-04-24 01:44:07 +02:00
Georg Ehrke	2c0e6a0f38	fix contacts app a bit	2012-04-23 20:42:52 +02:00
Georg Ehrke	c6a0be939b	Merge branch 'master' into movable_apps	2012-04-23 13:03:50 +02:00
Thomas Tanghus	accab72321	Wrong app check.	2012-04-23 10:52:13 +02:00
Thomas Tanghus	0385491bd2	Contacts: Tipsyfied photo toolbar.	2012-04-23 10:52:13 +02:00
Thomas Tanghus	4f5f6aff6a	Contacts: ... - Added overlay toolbar to contact photo with 'Delete current', 'Edit current', 'Load from OC_Filesystem' and 'Upload' options. - Made action icons translucent instead of hiding them.	2012-04-22 20:47:24 +02:00
Thomas Tanghus	3f932e2a26	Contacts: Clear cache for contact photo and thumbnail when it has been changed.	2012-04-22 20:47:24 +02:00
Georg Ehrke	9e345d3bfc	fix merge conflicts	2012-04-22 13:19:12 +02:00
Thomas Tanghus	33b1d6de8e	Personal settings: Emphasized labels etc, mono-spaced generated paths and moved text formatting to style sheet.	2012-04-22 03:59:28 +02:00
Thomas Tanghus	b90b065111	Contacts: Added bg color and shadow to controls. I suck at CSS...	2012-04-22 02:32:51 +02:00
Thomas Tanghus	0b4e879838	Missing double quote.	2012-04-22 02:09:13 +02:00
Thomas Tanghus	db23d88dfd	Contacts: Fix error on photo crop.	2012-04-22 01:50:46 +02:00
Thomas Tanghus	1426763dfd	Contacts: Changed layout as discussed with JanC. Still WiP.	2012-04-22 00:44:53 +02:00
Thomas Tanghus	04b7f3f688	Don't trigger unnecessary change events.	2012-04-22 00:44:53 +02:00
Thomas Tanghus	994934a0e3	Contacts: Fixed contact photo drag'n'drop upload - again...	2012-04-22 00:44:53 +02:00
Thomas Tanghus	afcc6e905e	Contacts: Add check for empty FN field.	2012-04-22 00:44:53 +02:00
Frank Karlitschek	cd379e0c47	structure the information a bit more so that is easier readable	2012-04-21 22:55:18 +02:00
Georg Ehrke	3863a44589	remove the require_once lib base from all (or nearly all) files	2012-04-17 19:31:29 +02:00
Jakob Sack	be2524b353	Display correct URL in caldav and carddav paths	2012-04-15 16:50:45 +02:00
Jakob Sack	d1b0434d82	Remove useless, unmaintained dav.php	2012-04-15 16:50:44 +02:00
Bart Visscher	a2f39dec1d	Contact: Don't use non core class in appinfo/app.php	2012-04-14 18:34:59 +02:00
Robin Appelman	6bfb0189b6	reuse OC_L10N objects	2012-04-14 16:44:15 +02:00
Robin Appelman	085b7fc5f8	keep version numbers in their own files for faster reading	2012-04-14 16:29:11 +02:00
Tom Needham	d24b4f741f	Merge branch 'master' of gitorious.org:owncloud/owncloud	2012-04-14 11:18:25 +00:00
Robin Appelman	bb559d028f	improve flexibility of search providers a bit	2012-04-14 11:29:54 +02:00
Tom Needham	371595d077	Merge branch 'master' of gitorious.org:owncloud/owncloud	2012-04-13 20:10:35 +00:00