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

1237 Commits

Author SHA1 Message Date
Thomas Tanghus
2759376be4 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-15 21:40:37 +02:00
Thomas Tanghus
0aa9e542f3 Misc. style fixes. 2012-10-15 21:36:13 +02:00
Thomas Tanghus
2e5a1d192e Profile picure event handlers. 2012-10-15 21:35:34 +02:00
Thomas Tanghus
4b1739efc8 Fix PHOTO handling in serializer method. 2012-10-15 21:34:22 +02:00
Thomas Tanghus
d5ca457340 First step on reenabling profile picture editor. 2012-10-15 21:33:21 +02:00
Thomas Tanghus
d15f1ff06f Removed apps prefix from class loader. 2012-10-15 21:31:14 +02:00
Jenkins for ownCloud
3ed636ae11 [tx-robot] updated from transifex 2012-10-14 02:11:45 +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
Thomas Tanghus
37d3a1c18a Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-11 22:26:05 +02:00
Thomas Tanghus
d286509caa Merge branch 'master' of github.com:owncloud/apps into vcategories_db 2012-10-11 22:24:35 +02:00
Jenkins for ownCloud
249aac82ff [tx-robot] updated from transifex 2012-10-11 02:10:53 +02:00
Thomas Tanghus
f0dbccc76e Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-10 23:02:30 +02:00
Thomas Tanghus
a3c4ae6e94 Merge branch 'master' of github.com:owncloud/apps into vcategories_db 2012-10-10 23:01:21 +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
Thomas Tanghus
d7354034ae Major rewrite almost done. 2012-10-05 05:05:49 +02:00
Thomas Tanghus
9bfe53bbb9 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-05 03:52:25 +02:00
Thomas Tanghus
0f419bf436 Silenced console logging. 2012-10-05 03:50:45 +02:00
Thomas Tanghus
b8d6b7bcfb Fix regression where contact photo was included in json response. 2012-10-05 02:09:52 +02:00
Jenkins for ownCloud
4244cc0e6f [tx-robot] updated from transifex 2012-10-05 02:07:51 +02:00
Thomas Tanghus
bc456794f6 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-04 02:24:47 +02:00
Jenkins for ownCloud
0b1c1b4e05 [tx-robot] updated from transifex 2012-10-04 02:09:41 +02:00
Thomas Tanghus
e24e2cf9fe Merge branch 'vcategories_db' into contacts_rework 2012-10-03 22:12:21 +02:00
Thomas Tanghus
6fbd4ddec8 Make default groups/categories more relevant for contacts. 2012-10-03 22:10:48 +02:00
Thomas Tanghus
6785e2f2c1 Don't scan for categories/groups in shared addressbooks/calendars. 2012-10-03 22:03:29 +02:00
Thomas Tanghus
ec2a8fb949 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-03 21:41:08 +02:00
Thomas Tanghus
9505b23ab7 Merge branch 'master' of github.com:owncloud/apps into vcategories_db 2012-10-03 21:40:13 +02:00
Thomas Tanghus
d253b77a49 Also show correct links for addressbooks. 2012-10-03 18:47:02 +02:00
Thomas Tanghus
8db79f5e6d Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-03 17:43:42 +02:00
Jenkins for ownCloud
a2c7488354 [tx-robot] updated from transifex 2012-10-03 02:10:29 +02:00
Thomas Tanghus
09883cc4d8 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-02 23:25:31 +02:00
Thomas Tanghus
d9a3f56b9d Don't prevent calendar and contant data deletion on user deletion because of sharing permissions. 2012-10-02 23:22:29 +02:00
Frank Karlitschek
b251ab38b5 bump the required field of all the shipped apps to 4.9 which is the internal verson number of ownCloud 4.5 2012-10-02 12:21:25 +02:00
Jenkins for ownCloud
c91c4cf47d [tx-robot] updated from transifex 2012-10-02 02:08:07 +02:00
Thomas Tanghus
e17096fe50 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-10-01 23:47:44 +02:00
Jenkins for ownCloud
47256caeed [tx-robot] updated from transifex 2012-10-01 02:10:27 +02:00
Thomas Tanghus
6187c4ad62 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-09-30 11:06:28 +02:00
Thomas Tanghus
01a009d18e Merge branch 'master' of github.com:owncloud/apps into vcategories_db 2012-09-30 11:04:54 +02:00
Thomas Tanghus
605e4e7c93 Change requesttoken to oc_requesttoken. 2012-09-30 07:30:51 +02:00
Thomas Tanghus
fd5d70bf7a Merge branch 'master' of github.com:owncloud/apps into vcategories_db 2012-09-30 06:46:28 +02:00
Thomas Tanghus
bf4b770920 Merge branch 'contacts_rework' of github.com:owncloud/apps into contacts_rework 2012-09-30 06:44:33 +02:00
Thomas Tanghus
848139e563 Merge branch 'master' of github.com:owncloud/apps into contacts_rework 2012-09-30 06:43:14 +02:00
Thomas Tanghus
2a3a3241e3 Added button to go back to list. 2012-09-30 06:42:16 +02:00
Thomas Tanghus
096a45b393 Also show standard image if id is not set, for example when rendering not saved contact. 2012-09-30 06:40:57 +02:00
Thomas Tanghus
ce2535521b Add 'Other' as standard email type. 2012-09-30 06:40:04 +02:00
Thomas Tanghus
68e409cac7 Insert a rendered contact in the list. 2012-09-30 06:38:53 +02:00
Thomas Tanghus
ee54413419 Some work on the header styling 2012-09-30 06:37:16 +02:00