1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-13 23:49:04 +01:00
Commit Graph

2232 Commits

Author SHA1 Message Date
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
Robin Appelman
019fef640a merge master into gallery 2012-10-28 12:58:16 +01:00
Robin Appelman
3b0ce012d7 Revert "[tx-robot] updated from transifex" due to merge conflicts
This reverts commit a468d47dfb2ca740e25edfac3b11a6ea21ee1546.
2012-10-28 12:53:13 +01:00
Robin Appelman
1e92a928fc Merge branch 'master' into filesystem 2012-10-28 10:29:03 +01:00
Jenkins for ownCloud
f353a19ab9 [tx-robot] updated from transifex 2012-10-28 00:02:30 +02:00
Robin Appelman
0eeab1c036 Merge branch 'master' into filesystem 2012-10-27 18:12:32 +02:00
Jan-Christoph Borchardt
617a622c95 first step to update icons for changes in core navigation, still needs sprited hover state 2012-10-27 17:46:14 +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
Robin Appelman
2d022b19b4 Merge branch 'master' into filesystem 2012-10-27 15:31:19 +02:00
Bart Visscher
d696522f3a Merge branch 'routing' 2012-10-27 15:07:15 +02:00
Robin Appelman
3e5d1cc907 merge master into filesystem 2012-10-27 14:30:30 +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
Robin Appelman
97dfa6354d Merge branch 'master' into filesystem 2012-10-26 10:44:21 +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
Robin Appelman
3e8b85b706 Merge branch 'master' into filesystem 2012-10-25 18:27:01 +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
Robin Appelman
afb9d8abf8 Merge branch 'master' into filesystem 2012-10-24 15:32:48 +02:00
Jenkins for ownCloud
b299f3a5d1 [tx-robot] updated from transifex 2012-10-24 02:10:00 +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
Thomas Tanghus
9a905a2157 Style empty fields to be easier recognizable. 2012-10-23 06:54:19 +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