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

1646 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robin Appelman
d717b8e8b9 Merge branch 'master' into filesystem 2012-10-30 23:00:10 +01:00
Robin Appelman
6df32185b9 Merge branch 'master' into gallery 2012-10-30 22:46:51 +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
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