1842 Commits

Author	SHA1	Message	Date
Georg Ehrke	ead7de6bff	only mount every single homefolder when using sharing app	2012-08-27 16:10:37 +02:00
Georg Ehrke	b56a46bdea	fix filesharing for multiple data directories	2012-08-27 15:55:46 +02:00
Arthur Schiwon	0f379fd28a	OC_User: getHome is an optional method, taking it out of the Interface	2012-08-27 14:07:28 +02:00
Jörn Friedrich Dreyer	3970d0e636	Merge branch 'master' of github.com:owncloud/core	2012-08-27 14:00:17 +02:00
Jörn Friedrich Dreyer	15cdde74d3	return standard SQL values (sqlite3 understands CURRENT_...)	2012-08-27 13:33:24 +02:00
Georg Ehrke	16aff1045d	make use of OC_User::getHome in lib/migrate.php	2012-08-27 13:21:40 +02:00
Michael Gapczynski	18517f6adb	Fix share getItems() limit	2012-08-26 21:34:37 -04:00
Georg Ehrke	cd5c217c0d	use OC_User::getHome in lib/filesystem.php	2012-08-26 22:24:08 +02:00
Georg Ehrke	045c94ec3e	enable user backends to define their own place where to store the data	2012-08-26 22:04:31 +02:00
Georg Ehrke	5586054961	fix c&p fail from earlier commit today	2012-08-26 22:04:31 +02:00
Georg Ehrke	44f5033e29	Merge branch 'master' of github.com:owncloud/core	2012-08-26 16:30:30 +02:00
Georg Ehrke	8c8496aff9	don't allow group admins to change admin's accounts	2012-08-26 16:29:10 +02:00
Georg Ehrke	5a4854079f	implement getHome in OC_User	2012-08-26 16:24:25 +02:00
Jörn Friedrich Dreyer	39a9a4e73e	Merge branch 'master' of github.com:owncloud/core	2012-08-26 15:05:28 +02:00
jfd	9822cd30c0	fix sharing bug introduced with oracle support	2012-08-26 14:57:33 +02:00
Jenkins for ownCloud	bae07faa34	[tx-robot] updated from transifex	2012-08-26 01:20:16 +02:00
Jörn Friedrich Dreyer	4f5eff2b6f	Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support	2012-08-25 03:14:26 +02:00
jfd	1bfe26bb09	remove superflous LIMIT	2012-08-25 02:26:50 +02:00
jfd	379f27ed03	fix missing $	2012-08-25 02:17:44 +02:00
jfd	bc90a34b07	remove duplicate method	2012-08-25 02:13:32 +02:00
Jenkins for ownCloud	f57d527a7c	[tx-robot] updated from transifex	2012-08-25 02:08:36 +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
jfd	0c0ae928dc	escape all identifiers with backticks	2012-08-24 15:08:57 +02:00
Frank Karlitschek	f86f4c8bfd	4.0.7 ... and remove some ^M while at it	2012-08-24 15:00:53 +02:00
Michael Gapczynski	12df81fe0b	Check blacklist when renaming files	2012-08-24 15:00:52 +02:00
Lukas Reschke	5cb2d58c9f	Also check some other files	2012-08-24 15:00:52 +02:00
Jakob Sack	1dfa6f3d8f	Fix OC_Connector_Sabre_Locks for SQLite	2012-08-24 15:00:52 +02:00
Bjoern Schiessle	0ac8434670	fix for bug 879 - add parent directory to file cache if it does not exist yet. ... For example this can happen if the sync client is used before the user created the root directory (e.g. through web login).	2012-08-24 14:58:47 +02:00
Jenkins for ownCloud	07a889631e	[tx-robot] updated from transifex	2012-08-24 02:07:18 +02:00
Thomas Tanghus	c90c358f0d	Only load js and css once.	2012-08-23 05:02:30 +02:00
Jenkins for ownCloud	082ed4ab71	[tx-robot] updated from transifex	2012-08-23 02:07:35 +02:00
Michael Gapczynski	885b8c481b	Check if files_sharing app is enabled, move file specific javascript to files_sharing app	2012-08-22 12:32:07 -04: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
Jenkins for ownCloud	e6d87b2c4b	[tx-robot] updated from transifex	2012-08-22 02:08:16 +02:00
Frank Karlitschek	1d7018158e	4.5 alpha 1	2012-08-21 18:47:26 +02: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	cb0464ca4e	Bump version number for Share API	2012-08-19 22:36:19 -04:00
Michael Gapczynski	82d81e8d39	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
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
Robin Appelman	50cc5d5921	fix creating nested folders inside tar files	2012-08-19 05:54:16 +02:00
Robin Appelman	3da1339cd8	fix error when adding string data to an archive	2012-08-19 05:04:58 +02:00
Robin Appelman	154ce0f68d	also add getLocalFolder to OC_Filsystem and OC_FilesystemView	2012-08-19 02:42:15 +02:00
Robin Appelman	9b44d0cb32	add OC_FileStorage::getLocalFolder	2012-08-19 02:30:33 +02:00
Robin Appelman	5962469892	add OC_Archive::addRecursive	2012-08-18 22:42:35 +02:00
Frank Karlitschek	850ee93711	add impress mimetype	2012-08-17 12:39:05 +02:00
Robin Appelman	53a888cc81	more path normalization	2012-08-17 01:22:54 +02:00
Michael Gapczynski	df8a2e5361	File sharing cleanup, works perfectly I think :)	2012-08-16 12:20:14 -04:00
Jenkins for ownCloud	1e6dc67517	[tx-robot] updated from transifex	2012-08-16 02:09:15 +02:00
Michael Gapczynski	9cb3113f42	Fix problems exposed by tests	2012-08-15 11:59:08 -04:00
Michael Gapczynski	137e4cb342	Add tests for Share API, all tests passing :)	2012-08-15 11:55:54 -04:00
Jenkins for ownCloud	da3896808a	[tx-robot] updated from transifex	2012-08-15 02:07:20 +02: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
Robin Appelman	1522f7f211	fix some minor problems with path noramlization	2012-08-14 03:07:14 +02:00
Robin Appelman	0c8ce0bb32	some basic path normalization	2012-08-14 02:44:45 +02:00
Michael Gapczynski	863d3a43b2	Catch exceptions and write to log when creating storage object fails	2012-08-13 17:10:58 -04:00
Lukas Reschke	e72a57f595	Also check for some other files	2012-08-13 00:57:01 +02: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
Jakob Sack	deef1f73db	Backgroundjobs: fix bug in QueuedTask	2012-08-12 09:02:20 +02:00
Michael Gapczynski	a1c88a3e39	Add search, limit, offset parameters to usersInGroups()	2012-08-11 16:25:28 -04:00
Michael Gapczynski	4f1b3631ba	Change limit parameter in OC_User as well	2012-08-11 16:25:28 -04: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	1d7e3071e0	bump version to reate new tables	2012-08-11 17:32:17 +02:00
Lukas Reschke	0d8df3f55c	Revert "Combine install checks in lib/base.php" ... This reverts commit aa9fbf6639.	2012-08-11 17:07:35 +02:00
Michael Gapczynski	465767670b	Check blacklist when renaming files	2012-08-11 11:04:04 -04:00
Lukas Reschke	8ec45870a3	Validate cookie properly and prevent auth bypass ... BIG (!) thanks to Julien CAYSSOL	2012-08-10 15:28:59 +02:00
Jakob Sack	0ea4fa298c	Backgroundjobs: don't try to access OC_Appconfig if ownCloud has not been installed	2012-08-10 13:53:40 +02:00
Jakob Sack	81b997b56e	Merge branch 'backgroundjobs'	2012-08-10 13:00:51 +02:00
Bart Visscher	82b10954e7	Simplify loading app php script files	2012-08-10 12:27:37 +02:00
Bart Visscher	5e7086adc9	Move login handling to OC class	2012-08-10 12:17:13 +02:00
Bart Visscher	83403784d1	Always load when the requested file is css	2012-08-10 11:43:04 +02:00
Bart Visscher	da07245f59	Move OC::loadfile and OC::loadapp next to OC::handleRequest	2012-08-10 11:43:04 +02:00
Bart Visscher	e3c732040b	Make OC::loadfile and OC::loadapp protected, only used in OC::handleRequest	2012-08-10 11:43:04 +02:00
Bart Visscher	0973969386	Cleanup OC::loadfile	2012-08-10 11:43:04 +02:00
Bart Visscher	667cd318fe	Use OC_Util::displayLoginPage and cleanup the function	2012-08-10 11:43:04 +02:00
Bart Visscher	aa9fbf6639	Combine install checks in lib/base.php	2012-08-10 11:43:04 +02:00
Jakob Sack	f46fdfd814	Backgroundjobs: Add reset counter in worker	2012-08-09 22:30:11 +02:00
Jakob Sack	a6a1f892f0	BackgroundJobs: fix bug	2012-08-09 22:07:18 +02:00
Michael Gapczynski	be03ee29f0	Bump up version number	2012-08-09 13:55:36 -04:00
Jakob Sack	28c1ec19ea	BackgroundJob: forgot to rename file	2012-08-09 19:26:49 +02: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
Robin Appelman	acd8381094	fix scanning of archives in some cases	2012-08-09 16:36:16 +02:00
Georg Ehrke	10d0861872	remove unstable lib	2012-08-09 12:37:26 +02:00
Jakob Sack	889f0a1c6d	rename appconfig keys for backgroundjobs	2012-08-09 10:40:39 +02: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	37ee88aa6d	Fixed bug in OC_BackgroundJob_Worker	2012-08-09 01:29:15 +02:00
Jakob Sack	13a0818fec	Be more precise regarding backgroundjobs mode	2012-08-09 01:02:05 +02:00