rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-29 11:24:11 +01:00
Code Issues Releases Activity
1,649 Commits 18 Branches 95 Tags 40 MiB
5e938caf75
Commit Graph

303 Commits

Author SHA1 Message Date
Thomas Tanghus
3ac86ce032 Merge branch 'five_zero_dot_one' into contacts_backends 
Conflicts:
	contacts/ajax/contact/saveproperty.php
	contacts/import.php
	contacts/js/app.js
	contacts/js/contacts.js
	contacts/js/groups.js
	contacts/lib/carddav/backend.php
 2013-03-12 09:24:06 +01:00
Thomas Tanghus
0449d706ed Contacts: Temporarily use AddressbookLegacy 2013-03-12 09:14:06 +01:00
Thomas Tanghus
052db9fd1d Contacts: Removed stale files. 2013-03-10 12:54:05 +01:00
Thomas Tanghus
e811e010c4 Contacts: Remove stale code. 2013-03-10 12:48:37 +01:00
Thomas Tanghus
3612530787 Contacts: Make sure all parameters are saved. 2013-03-10 12:48:08 +01:00
Thomas Tanghus
832dcd0bfb Contacts: Log exception. 2013-03-10 12:42:38 +01:00
Thomas Tanghus
2b4deef3cc Contacts: Some property parameters were not saved 2013-03-09 17:00:05 +01:00
Thomas Tanghus
8fe237e90f Contacts: Sanitize paths properly this time ;) 2013-03-09 16:30:09 +01:00
Thomas Tanghus
49c52afae1 Contacts: Output sanitation and blacklist checking. 2013-03-09 14:55:05 +01:00
Thomas Tanghus
ec24a73c48 Contacts: Properly escape commas and semi-colons. 2013-03-05 02:31:14 +01:00
Thomas Tanghus
faa16f939b Contacts: Remove some debug statements and make an argument check in function. 2013-02-26 20:32:47 +01:00
Jörg Thalheim
2fd275e7d2 contacts/ajax/savecrop.php loadFromdata -> loadFromData 2013-02-03 22:06:53 +01:00
Robin Appelman
3828729f92 merge master into filesystem 2013-01-28 03:17:27 +01:00
Thomas Tanghus
f8e40090cb Contacts: Removed unused files. 2013-01-25 16:55:08 +01:00
Thomas Tanghus
c5c8b29964 Contacts: Move check for indexed state to ajax call. 2013-01-25 15:08:56 +01:00
Robin Appelman
e3c6556280 Merge branch 'master' into filesystem 2013-01-20 03:00:44 +01:00
Thomas Tanghus
c334fe58df Contacts: Don't double add parameters. 2013-01-17 14:48:46 +01:00
Robin Appelman
b40a935d94 Merge master into filesystem 2013-01-03 15:57:29 +01:00
Thomas Tanghus
1010d35115 Contacts: Add missing file. 2013-01-02 01:48:46 +01:00
Robin Appelman
9469dd4cbc Merge branch 'master' into filesystem 2012-12-11 23:42:22 +01:00
Thomas Tanghus
edd356a252 Contacts: Enable Caching contact list if not changed. 2012-12-07 15:09:13 +01:00
Robin Appelman
f83a170f72 merge master into filesystem 2012-11-30 00:20:16 +01:00
Thomas Tanghus
c77f60f2a7 Contacts: Make updating vcards when deleting category optional. 2012-11-23 01:17:53 +01:00
Thomas Tanghus
e9de8f406b Contacts: refactor adding to/removing from group. 2012-11-23 01:16:46 +01:00
Thomas Tanghus
46c6ccafcc Contacts: sanitize input on adding groups. 2012-11-22 19:34:31 +01:00
Thomas Tanghus
82884dee9f Contacts: Delete group functionality. 2012-11-22 19:32:47 +01:00
Thomas Tanghus
3ac9cf0d1f Contacts: Edit structured name inline. 2012-11-22 04:09:52 +01:00
Thomas Tanghus
2f23a59fad Contacts: Various fixes and cleanups. 2012-11-22 00:31:08 +01:00
Thomas Tanghus
f5a58df90e Contacts: Namespace cleanup on DRYing. 2012-11-22 00:16:20 +01:00
Thomas Tanghus
3a25cc050e Contacts: Use Sabre\VObject 2012-11-22 00:14:03 +01:00
Thomas Tanghus
6933e1c6bc Contacts: Fixed adding on first change. 2012-11-16 04:40:35 +01:00
Robin Appelman
2194e944b5 Merge branch 'master' into filesystem 2012-11-15 00:38:46 +01:00
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
Robin Appelman
0eeab1c036 Merge branch 'master' into filesystem 2012-10-27 18:12:32 +02: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
Robin Appelman
51f649bbd9 Merge branch 'master' into filesystem 2012-10-23 16:17:29 +02:00
Thomas Tanghus
051d0f027d Load last selected group on or all if first time. 2012-10-23 10:55:18 +02:00