Thomas Tanghus 0f02508121 Merge branch 'master' of github.com:owncloud/apps into contacts_rework ...

Conflicts:
	contacts/ajax/contact/details.php
	contacts/lib/addressbook.php
	contacts/lib/vcard.php

2012-11-12 00:46:15 +01:00

ajax

Merge branch 'master' of github.com:owncloud/apps into contacts_rework

2012-11-12 00:46:15 +01:00

appinfo

Contacts: Added db structure for searchable fields. Relates to issue #113

2012-11-11 22:18:05 +01:00

css

Merge branch 'master' of github.com:owncloud/apps into contacts_rework

2012-11-11 20:22:02 +01:00

img

Added icons for favorites.

2012-10-22 15:32:03 +02:00

js

Contacts: Hide preferred checkbox if only one property of the type (TEL/EMAIL/URL etc.)

2012-11-05 20:52:54 +01:00

l10n

[tx-robot] updated from transifex

2012-11-10 00:02:50 +01:00

lib

Merge branch 'master' of github.com:owncloud/apps into contacts_rework

2012-11-12 00:46:15 +01:00

templates

Merge branch 'master' of github.com:owncloud/apps into contacts_rework

2012-11-12 00:46:15 +01:00

carddav.php

Code style.

2012-07-20 17:11:13 +02:00

export.php

Use OCA namespace.

2012-10-25 03:34:12 +02:00

import.php

Use OCA namespace.

2012-10-25 03:34:12 +02:00

index.php

Use OCA namespace.

2012-10-25 03:34:12 +02:00

photo.php

Use OCA namespace.

2012-10-25 03:34:12 +02:00

settings.php

Use OCA namespace.

2012-10-25 03:34:12 +02:00

thumbnail.php

Use OCA namespace.

2012-10-25 03:34:12 +02:00

tmpphoto.php

Code style.

2012-07-20 17:11:13 +02:00

Description

Contacts app for Owncloud

40 MiB

Languages

JavaScript 72.9%

PHP 25%

CSS 2%