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

2033 Commits

Author SHA1 Message Date
Thomas Tanghus
c3fa18e4a7 Merge branch 'contacts_backends' into contacts_oc6
Conflicts:
	contacts/ajax/categories/add.php
	contacts/ajax/contact/add.php
	contacts/appinfo/app.php
	contacts/appinfo/migrate.php
	contacts/css/contacts.css
	contacts/index.php
	contacts/js/app.js
	contacts/js/contacts.js
	contacts/js/groups.js
	contacts/lib/app.php
	contacts/lib/carddav/addressbook.php
	contacts/lib/sabre/backend.php
	contacts/lib/vcard.php
	contacts/templates/contacts.php
	contacts/thumbnail.php
2013-04-17 15:07:59 +02:00
Thomas Tanghus
2fbbc01f91 Remove obsolete TODOs 2013-04-17 14:37:22 +02:00
Jenkins for ownCloud
6825eb4022 [tx-robot] updated from transifex 2013-04-17 10:03:48 +02:00
Jenkins for ownCloud
33c3b08458 [tx-robot] updated from transifex 2013-04-17 09:52:58 +02:00
Jenkins for ownCloud
6692b4bd4d [tx-robot] updated from transifex 2013-04-16 01:19:24 +02:00
Thomas Tanghus
92d0c83574 Contacts: Use octemplate from core. 2013-04-15 22:47:11 +02:00
Thomas Tanghus
6431048c28 Contacts: Add ownership checks to pics and export. 2013-04-12 13:49:55 +02:00
Thomas Tanghus
3a42108028 Contacts: Limit height of address book list. Fix #1006 2013-04-12 12:34:03 +02:00
Thomas Tanghus
13e7448fca Contacts: Prevent double adding address books. Fix #1005 2013-04-12 12:33:25 +02:00
Thomas Tanghus
23b0265a9d Fix category purging 2013-04-12 11:45:05 +02:00
Thomas Tanghus
9b063b4e20 Contacts: Debug Sabre exceptions if DEBUG is set 2013-04-12 11:43:56 +02:00
Thomas Tanghus
917a40e4df Contacts: Use done() and fail() from $.ajax() 2013-04-11 15:35:17 +00:00
Thomas Tanghus
4bb6662b25 Merge branch 'contacts_backends' of github.com:owncloud/apps into contacts_backends 2013-04-09 23:20:11 +02:00
Thomas Tanghus
bf620ad512 Contacts: Use a more generic error message for failed ajax requests. 2013-04-09 23:19:22 +02:00
Thomas Tanghus
ad1664e658 Contacts: Add Utils\Properties::generateUID() 2013-04-09 17:20:30 +02:00
Thomas Tanghus
e06f8d04a7 Contacts: Avoid double escape in contact list. Fix #970 2013-04-09 00:46:07 +02:00
Thomas Tanghus
d300a100c5 Contacts: Fix description on StringProperty 2013-04-08 22:41:51 +02:00
Thomas Tanghus
2bf485fd10 Contacts: Fix image upload form 2013-04-08 22:40:53 +02:00
Thomas Tanghus
5f14c98dd5 Contacts: Fix export 2013-04-08 22:39:53 +02:00
Thomas Tanghus
e819c3462d Contacts: ksort on array values 2013-04-08 22:39:22 +02:00
Thomas Tanghus
2b03184548 Contacts: Moved classpaths to classpath.php 2013-04-08 22:38:18 +02:00
Thomas Tanghus
7b977bce45 Contacts: Removed some console.log() 2013-04-08 22:37:37 +02:00
Thomas Tanghus
3c1ee05d53 Contacts: Improved image upload 2013-04-08 22:35:28 +02:00
Thomas Tanghus
a308a3ed21 Contacts: Use a backend name/id combo for CardDAV 2013-04-08 01:27:35 +02:00
Thomas Tanghus
ac0d12470b Contacts: Rename 'database' backend to 'local' 2013-04-07 22:33:40 +02:00
Thomas Tanghus
221f1bbcdf Contacts: Add docstring 2013-04-07 22:28:14 +02:00
Thomas Tanghus
2e23ba5bb1 Contacts: Use the return value from the address book backend 2013-04-07 22:27:43 +02:00
Thomas Tanghus
f160332dcb Better variable names 2013-04-07 22:04:17 +02:00
Thomas Tanghus
fb385150dc Contacts: Fix namespace 2013-04-07 22:03:42 +02:00
Thomas Tanghus
9cfde339af ocdialog: Get title from element if not set in options 2013-04-07 21:50:34 +02:00
Thomas Tanghus
ee2c52c31e Contacts: Format shared address book display name better 2013-04-07 21:49:53 +02:00
Thomas Tanghus
499c69f15e Contacts: Also return uri from db backend 2013-04-07 21:42:27 +02:00
Thomas Tanghus
f0e6472d73 Contacts: Port fixes from master/stable5 2013-04-07 16:47:28 +02:00
Thomas Tanghus
2874031c0f Contacts: Convert TYPE=PREF to PREF=1. Fix #881 2013-04-07 15:04:21 +02:00
Thomas Tanghus
93af121014 Contacts: Use sharees principals on read-write address book. Fix #952 2013-04-07 14:28:12 +02:00
Thomas Tanghus
e57528d516 Contacts: Don't overwrite known address books. Fixes #942 2013-04-07 14:14:25 +02:00
Thomas Tanghus
1589866f8c Contacts: Removed js compatibility functions now in core. 2013-04-07 04:56:54 +02:00
Thomas Tanghus
fb7fd6fc2c Contacts: Make drag items opaque. 2013-04-06 17:13:18 +02:00
Thomas Tanghus
0a31763ac3 ocdialog: trigger 'open' in _init() 2013-04-06 15:05:58 +02:00
Thomas Tanghus
595e2a500e Contacts: Add substitute functions for older browsers (IE8) 2013-04-06 15:04:59 +02:00
Thomas Tanghus
a7f6d514a7 Contacts: Make dialogs opaque on IE 8 2013-04-06 15:03:31 +02:00
Thomas Tanghus
9be1696594 ocdialog: Make parent height max dialog height. 2013-04-06 02:10:32 +02:00
Thomas Tanghus
fbaa841075 Contacts: Fix order in merge list 2013-04-06 02:09:48 +02:00
Thomas Tanghus
ddd3a83f08 Fix thumbnail cache key 2013-04-06 02:09:04 +02:00
Thomas Tanghus
55f4ebfa41 Contacts: Cache user in js config 2013-04-06 02:07:49 +02:00
Thomas Tanghus
ee8cded40e Contacts: Add thumbnails to merge list and move list item to template. 2013-04-05 22:21:08 +02:00
Thomas Tanghus
32ba67735e Contacts: Better wording for merge dialog. 2013-04-05 19:06:26 +02:00
Thomas Tanghus
a4f8b0002c ocdialog: Use spacing instead of separator under title. 2013-04-05 19:05:47 +02:00
Thomas Tanghus
583a52e967 Contacts: Add requirements to routes. 2013-04-05 18:28:15 +02:00
Thomas Tanghus
d48418a8cc Speling error 2013-04-05 18:27:41 +02:00