1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-11-30 12:24:11 +01:00
Commit Graph

1067 Commits

Author SHA1 Message Date
Thomas Tanghus
10d7fbdb92 Add missing upload iframe. 2012-11-05 12:37:05 +01:00
Thomas Tanghus
358721f249 Merge branch 'master' of github.com:owncloud/apps into contacts_rework
Conflicts:
	contacts/js/contacts.js
2012-11-01 15:34:57 +01:00
Thomas Tanghus
501ec1052d app:contacts: Add/remove multiple contacts to/from group. 2012-11-01 15:31:58 +01:00
Thomas Tanghus
71e247f097 Namespace fix. 2012-11-01 15:31:36 +01:00
Thomas Tanghus
307409b7e2 Open contact from search without reloading app. 2012-11-01 02:01:00 +01:00
Thomas Tanghus
09843741e3 Fix namespace error. 2012-11-01 02:00:29 +01:00
Thomas Tanghus
27fd043e4f Contacts: Also show address when adding it. Fixes issue #96. 2012-11-01 00:38:41 +01:00
Jenkins for ownCloud
30a6061a7e [tx-robot] updated from transifex 2012-11-01 00:03:46 +01:00
Thomas Tanghus
7383915904 Added more error checking to db queries. 2012-10-31 21:37:49 +01:00
Thomas Tanghus
7ccaa51361 Merge branch 'master' of github.com:owncloud/apps into contacts_rework
Conflicts:
	contacts/appinfo/app.php
2012-10-31 16:14:37 +01:00
Thomas Tanghus
a96fea3541 VCF export plugin now included in SabreDAV. 2012-10-30 08:49:24 +01:00
Thomas Tanghus
8c3ed1d894 Correct app include path. 2012-10-30 07:25:28 +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
Thomas Tanghus
db8175bb3d Use local namespace. 2012-10-30 07:08:41 +01:00
Thomas Tanghus
ef893ce9c7 Move unused variable. 2012-10-30 07:08:00 +01:00
Thomas Tanghus
d98861d841 Change variable name. 2012-10-30 07:07:30 +01:00
Thomas Tanghus
93db2ca723 Add some docs and reminders. 2012-10-30 07:06:37 +01:00
Thomas Tanghus
efb1db1788 Remove not needed method. 2012-10-30 07:05:27 +01:00
Thomas Tanghus
812a966b42 Improvements on callback functions. 2012-10-30 07:03:09 +01:00
Jenkins for ownCloud
49d1c3b059 [tx-robot] updated from transifex 2012-10-30 00:03:08 +01:00
Jenkins for ownCloud
f353a19ab9 [tx-robot] updated from transifex 2012-10-28 00:02:30 +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
Bart Visscher
d696522f3a Merge branch 'routing' 2012-10-27 15:07:15 +02:00
Jenkins for ownCloud
9e01d27c0b [tx-robot] updated from transifex 2012-10-27 00:03:27 +02:00
Thomas Tanghus
3ccef884ff Small code adjustments. 2012-10-26 14:03:42 +02:00
Thomas Tanghus
d5be1ca5cd Add missing titles. 2012-10-26 14:02:49 +02:00
Thomas Tanghus
deba6a55c7 Tweak hiding/showing columns in contact list on resize. 2012-10-26 14:01:37 +02:00
Jenkins for ownCloud
d0e06b6d6d [tx-robot] updated from transifex 2012-10-26 02:08:14 +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
de087c822f Attempt to fix input rendering. 2012-10-25 23:20:23 +02:00
Thomas Tanghus
72d911f9cc Test if jsondata is present. 2012-10-25 23:19:06 +02:00
Thomas Tanghus
2cac6c08ca Tweak the micro templating. 2012-10-25 23:18:36 +02:00
Thomas Tanghus
eb87100b9f Improvements on addressbook selection/creation. 2012-10-25 23:17:29 +02:00
Thomas Tanghus
62ebef32cc Catch-all ajax errors. 2012-10-25 23:15:47 +02:00
Thomas Tanghus
66b2d0c42a Missed to namespace a class name. 2012-10-25 23:13:59 +02:00
Thomas Tanghus
a208a66df2 Keep array of names for properties that can appear more than once. 2012-10-25 23:12:21 +02:00
Thomas Tanghus
b8813e0357 Only do checksum on properties that can appear more than once. Cuts off around a 3rd of the the json response size. 2012-10-25 23:10:36 +02:00
Thomas Tanghus
3b3adb318a Use mb_convert_encoding() if iconv() is not available. 2012-10-25 23:09:39 +02:00
Thomas Tanghus
d5d81b36c7 Check if iconv exists. 2012-10-25 18:04:57 +02:00
Jenkins for ownCloud
6ff83b2c6a [tx-robot] updated from transifex 2012-10-25 09:36:01 +02:00
Thomas Tanghus
69cdc09d93 Use OCA namespace. 2012-10-25 03:34:12 +02:00
Thomas Tanghus
d91cfdf5b3 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-24 21:49:40 +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
40873db0c3 Render shared contact books as groups and some fine-tuning. 2012-10-24 20:31:29 +02:00
Thomas Tanghus
ef0ca10c60 Maintain data structure client side. 2012-10-24 20:30:41 +02:00
Thomas Tanghus
c7bc0e39d5 Add data-parameter attributes. 2012-10-24 20:29:44 +02:00
Thomas Tanghus
0179b9a488 Add parameter to control if shared addressbooks should also be returned. 2012-10-24 20:28:43 +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