upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-13 13:08:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'master' into calendar_sharing

Browse source
This commit is contained in:
Georg Ehrke 2012-03-26 21:46:40 +02:00
commit a867bcab46
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
AUTHORS
View file

@ -5,6 +5,13 @@ ownCloud is written by:
Jan-Christoph Borchardt
Michael Gapczynski
Arthur Schiwon
Bart Visscher
Georg Ehrke
Brice Maron
Tom Needham
Marvin Thomas Rabe
Florian Pritz
Bartek Przybylski
…
With help from many libraries and frameworks including:

11
apps/contacts/ajax/addproperty.php
View file

@ -122,13 +122,4 @@ if(!OC_Contacts_VCard::edit($id,$vcard)) {
exit();
}
$adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
$phone_types = OC_Contacts_App::getTypesOfProperty('TEL');
$tmpl = new OC_Template('contacts','part.property');
$tmpl->assign('adr_types',$adr_types);
$tmpl->assign('phone_types',$phone_types);
$tmpl->assign('property',OC_Contacts_VCard::structureProperty($property,$line));
$page = $tmpl->fetchPage();
OC_JSON::success(array('data' => array( 'checksum' => $checksum, 'page' => $page )));
OC_JSON::success(array('data' => array( 'checksum' => $checksum )));