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

981 Commits

Author SHA1 Message Date
Robin Appelman
6d0e568cf8 merge master into filesystem 2012-11-04 21:08:15 +01:00
Jenkins for ownCloud
8a5f0ae5c5 [tx-robot] updated from transifex 2012-11-03 00:02:23 +01:00
Robin Appelman
4f2fe3282b Merge branch 'master' into filesystem 2012-11-01 16:45:10 +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
Robin Appelman
d717b8e8b9 Merge branch 'master' into filesystem 2012-10-30 23:00:10 +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
Jenkins for ownCloud
49d1c3b059 [tx-robot] updated from transifex 2012-10-30 00:03:08 +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
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
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
Robin Appelman
3e8b85b706 Merge branch 'master' into filesystem 2012-10-25 18:27:01 +02:00
Jenkins for ownCloud
6ff83b2c6a [tx-robot] updated from transifex 2012-10-25 09:36:01 +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
Jenkins for ownCloud
78f16969fd [tx-robot] updated from transifex 2012-10-23 02:11:00 +02:00
Brice Maron
b1cb8a044b Fix some style 2012-10-22 21:11:36 +00:00
Jenkins for ownCloud
22a6d095e6 [tx-robot] updated from transifex 2012-10-22 02:11:04 +02:00
Robin Appelman
f8f449317f Merge branch 'master' into filesystem 2012-10-21 15:16:52 +02:00
Jenkins for ownCloud
38086a5b34 [tx-robot] updated from transifex 2012-10-21 02:11:26 +02:00
Robin Appelman
e85db34ad6 Merge branch 'master' into filesystem 2012-10-20 23:50:57 +02:00
Jenkins for ownCloud
36bb2fc7aa [tx-robot] updated from transifex 2012-10-20 02:09:57 +02:00
Robin Appelman
3ab11c37b4 Merge branch 'master' into filesystem 2012-10-18 23:22:27 +02:00
Susinthiran Sithamparanathan
9c3ba7bed0 Update Contacts and Calendar with namespaces for Sabre 1.7.1 2012-10-18 23:08:26 +02:00
Jenkins for ownCloud
62a5aad742 [tx-robot] updated from transifex 2012-10-18 22:59:03 +02:00
Jenkins for ownCloud
2ce8dc0cc3 [tx-robot] updated from transifex 2012-10-18 02:09:11 +02:00
Robin Appelman
1cccadf27b merge master into filesystem 2012-10-17 13:08:10 +02:00
Jenkins for ownCloud
6a6d91c4bb [tx-robot] updated from transifex 2012-10-16 23:34:50 +02:00
Thomas Tanghus
2bd762c86f Unshare Calendar/Event/Addressbook/Contact on delete. 2012-10-16 22:25:03 +02:00
Thomas Tanghus
506fe0b9f9 Remove stray error_log statement. 2012-10-16 22:24:03 +02:00
Jenkins for ownCloud
df74b0f862 [tx-robot] updated from transifex 2012-10-16 02:11:11 +02:00
Jenkins for ownCloud
3ed636ae11 [tx-robot] updated from transifex 2012-10-14 02:11:45 +02:00
Robin Appelman
377cc47373 Merge branch 'master' into filesystem 2012-10-13 04:25:46 +02:00
Jenkins for ownCloud
11f063b481 [tx-robot] updated from transifex 2012-10-13 02:11:52 +02:00
Lukas Reschke
0f88c4a051 Check if url is valid 2012-10-12 14:51:17 +02:00
Jenkins for ownCloud
015d58ba64 [tx-robot] updated from transifex 2012-10-12 02:08:54 +02:00
Jenkins for ownCloud
249aac82ff [tx-robot] updated from transifex 2012-10-11 02:10:53 +02:00
Robin Appelman
1eabea54ff don't use depricated OC_Filesystem 2012-10-10 13:18:05 +02:00
Jenkins for ownCloud
89928d59de [tx-robot] updated from transifex 2012-10-10 02:12:53 +02:00
Jenkins for ownCloud
8a2b073e53 [tx-robot] updated from transifex 2012-10-08 02:09:32 +02:00
Jenkins for ownCloud
1e4c2fa6e4 [tx-robot] updated from transifex 2012-10-06 02:10:11 +02:00