Thomas Tanghus d005c9123b Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategories ...

Conflicts:
	apps/contacts/lib/vcard.php
	apps/contacts/templates/part.contact.php

2012-03-08 02:55:48 +01:00

ajax

Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategories

2012-03-08 02:55:48 +01:00

appinfo

Add /dav.php, a single location bundling all *DAV-operations.

2012-03-02 20:25:20 +01:00

css

Fix conflict.

2012-03-07 20:57:05 +01:00

img

Added files for new contact editor/viewer.

2012-02-08 07:59:39 +01:00

import_tmp

add import function for contacts

2012-02-05 12:13:53 +01:00

js

Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategories

2012-03-08 02:55:48 +01:00

l10n

update translations

2012-01-27 00:59:24 +01:00

lib

Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategories

2012-03-08 02:55:48 +01:00

templates

Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategories

2012-03-08 02:55:48 +01:00

carddav.php

fix baseUri of the Carddav server

2012-02-26 21:46:20 +01:00

dynphoto.php

Updated copyrights.

2012-02-08 07:59:39 +01:00

export.php

Contacts: Add id to vars with id in them

2012-02-12 16:12:46 +01:00

import.php

Contacts: change card parameter type of VCard::edit and VCard::add

2012-03-07 21:46:42 +01:00

index.php

Merge branch 'vcategories' of gitorious.org:owncloud/owncloud into vcategories

2012-03-08 02:55:48 +01:00

photo.php

Avoid errors from missing GD library.

2012-02-17 19:04:12 +01:00

settings.php

show the syncing and ampache urls on the settings page. not very pretty but otherwise the user has no way to configure the desktop integration

2011-09-28 16:05:01 +02:00

thumbnail.php

Don't try to load a profile picture for contacts the doesn't have any.

2012-02-14 01:11:21 +01:00

Description

Contacts app for Owncloud

40 MiB

Languages

JavaScript 72.9%

PHP 25%

CSS 2%