rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-01 13:24:10 +01:00
Code Issues Releases Activity
1,133 Commits 18 Branches 95 Tags 40 MiB
873452eda9
Commit Graph

267 Commits

Author SHA1 Message Date
Thomas Tanghus
b83796e251 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 
Conflicts:
	contacts/ajax/categories/categoriesfor.php
	contacts/ajax/contact/saveproperty.php
	contacts/js/contacts.js
	contacts/lib/vcard.php
 2012-11-14 01:11:42 +01:00
Thomas Tanghus
2fe8439bfb Made adding contact work again. 2012-11-13 22:42:55 +01:00
Thomas Tanghus
bec1bb5e78 Merge branch 'master' of github.com:owncloud/apps into vcategories_db 
Conflicts:
	contacts/appinfo/app.php
 2012-11-13 12:02:15 +01:00
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
Thomas Tanghus
3759c2d02e Contacts: Use correct TYPE parameter when saving PHOTO. 2012-11-11 20:45:45 +01:00
Thomas Tanghus
814819092e Use CRUDS consts as defined in https://github.com/owncloud/core/pull/356 2012-11-11 19:43:44 +01:00
Thomas Tanghus
501ec1052d app:contacts: Add/remove multiple contacts to/from group. 2012-11-01 15:31:58 +01:00
Thomas Tanghus
ec86736336 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 
Fix conflicts:
	contacts/ajax/contact/saveproperty.php
	contacts/js/contacts.js
	contacts/lib/hooks.php
	contacts/lib/search.php
	contacts/lib/vcard.php
 2012-10-30 07:19:56 +01:00
Bart Visscher
c2d29f20f7 Merge remote-tracking branch 'git://github.com/susinths/apps' 
Conflicts:
	calendar/ajax/event/edit.form.php
	calendar/lib/object.php
 2012-10-27 16:36:06 +02:00
Thomas Tanghus
bc727eeba4 Make groups sortable. 2012-10-26 01:57:16 +02:00
Thomas Tanghus
3ab079e781 Cut some more off of the json response. 2012-10-26 00:02:44 +02:00
Thomas Tanghus
69cdc09d93 Use OCA namespace. 2012-10-25 03:34:12 +02:00
Thomas Tanghus
48f4cab791 Cache thumbnails and use remote.php service to avoid loading all apps for each thumbnail. 2012-10-24 21:35:51 +02:00
Thomas Tanghus
78abf7443f Also return shared addressbooks as categories. 2012-10-24 20:28:00 +02:00
Thomas Tanghus
8807ad547a Format 2012-10-24 20:27:09 +02:00
Thomas Tanghus
051d0f027d Load last selected group on or all if first time. 2012-10-23 10:55:18 +02:00
Thomas Tanghus
7ed03dcd8b Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-23 06:35:12 +02:00
Thomas Tanghus
be71373eb2 Merge branch 'master' of github.com:owncloud/apps into vcategories_db 2012-10-23 06:33:38 +02:00
Thomas Tanghus
2dba1d3672 Re-added deleting properties. 2012-10-23 06:27:22 +02:00
Brice Maron
b1cb8a044b Fix some style 2012-10-22 21:11:36 +00:00
Thomas Tanghus
e5c6665a05 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-22 15:37:50 +02:00
Thomas Tanghus
148c69ac33 Finished implementing favorites. 2012-10-22 15:35:33 +02:00
Thomas Tanghus
5b972b74a8 Added ajax file to set user preferences. 2012-10-22 15:26:28 +02:00
Thomas Tanghus
a9f57aff48 Spacing. 2012-10-22 15:25:12 +02:00
Thomas Tanghus
3479f711cf Trying to save some ajax files from git disaster. 2012-10-19 21:38:40 +02:00
Thomas Tanghus
451716dbba Use type, not app for categories. 2012-10-19 02:28:27 +02:00
Thomas Tanghus
4890bdf705 Don't set checksum for non-existing property. 2012-10-19 02:27:37 +02:00
Thomas Tanghus
2ef24d5983 Updated category poc for Contacts. 2012-10-19 00:23:32 +02:00
Susinthiran Sithamparanathan
9c3ba7bed0 Update Contacts and Calendar with namespaces for Sabre 1.7.1 2012-10-18 23:08:26 +02:00
Thomas Tanghus
87273d60af Merge branch 'master' of github.com:owncloud/apps into vcategories_db 
Conflicts:
	contacts/lib/vcard.php
 2012-10-18 18:11:32 +02:00
Thomas Tanghus
506fe0b9f9 Remove stray error_log statement. 2012-10-16 22:24:03 +02:00
Thomas Tanghus
d7354034ae Major rewrite almost done. 2012-10-05 05:05:49 +02:00
Thomas Tanghus
2bcb9647f8 Return contact structure after adding 2012-09-30 06:35:43 +02:00
Thomas Tanghus
6b77479899 First work on new Contacts js and group based UI. 2012-09-17 16:15:31 +02:00
Thomas Tanghus
b0b25c043d Merge branch 'master' of github.com:owncloud/apps into vcategories_db 2012-09-13 18:17:58 +02:00
Thomas Tanghus
6dabd60e5a Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-09-12 23:01:49 +02:00
Thomas Tanghus
3992402f1a Removed debug statement. 2012-09-12 21:19:15 +02:00
Thomas Tanghus
740995ced3 Use category format const. 2012-09-11 15:33:09 +02:00
Thomas Tanghus
fbfe8aab45 Transitional filter-by-category design take 1. 2012-09-11 14:19:28 +02:00
Thomas Tanghus
818ddc1d13 And spell permissions correctly ;) 2012-09-09 18:48:28 +02:00
Thomas Tanghus
d321fe1549 Get permissions when loading contact. 2012-09-09 18:43:46 +02:00
Thomas Tanghus
c4c6323432 Addressbook selection didn't show if there was only one. 2012-09-08 03:50:38 +02:00
Thomas Mueller
089b7e8f8a adding space between) and { 2012-09-07 15:21:03 +02:00
Bart Visscher
b179feeea2 Fix whitespace in contacts 2012-09-07 14:32:45 +02:00
Bart Visscher
0986558df2 Remove empty lines at end of file 2012-09-07 14:25:28 +02:00
Thomas Tanghus
aefe7db84c Don't write translated shared by strings to db, instead have a shared indicator on the addressbook. 2012-09-06 02:12:22 +02:00
Thomas Tanghus
1d94d98668 Addressbook selection dialig didn't show names or descriptions. 2012-09-05 16:45:18 +02:00
Thomas Tanghus
1836adca99 Add missing permission checks. 2012-09-01 22:55:53 +02:00
Thomas Tanghus
c33e5b0517 Simplify showing intro when no contacts. For reasons unknown also fixes oc-1588. 2012-09-01 06:41:36 +02:00
Thomas Tanghus
8ff56cfbf2 Fix return values on update. 2012-08-31 05:12:18 +02:00