Thomas Tanghus 3ac86ce032 Merge branch 'five_zero_dot_one' into contacts_backends ...

Conflicts:
	contacts/ajax/contact/saveproperty.php
	contacts/import.php
	contacts/js/app.js
	contacts/js/contacts.js
	contacts/js/groups.js
	contacts/lib/carddav/backend.php

2013-03-12 09:24:06 +01:00

..

app.js

Merge branch 'five_zero_dot_one' into contacts_backends

2013-03-12 09:24:06 +01:00

contacts.js

Contacts: Much improved d'n'd.

2013-03-12 00:28:41 +01:00

cropphoto.js

Contacts: More inline js in photo editor :-/

2013-01-25 16:48:14 +01:00

expanding.js

Fix whitespace in contacts

2012-09-07 14:32:45 +02:00

groups.js

Contacts: Much improved d'n'd.

2013-03-12 00:28:41 +01:00

jquery.combobox.js

Contacts: combox's underlying select wasn't updated on change.

2013-02-04 22:58:17 +01:00

jquery.Jcrop.js

Fix whitespace in contacts

2012-09-07 14:32:45 +02: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

loader.js

Contacts: Use anchor instead of parameter.

2013-01-25 19:01:40 +01:00

modernizr.custom.js

Contacts: Updated custom Modernizr.

2012-12-20 23:00:05 +01:00

modernizr.js

First work on new Contacts js and group based UI.

2012-09-17 16:15:31 +02:00

placeholder_polyfill.jquery.js

Contacts: Add proper un-minified plcaholder polyfill.

2013-01-25 17:00:54 +01:00

placeholder_polyfill.jquery.min.combo.js

Contacts: Added customized Modernizr and replaced placeholder polyfill

2012-12-17 22:41:21 +01:00

settings.js

Major rewrite almost done.

2012-10-05 05:05:49 +02:00