258 Commits

Author	SHA1	Message	Date
Thomas Tanghus	e9315abed5	Strip control chars after decoding from quoted printable.	2012-09-03 17:11:58 +02:00
Thomas Tanghus	1836adca99	Add missing permission checks.	2012-09-01 22:55:53 +02:00
Thomas Tanghus	59b675964d	Avoid uri name collision for Cal-/CardDAV sharing.	2012-09-01 22:55:52 +02:00
Bart Visscher	b5cb037e73	Fix linkTo calls for new routing	2012-08-31 18:05:49 +02:00
Thomas Tanghus	8ff56cfbf2	Fix return values on update.	2012-08-31 05:12:18 +02:00
Thomas Tanghus	b454e6a3d3	Only show CRUDS actions if you have proper permissions.	2012-08-30 23:02:19 +02:00
Thomas Tanghus	5905e6c314	Error and permission checking.	2012-08-30 18:43:01 +02:00
Thomas Tanghus	0d3d7fd1c1	White-space	2012-08-30 18:43:01 +02:00
jfd	1102fa46a9	use limit parameter instead of LIMIT SQL for vcard	2012-08-25 02:27:43 +02:00
Jörn Friedrich Dreyer	d377f6dd27	add backticks to SQL, use limit parameter instead of LIMIT SQL	2012-08-25 01:52:27 +02:00
Jörn Friedrich Dreyer	9fd888c372	Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support ... Conflicts: 3rdparty/Sabre/CardDAV/Plugin.php 3rdparty/smb4php/smb.php apps/bookmarks/ajax/addBookmark.php apps/bookmarks/ajax/editBookmark.php apps/bookmarks/appinfo/migrate.php apps/calendar/ajax/calendar/edit.form.php apps/calendar/ajax/changeview.php apps/calendar/ajax/import/import.php apps/calendar/ajax/settings/guesstimezone.php apps/calendar/ajax/settings/setfirstday.php apps/calendar/ajax/settings/settimeformat.php apps/calendar/ajax/share/changepermission.php apps/calendar/ajax/share/share.php apps/calendar/ajax/share/unshare.php apps/calendar/appinfo/app.php apps/calendar/appinfo/remote.php apps/calendar/appinfo/update.php apps/calendar/appinfo/version apps/calendar/js/calendar.js apps/calendar/l10n/da.php apps/calendar/l10n/de.php apps/calendar/l10n/fi_FI.php apps/calendar/l10n/gl.php apps/calendar/l10n/he.php apps/calendar/l10n/hr.php apps/calendar/l10n/ja_JP.php apps/calendar/l10n/lb.php apps/calendar/l10n/lt_LT.php apps/calendar/l10n/nb_NO.php apps/calendar/l10n/pl.php apps/calendar/l10n/pt_PT.php apps/calendar/l10n/ro.php apps/calendar/l10n/ru.php apps/calendar/l10n/sv.php apps/calendar/l10n/zh_CN.php apps/calendar/l10n/zh_TW.php apps/calendar/lib/app.php apps/calendar/lib/calendar.php apps/calendar/lib/object.php apps/calendar/lib/share.php apps/calendar/templates/part.choosecalendar.rowfields.php apps/calendar/templates/part.import.php apps/calendar/templates/settings.php apps/contacts/ajax/activation.php apps/contacts/ajax/addressbook/delete.php apps/contacts/ajax/contact/add.php apps/contacts/ajax/contact/addproperty.php apps/contacts/ajax/contact/delete.php apps/contacts/ajax/contact/deleteproperty.php apps/contacts/ajax/contact/saveproperty.php apps/contacts/ajax/createaddressbook.php apps/contacts/ajax/cropphoto.php apps/contacts/ajax/currentphoto.php apps/contacts/ajax/importaddressbook.php apps/contacts/ajax/oc_photo.php apps/contacts/ajax/savecrop.php apps/contacts/ajax/selectaddressbook.php apps/contacts/ajax/updateaddressbook.php apps/contacts/ajax/uploadimport.php apps/contacts/ajax/uploadphoto.php apps/contacts/appinfo/migrate.php apps/contacts/appinfo/remote.php apps/contacts/css/contacts.css apps/contacts/import.php apps/contacts/index.php apps/contacts/js/contacts.js apps/contacts/l10n/ca.php apps/contacts/l10n/cs_CZ.php apps/contacts/l10n/da.php apps/contacts/l10n/de.php apps/contacts/l10n/el.php apps/contacts/l10n/eo.php apps/contacts/l10n/es.php apps/contacts/l10n/et_EE.php apps/contacts/l10n/eu.php apps/contacts/l10n/fa.php apps/contacts/l10n/fi_FI.php apps/contacts/l10n/fr.php apps/contacts/l10n/he.php apps/contacts/l10n/hr.php apps/contacts/l10n/hu_HU.php apps/contacts/l10n/ia.php apps/contacts/l10n/it.php apps/contacts/l10n/ja_JP.php apps/contacts/l10n/ko.php apps/contacts/l10n/lb.php apps/contacts/l10n/mk.php apps/contacts/l10n/nb_NO.php apps/contacts/l10n/nl.php apps/contacts/l10n/pl.php apps/contacts/l10n/pt_BR.php apps/contacts/l10n/pt_PT.php apps/contacts/l10n/ro.php apps/contacts/l10n/ru.php apps/contacts/l10n/sk_SK.php apps/contacts/l10n/sl.php apps/contacts/l10n/sv.php apps/contacts/l10n/th_TH.php apps/contacts/l10n/tr.php apps/contacts/l10n/zh_CN.php apps/contacts/l10n/zh_TW.php apps/contacts/lib/addressbook.php apps/contacts/lib/hooks.php apps/contacts/lib/vcard.php apps/contacts/photo.php apps/contacts/templates/part.contact.php apps/contacts/templates/part.contacts.php apps/contacts/templates/part.cropphoto.php apps/contacts/templates/part.importaddressbook.php apps/contacts/templates/part.selectaddressbook.php apps/contacts/thumbnail.php apps/files/ajax/download.php apps/files/ajax/newfile.php apps/files/ajax/timezone.php apps/files/appinfo/update.php apps/files/appinfo/version apps/files/index.php apps/files/js/fileactions.js apps/files/js/filelist.js apps/files/js/files.js apps/files/l10n/ar.php apps/files/l10n/bg_BG.php apps/files/l10n/ca.php apps/files/l10n/cs_CZ.php apps/files/l10n/da.php apps/files/l10n/de.php apps/files/l10n/el.php apps/files/l10n/eo.php apps/files/l10n/es.php apps/files/l10n/et_EE.php apps/files/l10n/eu.php apps/files/l10n/fa.php apps/files/l10n/fi_FI.php apps/files/l10n/fr.php apps/files/l10n/gl.php apps/files/l10n/he.php apps/files/l10n/hr.php apps/files/l10n/hu_HU.php apps/files/l10n/ia.php apps/files/l10n/id.php apps/files/l10n/it.php apps/files/l10n/ja_JP.php apps/files/l10n/ko.php apps/files/l10n/lb.php apps/files/l10n/lt_LT.php apps/files/l10n/mk.php apps/files/l10n/ms_MY.php apps/files/l10n/nb_NO.php apps/files/l10n/nl.php apps/files/l10n/nn_NO.php apps/files/l10n/pl.php apps/files/l10n/pt_BR.php apps/files/l10n/pt_PT.php apps/files/l10n/ro.php apps/files/l10n/ru.php apps/files/l10n/sk_SK.php apps/files/l10n/sl.php apps/files/l10n/sr.php apps/files/l10n/sr@latin.php apps/files/l10n/sv.php apps/files/l10n/th_TH.php apps/files/l10n/tr.php apps/files/l10n/uk.php apps/files/l10n/zh_CN.php apps/files/l10n/zh_TW.php apps/files_archive/js/archive.js apps/files_encryption/lib/cryptstream.php apps/files_encryption/lib/proxy.php apps/files_encryption/tests/proxy.php apps/files_external/appinfo/app.php apps/files_external/lib/smb.php apps/files_external/lib/streamwrapper.php apps/files_external/tests/config.php apps/files_external/tests/smb.php apps/files_sharing/ajax/email.php apps/files_sharing/ajax/getitem.php apps/files_sharing/ajax/setpermissions.php apps/files_sharing/ajax/share.php apps/files_sharing/ajax/toggleresharing.php apps/files_sharing/ajax/unshare.php apps/files_sharing/ajax/userautocomplete.php apps/files_sharing/js/settings.js apps/files_sharing/js/share.js apps/files_sharing/lib_share.php apps/files_sharing/settings.php apps/files_sharing/sharedstorage.php apps/files_sharing/templates/settings.php apps/files_versions/ajax/rollbackVersion.php apps/files_versions/versions.php apps/gallery/ajax/thumbnail.php apps/gallery/appinfo/app.php apps/gallery/appinfo/update.php apps/gallery/appinfo/version apps/gallery/css/styles.css apps/gallery/index.php apps/gallery/js/pictures.js apps/gallery/l10n/ca.php apps/gallery/l10n/cs_CZ.php apps/gallery/l10n/de.php apps/gallery/l10n/el.php apps/gallery/l10n/es.php apps/gallery/l10n/fi_FI.php apps/gallery/l10n/fr.php apps/gallery/l10n/it.php apps/gallery/l10n/pl.php apps/gallery/l10n/pt_PT.php apps/gallery/l10n/ru.php apps/gallery/l10n/sl.php apps/gallery/l10n/sv.php apps/gallery/l10n/th_TH.php apps/gallery/l10n/tr.php apps/gallery/l10n/zh_CN.php apps/gallery/lib/album.php apps/gallery/lib/hooks_handlers.php apps/gallery/lib/managers.php apps/gallery/lib/photo.php apps/gallery/lib/tiles.php apps/gallery/lib/tiles_test.php apps/gallery/templates/index.php apps/media/lib_ampache.php apps/media/lib_collection.php apps/media/lib_media.php apps/remoteStorage/lib_remoteStorage.php apps/tasks/ajax/addtaskform.php apps/tasks/ajax/edittask.php apps/user_ldap/appinfo/update.php apps/user_ldap/group_ldap.php apps/user_ldap/lib_ldap.php apps/user_ldap/settings.php apps/user_ldap/templates/settings.php apps/user_ldap/user_ldap.php apps/user_migrate/appinfo/app.php apps/user_migrate/templates/settings.php apps/user_webfinger/host-meta.php config/config.sample.php core/js/js.js core/l10n/da.php core/l10n/de.php core/l10n/fi_FI.php core/l10n/gl.php core/l10n/he.php core/l10n/hr.php core/l10n/id.php core/l10n/ja_JP.php core/l10n/lb.php core/l10n/lt_LT.php core/l10n/nb_NO.php core/l10n/pl.php core/l10n/pt_PT.php core/l10n/ro.php core/l10n/ru.php core/l10n/sv.php core/lostpassword/index.php core/templates/layout.user.php core/templates/login.php db_structure.xml index.php l10n/af/calendar.po l10n/af/contacts.po l10n/af/core.po l10n/af/files.po l10n/af/settings.po l10n/ar/calendar.po l10n/ar/contacts.po l10n/ar/core.po l10n/ar/files.po l10n/ar/media.po l10n/ar/settings.po l10n/bg_BG/calendar.po l10n/bg_BG/contacts.po l10n/bg_BG/core.po l10n/bg_BG/files.po l10n/bg_BG/media.po l10n/bg_BG/settings.po l10n/ca/calendar.po l10n/ca/contacts.po l10n/ca/core.po l10n/ca/files.po l10n/ca/gallery.po l10n/ca/settings.po l10n/cs_CZ/calendar.po l10n/cs_CZ/contacts.po l10n/cs_CZ/core.po l10n/cs_CZ/files.po l10n/cs_CZ/gallery.po l10n/cs_CZ/settings.po l10n/da/calendar.po l10n/da/contacts.po l10n/da/core.po l10n/da/files.po l10n/da/settings.po l10n/de/calendar.po l10n/de/contacts.po l10n/de/core.po l10n/de/files.po l10n/de/gallery.po l10n/de/settings.po l10n/el/calendar.po l10n/el/contacts.po l10n/el/core.po l10n/el/files.po l10n/el/gallery.po l10n/el/settings.po l10n/eo/calendar.po l10n/eo/contacts.po l10n/eo/core.po l10n/eo/files.po l10n/eo/media.po l10n/eo/settings.po l10n/es/calendar.po l10n/es/contacts.po l10n/es/core.po l10n/es/files.po l10n/es/gallery.po l10n/es/settings.po l10n/et_EE/calendar.po l10n/et_EE/contacts.po l10n/et_EE/core.po l10n/et_EE/files.po l10n/et_EE/settings.po l10n/eu/calendar.po l10n/eu/contacts.po l10n/eu/core.po l10n/eu/files.po l10n/eu/settings.po l10n/fa/calendar.po l10n/fa/contacts.po l10n/fa/core.po l10n/fa/files.po l10n/fa/settings.po l10n/fi_FI/calendar.po l10n/fi_FI/contacts.po l10n/fi_FI/core.po l10n/fi_FI/files.po l10n/fi_FI/gallery.po l10n/fi_FI/settings.po l10n/fr/calendar.po l10n/fr/contacts.po l10n/fr/core.po l10n/fr/files.po l10n/fr/gallery.po l10n/fr/media.po l10n/fr/settings.po l10n/gl/calendar.po l10n/gl/contacts.po l10n/gl/core.po l10n/gl/files.po l10n/gl/settings.po l10n/he/calendar.po l10n/he/contacts.po l10n/he/core.po l10n/he/files.po l10n/he/settings.po l10n/hr/calendar.po l10n/hr/contacts.po l10n/hr/core.po l10n/hr/files.po l10n/hr/settings.po l10n/hu_HU/calendar.po l10n/hu_HU/contacts.po l10n/hu_HU/core.po l10n/hu_HU/files.po l10n/hu_HU/settings.po l10n/hy/calendar.po l10n/hy/contacts.po l10n/hy/core.po l10n/hy/files.po l10n/hy/settings.po l10n/ia/calendar.po l10n/ia/contacts.po l10n/ia/core.po l10n/ia/files.po l10n/ia/settings.po l10n/id/calendar.po l10n/id/contacts.po l10n/id/core.po l10n/id/files.po l10n/id/settings.po l10n/it/calendar.po l10n/it/contacts.po l10n/it/core.po l10n/it/files.po l10n/it/gallery.po l10n/it/settings.po l10n/ja_JP/calendar.po l10n/ja_JP/contacts.po l10n/ja_JP/core.po l10n/ja_JP/files.po l10n/ja_JP/settings.po l10n/ko/calendar.po l10n/ko/contacts.po l10n/ko/core.po l10n/ko/files.po l10n/ko/settings.po l10n/lb/calendar.po l10n/lb/contacts.po l10n/lb/core.po l10n/lb/files.po l10n/lb/settings.po l10n/lt_LT/calendar.po l10n/lt_LT/contacts.po l10n/lt_LT/core.po l10n/lt_LT/files.po l10n/lt_LT/settings.po l10n/mk/calendar.po l10n/mk/contacts.po l10n/mk/core.po l10n/mk/files.po l10n/mk/settings.po l10n/ms_MY/calendar.po l10n/ms_MY/contacts.po l10n/ms_MY/core.po l10n/ms_MY/files.po l10n/ms_MY/settings.po l10n/nb_NO/calendar.po l10n/nb_NO/contacts.po l10n/nb_NO/core.po l10n/nb_NO/files.po l10n/nb_NO/settings.po l10n/nl/calendar.po l10n/nl/contacts.po l10n/nl/core.po l10n/nl/files.po l10n/nl/settings.po l10n/nn_NO/calendar.po l10n/nn_NO/contacts.po l10n/nn_NO/core.po l10n/nn_NO/files.po l10n/nn_NO/settings.po l10n/pl/calendar.po l10n/pl/contacts.po l10n/pl/core.po l10n/pl/files.po l10n/pl/gallery.po l10n/pl/settings.po l10n/pt_BR/calendar.po l10n/pt_BR/contacts.po l10n/pt_BR/core.po l10n/pt_BR/files.po l10n/pt_BR/settings.po l10n/pt_PT/calendar.po l10n/pt_PT/contacts.po l10n/pt_PT/core.po l10n/pt_PT/files.po l10n/pt_PT/gallery.po l10n/pt_PT/settings.po l10n/ro/calendar.po l10n/ro/contacts.po l10n/ro/core.po l10n/ro/files.po l10n/ro/settings.po l10n/ru/calendar.po l10n/ru/contacts.po l10n/ru/core.po l10n/ru/files.po l10n/ru/gallery.po l10n/ru/settings.po l10n/sk_SK/calendar.po l10n/sk_SK/contacts.po l10n/sk_SK/core.po l10n/sk_SK/files.po l10n/sk_SK/settings.po l10n/sl/calendar.po l10n/sl/contacts.po l10n/sl/core.po l10n/sl/files.po l10n/sl/gallery.po l10n/sl/settings.po l10n/sr/calendar.po l10n/sr/contacts.po l10n/sr/core.po l10n/sr/files.po l10n/sr/settings.po l10n/sr@latin/calendar.po l10n/sr@latin/contacts.po l10n/sr@latin/core.po l10n/sr@latin/files.po l10n/sr@latin/settings.po l10n/sv/calendar.po l10n/sv/contacts.po l10n/sv/core.po l10n/sv/files.po l10n/sv/gallery.po l10n/sv/media.po l10n/sv/settings.po l10n/templates/bookmarks.pot l10n/templates/calendar.pot l10n/templates/contacts.pot l10n/templates/core.pot l10n/templates/files.pot l10n/templates/gallery.pot l10n/templates/media.pot l10n/templates/settings.pot l10n/th_TH/calendar.po l10n/th_TH/contacts.po l10n/th_TH/core.po l10n/th_TH/files.po l10n/th_TH/gallery.po l10n/th_TH/settings.po l10n/tr/calendar.po l10n/tr/contacts.po l10n/tr/core.po l10n/tr/files.po l10n/tr/gallery.po l10n/tr/settings.po l10n/uk/calendar.po l10n/uk/contacts.po l10n/uk/core.po l10n/uk/files.po l10n/uk/media.po l10n/uk/settings.po l10n/zh_CN/calendar.po l10n/zh_CN/contacts.po l10n/zh_CN/core.po l10n/zh_CN/files.po l10n/zh_CN/gallery.po l10n/zh_CN/settings.po l10n/zh_TW/calendar.po l10n/zh_TW/contacts.po l10n/zh_TW/core.po l10n/zh_TW/files.po l10n/zh_TW/settings.po lib/app.php lib/base.php lib/connector/sabre/file.php lib/connector/sabre/locks.php lib/connector/sabre/node.php lib/db.php lib/filecache.php lib/fileproxy/quota.php lib/files.php lib/filestorage/local.php lib/filesystemview.php lib/group/database.php lib/helper.php lib/installer.php lib/json.php lib/l10n.php lib/migrate.php lib/mimetypes.fixlist.php lib/ocs.php lib/preferences.php lib/public/json.php lib/public/util.php lib/template.php lib/user.php lib/user/database.php lib/util.php lib/vcategories.php ocs/providers.php settings/admin.php settings/ajax/lostpassword.php settings/ajax/removeuser.php settings/ajax/setbackgroundjobsmode.php settings/ajax/setlanguage.php settings/ajax/setquota.php settings/ajax/togglegroups.php settings/apps.php settings/css/settings.css settings/js/apps.js settings/js/users.js settings/l10n/bg_BG.php settings/l10n/ca.php settings/l10n/cs_CZ.php settings/l10n/da.php settings/l10n/de.php settings/l10n/el.php settings/l10n/eo.php settings/l10n/es.php settings/l10n/et_EE.php settings/l10n/eu.php settings/l10n/fa.php settings/l10n/fi_FI.php settings/l10n/fr.php settings/l10n/gl.php settings/l10n/he.php settings/l10n/hr.php settings/l10n/hu_HU.php settings/l10n/it.php settings/l10n/ja_JP.php settings/l10n/ko.php settings/l10n/lt_LT.php settings/l10n/mk.php settings/l10n/ms_MY.php settings/l10n/nb_NO.php settings/l10n/nl.php settings/l10n/nn_NO.php settings/l10n/pl.php settings/l10n/pt_BR.php settings/l10n/pt_PT.php settings/l10n/ru.php settings/l10n/sk_SK.php settings/l10n/sl.php settings/l10n/sv.php settings/l10n/th_TH.php settings/l10n/tr.php settings/l10n/zh_CN.php settings/personal.php settings/templates/admin.php settings/templates/users.php	2012-08-25 00:05:07 +02:00
Bart Visscher	e82dd11a00	Contacts: Fix no active Addressbooks	2012-08-24 14:54:16 +02:00
Thomas Tanghus	72647e802e	White-space.	2012-08-24 13:49:56 +02:00
Thomas Tanghus	b7d4a8a848	Forgot to reenable the export plugin.	2012-08-24 05:04:45 +02:00
Thomas Tanghus	b935a3e200	Implemented sharing api for CardDAV. Next step CalDAV.	2012-08-24 04:56:21 +02:00
Thomas Tanghus	3e92c3b0ae	Permission checking for shared addressbooks/contacts.	2012-08-23 22:03:36 +02:00
Thomas Tanghus	5ef7ebf857	Removed redundant __CLASS__ in logging.	2012-08-23 22:03:36 +02:00
Thomas Tanghus	674a4572c5	Used non-existing variable.	2012-08-23 22:03:35 +02:00
Thomas Tanghus	bd365e0910	Return newly created addressbook.	2012-08-23 22:03:35 +02:00
Thomas Tanghus	2de53a5210	Remove obsolete closure.	2012-08-23 05:02:30 +02:00
Thomas Tanghus	070bb410ba	Add support for IMPP properties.	2012-08-22 18:51:17 +02:00
Thomas Tanghus	ded6b9ba46	Preliminary support for Apple X-ABLabel. Also for oc-1508.	2012-08-21 03:57:48 +02:00
Michael Gapczynski	d80d66fe58	Merge branch 'share_api' ... Conflicts: apps/contacts/lib/vcard.php apps/files/index.php lib/files.php	2012-08-19 22:29:01 -04:00
Thomas Tanghus	2e6a8b4ba1	Strip slashes from commas and semi-colons.	2012-08-19 16:32:32 +02:00
Thomas Tanghus	1d9d5e64e9	Merge addressbooks.	2012-08-16 00:25:32 +02:00
Bart Visscher	8679aa2699	Contacts: Check format parameter	2012-08-10 14:40:43 +02:00
Bart Visscher	fe8bae5b1e	Contacts: Better parameter names in addressbook share backend	2012-08-10 14:32:54 +02:00
Michael Gapczynski	e2c3489e79	Additional permission checks for editing and deleting contacts	2012-08-09 13:54:59 -04:00
Michael Gapczynski	a1ac3767ce	Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/vcard.php apps/files_sharing/sharedstorage.php	2012-08-09 11:38:22 -04:00
Thomas Tanghus	4ed4ef96cd	Change parameter name and update docs.	2012-08-09 17:04:14 +02:00
Thomas Tanghus	696a330c37	Another take at profile photo/thumbnail caching. oc-839.	2012-08-09 16:32:05 +02:00
Michael Gapczynski	14d67ba771	Start adding permission checks for addressbooks	2012-08-08 21:43:02 -04:00
Michael Gapczynski	34fdb2306c	Don't include shared addressbook if source not found	2012-08-08 19:12:59 -04:00
Michael Gapczynski	9b2e8de621	Sharing backends for contacts and addressbooks	2012-08-06 16:11:03 -04:00
Michael Gapczynski	6db5e23c77	Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/app.php apps/contacts/templates/part.chooseaddressbook.rowfields.php	2012-08-06 13:49:54 -04:00
Michael Gapczynski	693b496fdd	Lots of refactoring to share API	2012-08-06 11:27:13 -04:00
Michael Gapczynski	4e99280907	Preparing for proper collection implementation	2012-08-03 15:05:45 -04:00
Thomas Tanghus	a8c0bfe1d7	Line length...	2012-08-02 05:02:36 +02:00
Thomas Tanghus	990e13cdd0	Addressbooks settings rewrite and cleanup.	2012-08-02 00:02:07 +02:00
Michael Gapczynski	9e16c8ae7c	Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/app.php apps/files_sharing/js/share.js	2012-07-31 15:00:04 -04:00
jfd	a57799bcec	escape all identifiers with backticks	2012-07-31 18:53:05 +02:00
Thomas Tanghus	3b2c7c5981	Fix errors when no addressbook.	2012-07-30 12:28:10 +02:00
Thomas Tanghus	b9e23c409e	Remove deprecated code.	2012-07-30 05:31:48 +02:00
Thomas Tanghus	06c8e0cfe6	Code style.	2012-07-30 05:31:06 +02:00
Thomas Tanghus	c4796b93de	Fixed potential error in logging.	2012-07-30 04:57:14 +02:00
Michael Gapczynski	93556984f2	Merge branch 'master' into share_api ... Conflicts: apps/calendar/js/loader.js apps/contacts/index.php apps/contacts/js/loader.js apps/files/js/files.js apps/files_sharing/sharedstorage.php lib/filesystemview.php	2012-07-25 17:08:18 -04:00
Thomas Tanghus	f5fb32700a	Damn, that Jenkins dude is tough ;)	2012-07-21 00:43:01 +02:00
Thomas Tanghus	61ec1d43ea	Code style.	2012-07-20 17:11:13 +02:00
Thomas Tanghus	7681e23761	Coding style.	2012-07-20 00:18:23 +02:00
Thomas Tanghus	ae670c222b	Added hooks for postCreateUser to add default address book and calendar. Fixes oc-1265.	2012-07-17 10:45:15 +02:00
Thomas Tanghus	31465b7f31	Wrong argument count in postCreateUser hook for contacts.	2012-07-17 01:37:28 +02:00
Thomas Tanghus	2aebf6f7ac	Remove obsolete FIXMEs.	2012-07-16 01:46:16 +02:00
Thomas Tanghus	ba05dfc2de	Refactored contacts import.	2012-07-15 04:17:30 +02:00
Thomas Tanghus	87d0412ac3	Give default address book a more intuitive name and replace spaces with underscores in uri.	2012-07-14 14:11:43 +02:00
Michael Gapczynski	00ef91f830	Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/addressbook.php apps/files_sharing/js/share.js apps/files_sharing/sharedstorage.php	2012-07-11 20:25:59 -04:00
Michael Gapczynski	379eea1779	Fix addressbook sharing, formatItems() changed in past commits	2012-07-11 11:33:48 -04:00
Thomas Tanghus	bcb5a95ace	Revert reversion of f5c329af981f59f78c12648ea41c258f477f3e82 :-P	2012-07-10 01:24:40 +02:00
Thomas Tanghus	c93a4ce0f2	Look for the right field :-P	2012-07-10 01:24:40 +02:00
Thomas Tanghus	50b6b1d94d	Revert "Delay fetching of carddata and set ETag and size instead." ... This reverts commit f5c329af981f59f78c12648ea41c258f477f3e82.	2012-07-10 01:24:40 +02:00
Thomas Tanghus	8b12b691af	Delay fetching of carddata and set ETag and size instead.	2012-07-09 01:48:42 +02:00
Thomas Tanghus	c6326dda76	Rescan categories in small batches to reduce memory usage.	2012-07-09 00:16:14 +02:00
Thomas Tanghus	1436165ab3	Simplify VCF generation.	2012-07-08 23:36:52 +02:00
Thomas Tanghus	8a616c79ec	Implemented VCFExportPlugin.	2012-07-08 17:52:57 +02:00
Thomas Tanghus	e84c13f70a	Improve checking for active addressbooks and creating default addressbook.	2012-07-08 15:41:38 +02:00
Thomas Tanghus	412a583213	Fix endless loop when no addressbooks.	2012-07-06 13:24:56 +02:00
Thomas Tanghus	0ceb588b15	No need for being protected.	2012-07-06 03:22:42 +02:00
Bart Visscher	0f416a5219	Contacts: Fix copy&paste error	2012-07-05 17:12:52 +02:00
Thomas Tanghus	7caf34aac1	Remove ugly activation hack.	2012-07-04 22:13:36 +02:00
Michael Gapczynski	20bdeb71b4	Use formatted shared addressbook in all cases, addressbooks out of order now	2012-07-03 11:36:57 -04:00
Michael Gapczynski	f98a660abc	Load shared addressbooks inside OC_Contacts_Addressbook instead of the index, add public functions getItemShared(With)BySource() for contacts app	2012-07-03 11:11:01 -04:00
Michael Gapczynski	9fc953d447	Change getItems() return to a 3-dimensional array to handle multiple shares of the same item	2012-07-02 15:29:34 -04:00
Michael Gapczynski	b61a303475	Fix generateTarget() for contacts backend	2012-06-30 21:03:36 -04:00
Georg Ehrke	02b935f4a9	fix birthday calendar	2012-06-29 15:43:18 +02:00
Thomas Tanghus	9e0f6bd612	Load contactlist progressivly.	2012-06-27 22:44:28 +02:00
Bart Visscher	56299511f2	Something like this should do it for sharing contacts	2012-06-27 15:44:42 +02:00
Thomas Tanghus	37b71ecf86	Load default categories if there are none,	2012-06-27 02:12:53 +02:00
Bart Visscher	69771d2050	Basic framework for contacts sharing	2012-06-27 01:05:36 +02:00
Thomas Tanghus	14b22239ee	Added error checking on all db queries.	2012-06-26 18:15:24 +02:00
Thomas Tanghus	7c26a86550	Added createUser hook.	2012-06-26 18:15:24 +02:00
Thomas Tanghus	6f85700984	Fix variable name.	2012-06-26 16:06:52 +02:00
Thomas Tanghus	5c649dc2d5	Added signals.	2012-06-26 05:26:50 +02:00
Thomas Tanghus	541dfa2580	Cast translation to string.	2012-06-22 14:27:46 +02:00
Thomas Tanghus	b41b2c38b8	Fix URL delimiter.	2012-06-21 22:03:57 +02:00
Thomas Tanghus	1f6bb63f8d	Better error checking.	2012-06-20 21:00:49 +02:00
Thomas Tanghus	a534cc54d4	Log error as ERROR.	2012-06-20 21:00:49 +02:00
Thomas Tanghus	d8b662c25f	Cleanup code.	2012-06-14 23:05:31 +02:00
Thomas Tanghus	2ac341c871	If Hr. Lerdorf had made up his mind on parameter order, life would have been a lot easier...	2012-06-14 23:05:31 +02:00
Thomas Tanghus	dc5b13a827	Contacts: Final (for now) fix to encoding probs on import.	2012-06-12 12:33:37 +02:00
Thomas Tanghus	f3e19ca230	Contacts: Final (for now) fix to encoding probs on import.	2012-06-12 12:32:37 +02:00
Thomas Tanghus	2c289d3a75	Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-)	2012-06-11 22:15:31 +02:00
Thomas Tanghus	1ee05e12bd	Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-)	2012-06-11 22:14:21 +02:00
Thomas Tanghus	5397dcf695	Contacts: 11th hour fix for invalid VCARD from CardDAV.	2012-06-10 20:56:55 +02:00
Thomas Tanghus	1bf36539f4	Contacts: 11th hour fix for invalid VCARD from CardDAV.	2012-06-10 20:54:52 +02:00
Thomas Tanghus	f5d3ba18f2	Contacts: Double check XSS, and fix a rookie error ;-)	2012-05-28 13:19:31 +02:00
Thomas Tanghus	7317b67272	Please don't tell me I did that :-P	2012-05-28 12:52:18 +02:00
Thomas Tanghus	393578a609	Contacts: Backport XSS fix.	2012-05-21 21:49:35 +02:00
Thomas Tanghus	d78ec64e80	Contacts: XSS fix. Still some more to check.	2012-05-21 21:47:15 +02:00
Thomas Mueller	39f99602bf	removing executable bit - again	2012-05-15 00:52:00 +02:00
Thomas Tanghus	967134ccb6	Contacts: Forgot one file for the import fix.	2012-05-13 23:27:14 +02:00
Thomas Tanghus	f5a9b8d2e7	Contacts: Add error checking and reporting to import from files app.	2012-05-13 23:27:14 +02:00