Michael Gapczynski 6db5e23c77 Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/app.php apps/contacts/templates/part.chooseaddressbook.rowfields.php		2012-08-06 13:49:54 -04:00
..
contacts.js	Correct path to ajax file.	2012-08-05 03:36:16 +02:00
expanding.js	Add missing file.	2012-05-04 20:17:15 +02:00
jquery.combobox.js	Edited combobox to adhere to coding standards and added a dblclick handler.	2012-06-07 16:44:54 +02:00
jquery.inview.js	Try to avoid occasional error messages.	2012-07-14 14:11:43 +02:00
jquery.inview.txt	Added license and waiver of conditions for jquery.inview.	2011-12-30 21:07:16 +01:00
jquery.Jcrop.js	Added files for new contact editor/viewer.	2012-02-08 08:47:03 +01:00
jquery.Jcrop.min.js	Added files for new contact editor/viewer.	2012-02-08 08:47:03 +01:00
jquery.multi-autocomplete.js	Don't trigger unnecessary change events.	2012-04-22 00:44:53 +02:00
LICENSE.jquery.inview	Added license and waiver of conditions for jquery.inview.	2011-12-30 21:07:16 +01:00
loader.js	Make file actions permissions aware	2012-07-25 16:33:08 -04:00
settings.js	Return properly formatted jsondata.	2012-08-02 19:03:45 +02:00