200 Commits

Author	SHA1	Message	Date
Michael Gapczynski	18517f6adb	Fix share getItems() limit	2012-08-26 21:34:37 -04:00
jfd	9822cd30c0	fix sharing bug introduced with oracle support	2012-08-26 14:57:33 +02:00
Jörn Friedrich Dreyer	fa3497f6ed	add backticks to SQL, use limit parameter instead of LIMIT SQL	2012-08-25 01:52:27 +02:00
Jörn Friedrich Dreyer	fd5af9aff4	Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support	2012-08-25 00:06:20 +02:00
Jörn Friedrich Dreyer	c8255a170c	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
Michael Gapczynski	36487246ed	Switch to using file cache ids instead of paths for file sharing	2012-08-24 10:05:37 -04:00
Thomas Tanghus	c90c358f0d	Only load js and css once.	2012-08-23 05:02:30 +02:00
Michael Gapczynski	3debb67458	Move share CSS to core, add script and style from inside Share API	2012-08-22 11:57:58 -04:00
Michael Gapczynski	9699ff03bd	Revert using item name, no longer allowing the same item source exist for a user	2012-08-22 11:57:58 -04:00
Michael Gapczynski	09e851a9c4	Fix share ajax calls to use itemName/itemSource, show who shared a file with you	2012-08-20 21:22:22 -04:00
Michael Gapczynski	5eca531f99	Refactor again so we can tell what item is being reshared in case the same source shows up. This is the end of the share_api branch, moving to master.	2012-08-19 22:14:38 -04:00
Michael Gapczynski	f987e22d85	Large refactoring to allow for the same item to be shared to a group and again with a user in the group with different permissions	2012-08-19 16:30:38 -04:00
Michael Gapczynski	df8a2e5361	File sharing cleanup, works perfectly I think :)	2012-08-16 12:20:14 -04:00
Michael Gapczynski	9cb3113f42	Fix problems exposed by tests	2012-08-15 11:59:08 -04:00
Michael Gapczynski	ddfa760a5e	Change to correct function call getItemSharedWithBySource()	2012-08-14 17:06:41 -04:00
Michael Gapczynski	b440dfc67e	Remove setTarget() function, changing target names only leads to confusion	2012-08-14 17:05:38 -04:00
Michael Gapczynski	9661a63a72	Ensure permissions can't be escalated during a reshare	2012-08-14 16:54:38 -04:00
Michael Gapczynski	028c79fc9d	Use if instead of switch for detecting share type and throw exceptions when setting permissions	2012-08-14 16:30:13 -04:00
Michael Gapczynski	937d1b29d8	Retrieve all file dependent items when looking for file item type	2012-08-14 11:02:29 -04:00
Michael Gapczynski	4c7fd8cd01	Merge branch 'master' into share_api ... Conflicts: lib/group.php lib/group/backend.php lib/group/database.php lib/group/interface.php lib/public/user.php lib/user.php lib/user/backend.php lib/user/database.php lib/user/interface.php	2012-08-14 10:22:13 -04:00
Michael Gapczynski	64ef1e2181	Change name of share function to shareItem, silly PHP 5.3.1 thinking it is a constructor...	2012-08-12 14:49:41 -04:00
Jakob Sack	4d3d4522f9	Backgroundjobs: Fix wrong var names	2012-08-12 12:14:27 +02:00
Michael Gapczynski	874f31b8d7	Make getting all users and groups the default	2012-08-11 16:25:27 -04:00
Michael Gapczynski	8d1eb674ec	Add search, limit, and offset parameters to getUsers() and getGroups()	2012-08-11 16:25:27 -04:00
Jakob Sack	ceda0ae052	Backgroundjobs: rename ScheduledTask to QueuedTask	2012-08-09 19:04:04 +02:00
Michael Gapczynski	78cd1153f0	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
Michael Gapczynski	b830b3e24b	Start adding permission checks for addressbooks	2012-08-08 21:43:02 -04:00
Michael Gapczynski	2c5744f16c	Add back getItemSharedWithBySource(), some situtations require this ability	2012-08-08 20:56:55 -04:00
Jakob Sack	088b3ea0bc	Add public interface to background jobs	2012-08-09 00:01:06 +02:00
Bart Visscher	b287b11ff2	adjust the query generation in getItems, to use placeholders	2012-08-07 21:49:31 +02:00
Bart Visscher	99ce7ba1df	Move serverHost and serverProtocol functions to OC_Request	2012-08-07 20:43:00 +02:00
Michael Gapczynski	b6bbbb4c47	Remove undefined return variable	2012-08-07 14:38:02 -04:00
Michael Gapczynski	a96a75c263	Select the correct column when searching for similar targets	2012-08-06 16:48:20 -04:00
Michael Gapczynski	5e95e2a131	Set filePath variable	2012-08-06 16:46:44 -04:00
Michael Gapczynski	1b21cde2b3	Throw more exceptions	2012-08-06 16:37:51 -04:00
Michael Gapczynski	14d13a740f	Load icons for addressbooks, fix statuses for types other than files	2012-08-06 15:24:08 -04:00
Michael Gapczynski	e954de6030	Make the file source path relative earlier	2012-08-06 14:15:37 -04:00
Michael Gapczynski	e280e3ecc9	Throw more exceptions	2012-08-06 14:09:58 -04:00
Michael Gapczynski	1db1d40414	Add additional check for post_deleteUser so we don't delete any non-user shares with the same name	2012-08-06 13:58:26 -04:00
Michael Gapczynski	ea23854328	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	3b2c853916	Lots of refactoring to share API	2012-08-06 11:27:13 -04:00
Michael Gapczynski	09bb3bfaf8	Preparing for proper collection implementation	2012-08-03 15:05:45 -04:00
Michael Gapczynski	6c7baacf89	Throw exception for items already shared in a collection	2012-08-01 20:08:18 -04:00
Michael Gapczynski	92d683587a	Fix contact email share type redirection	2012-08-01 17:52:59 -04:00
Michael Gapczynski	4933128850	Throw exceptions in share API for UI to display	2012-08-01 17:52:29 -04:00
Michael Gapczynski	2201074e1f	Basic setup for sharing with contacts	2012-08-01 17:17:28 -04:00
Jörn Friedrich Dreyer	e13f381189	add limit support to OC_DB & OCP/DB	2012-08-01 14:59:08 +02:00
Michael Gapczynski	b6aa5d2875	Include contacts in share with search	2012-07-31 21:05:00 -04:00
Michael Gapczynski	94ce8f2168	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
Michael Gapczynski	9e4c3b8342	Remove break, it broke the statuses :)	2012-07-31 14:21:46 -04:00
Michael Gapczynski	2f1a990cad	Add search, limit, and offset parameters to getUsers() and getGroups()	2012-07-30 20:20:46 -04:00
Jakob Sack	8a92cd21d6	Remove OC_App::register call in OCP\App::register	2012-07-30 21:26:14 +02:00
Georg Ehrke	e4679770c4	declare OCP\App::register as deprecated	2012-07-26 15:16:07 +02:00
Georg Ehrke	4e62e121a6	mark OCP\App::register as deprecated	2012-07-26 15:12:57 +02:00
Michael Gapczynski	30b58f5677	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
Arthur Schiwon	6b320a2604	provide recursiveArraySearch as Helper function and make available through API	2012-07-25 12:56:08 +02:00
Arthur Schiwon	0196e6eada	Offer User and Group interfaces in public API	2012-07-25 12:56:08 +02:00
Thomas Tanghus	0af454a23b	Trying to get documentation to "Do The Right Thing" (TM)	2012-07-20 23:11:06 +02:00
Thomas Tanghus	de8ed98541	Added some more documentation to OCP\JSON.	2012-07-20 21:20:51 +02:00
Thomas Tanghus	10337c059c	Added some documentation for OCP\JSON::callCheck()	2012-07-20 20:15:39 +02:00
Robin Appelman	c9be9ab251	remove unused variables	2012-07-20 18:56:18 +02:00
Michael Gapczynski	1ff2dd8f63	Listen to post_deleteUser, post_addToGroup, and post_removeFromGroup hooks	2012-07-14 14:06:57 -04:00
Michael Gapczynski	cc6c940b9a	Implement post_removeFromGroup()	2012-07-14 11:55:22 -04:00
Michael Gapczynski	82dea705d4	Add option to delete() to check the owner of the first search of reshares	2012-07-14 11:53:02 -04:00
Michael Gapczynski	0e9ab5cf2a	Fix post_deleteUser(), column name changed and item_source is no longer needed	2012-07-14 11:02:16 -04:00
Michael Gapczynski	459bcd8d5e	Update documentation	2012-07-14 10:55:34 -04:00
Michael Gapczynski	bbbfc2c565	Fix delete(), it was going in an infinite loop	2012-07-14 10:52:31 -04:00
Michael Gapczynski	8de69fcb18	Update documentation	2012-07-14 10:19:18 -04:00
Michael Gapczynski	51a4518396	Add support for CRUDS permissions	2012-07-14 09:35:39 -04:00
Michael Gapczynski	f638340d1f	Add check for folder item type as well	2012-07-12 14:29:51 -04:00
Michael Gapczynski	63b6f20e05	Move already shared with check out of user and group cases, and add check for already shared with inside a collection	2012-07-12 12:11:04 -04:00
Michael Gapczynski	ecae3ea430	Rename parents to collectionTypes, getCollectionItemTypes() shouldn't include the original item type	2012-07-12 12:10:50 -04:00
Michael Gapczynski	bdcfa4bb63	Add check if file is found in file cache	2012-07-11 20:43:48 -04:00
Michael Gapczynski	4bf13adff2	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	ccb5e99395	Generate random token for private links (more entropy than past private links)	2012-07-11 12:18:59 -04:00
Michael Gapczynski	a7416b1cd8	Add back returning only the item if the limit is 1 and now check that the format is set to none	2012-07-10 21:30:16 -04:00
Michael Gapczynski	c21ff29a53	Fix getItems() calls	2012-07-10 21:29:34 -04:00
Michael Gapczynski	7c908a0016	Sharing files working using share API	2012-07-10 18:56:22 -04:00
Jörn Friedrich Dreyer	e59a1806cf	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
Michael Gapczynski	96dea9507a	Return false for single item checks and an empty array for multiple item checks	2012-07-03 14:03:04 -04:00
Michael Gapczynski	5e8ef33190	Clean up in the dropdown for unsharing	2012-07-03 14:00:09 -04:00
Michael Gapczynski	4185bd6292	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	77b582e4e6	Change getItems() return to a 3-dimensional array to handle multiple shares of the same item	2012-07-02 15:29:34 -04:00
Arthur Schiwon	52822652bc	provide multibyte aware helper functions mb_str_replace, mb_substr_replace and mb_array_change_key_case for handling with UTF 8	2012-07-02 20:31:19 +02:00
Michael Gapczynski	dd56416a39	Remove the method getItemsSharedStatuses, it is easy enough to just pass the format instead	2012-07-02 14:23:13 -04:00
Michael Gapczynski	3e8a34f906	Don't select all columns for FORMAT_STATUSES	2012-06-30 21:15:10 -04:00
Michael Gapczynski	c073216d8d	Don't overwrite the item variable when checking if the item is already shared	2012-06-30 20:57:31 -04:00
Michael Gapczynski	75c111a33b	Have getItems() return an empty array instead of false, so apps only need to do an array_merge()	2012-06-30 18:00:01 -04:00
Michael Gapczynski	7a649fc65a	Switch back to registering just the class and not the object, better for performance	2012-06-30 17:25:21 -04:00
Michael Gapczynski	cb19fdd55b	Show users and groups shared with in dropdown	2012-06-27 01:05:37 +02:00
Michael Gapczynski	d95d738723	Fix FORMAT_STATUSES	2012-06-27 01:05:36 +02:00
Michael Gapczynski	9fdfcc29fe	Fix group sharing	2012-06-27 01:05:36 +02:00
Bart Visscher	d332e1e9c1	Documentation fix	2012-06-27 01:05:36 +02:00
Michael Gapczynski	c41cb192c9	Fix which line needs '' wrapped around the array values	2012-06-27 01:05:36 +02:00
Michael Gapczynski	243faf6334	Fix searching for parent item types, search for file source instead of item source for the file item type in case the item was converted	2012-06-27 01:05:36 +02:00
Michael Gapczynski	32f9901bcd	Fix retrieving supported file extensions from backend and remove the dependsOn and supportedFileExtensions parameters from registerBackend()	2012-06-27 01:05:36 +02:00
Michael Gapczynski	28b7793d5b	Fixes and change database table from sharing to share	2012-06-27 01:05:36 +02:00
Michael Gapczynski	f21fdf14f9	Forgot I got rid of the class field backendTypes, use the array keys of the backends field instead	2012-06-27 01:05:36 +02:00
Michael Gapczynski	bc68f14c4b	Prepare drop down UI for share API	2012-06-27 01:05:36 +02:00
Michael Gapczynski	8198114615	Some more changes to getItems() and fixes in shared storage	2012-06-27 01:05:36 +02:00