rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-28 10:24:11 +01:00
Code Issues Releases Activity
Contacts app for Owncloud
1,883 Commits 18 Branches 95 Tags 40 MiB
JavaScript 72.9%
PHP 25%
CSS 2%
c3fa18e4a7
Go to file
Thomas Tanghus c3fa18e4a7 Merge branch 'contacts_backends' into contacts_oc6 
Conflicts:
	contacts/ajax/categories/add.php
	contacts/ajax/contact/add.php
	contacts/appinfo/app.php
	contacts/appinfo/migrate.php
	contacts/css/contacts.css
	contacts/index.php
	contacts/js/app.js
	contacts/js/contacts.js
	contacts/js/groups.js
	contacts/lib/app.php
	contacts/lib/carddav/addressbook.php
	contacts/lib/sabre/backend.php
	contacts/lib/vcard.php
	contacts/templates/contacts.php
	contacts/thumbnail.php
2013-04-17 15:07:59 +02:00
ajax Contacts: Improved image upload 2013-04-08 22:35:28 +02:00
appinfo Merge branch 'contacts_backends' into contacts_oc6 2013-04-17 15:07:59 +02:00
css Merge branch 'contacts_backends' into contacts_oc6 2013-04-17 15:07:59 +02:00
img new app icon style for new design 2013-01-17 11:54:52 +07:00
js Merge branch 'contacts_backends' into contacts_oc6 2013-04-17 15:07:59 +02:00
l10n [tx-robot] updated from transifex 2013-04-17 10:03:48 +02:00
lib Remove obsolete TODOs 2013-04-17 14:37:22 +02:00
templates Merge branch 'contacts_backends' into contacts_oc6 2013-04-17 15:07:59 +02:00
tests Contacts: Add more routes and wrap response in a JSONResponse object. 2013-03-28 03:19:01 +01:00
carddav.php Code style. 2012-07-20 17:11:13 +02:00
export.php Contacts: Fix export 2013-04-08 22:39:53 +02:00
import.php Contacts: Rename 'database' backend to 'local' 2013-04-07 22:33:40 +02:00
index.php Contacts: Use octemplate from core. 2013-04-15 22:47:11 +02:00
photo.php Merge branch 'contacts_backends' into contacts_oc6 2013-04-17 15:07:59 +02:00
settings.php Use OCA namespace. 2012-10-25 03:34:12 +02:00
thumbnail.php Contacts: Add ownership checks to pics and export. 2013-04-12 13:49:55 +02:00
tmpphoto.php Code style. 2012-07-20 17:11:13 +02:00