mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,988 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

344 Commits

Author SHA1 Message Date
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
Jenkins for ownCloud 36474e5681 [tx-robot] updated from transifex 2012-08-20 02:01:32 +02:00
Jenkins for ownCloud 70e8a7e25c [tx-robot] updated from transifex 2012-08-17 00:45:46 +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
Jenkins for ownCloud da3896808a [tx-robot] updated from transifex 2012-08-15 02:07:20 +02: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
Jenkins for ownCloud 19446fb22f [tx-robot] updated from transifex 2012-08-13 23:19:31 +02:00
Thomas Mueller 53f117c01a l10n directories have been missing 2012-08-13 23:10:10 +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
Bart Visscher 7522a23693 Remove unused RUNTIME_NOSETUPFS var 2012-08-08 22:42:50 +02:00
Michael Gapczynski 05648dac61 Don't return file handle if the mode supports writing and the file is not writable 2012-08-08 11:25:24 -04:00
Michael Gapczynski 03d65af5dc Add share action back into addressbook settings, bump up z-index of dropdown so the autocomplete list is visible 2012-08-06 15:09:01 -04:00
Michael Gapczynski 83117445ac Fix offset for folder detection, no longer including '/Shared' in file target path 2012-08-06 14:33:47 -04:00
Michael Gapczynski ba0cf98175 Remove extra line, caused 'headers already sent' issues 2012-08-06 13:33:53 -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 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 5262cde6a6 Add additional error handling for emailing private links 2012-07-29 18:02:09 -04:00
Michael Gapczynski 7ff04be091 Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270' 2012-07-28 11:06:36 -04:00
Michael Gapczynski df9f5b902a Fix group detection for sharing in case username contains '@', fix for oc-1270 2012-07-27 15:34:51 -04:00
Michael Gapczynski cb21406e18 Implement CRUDS in share dropdown, and some clean-up 2012-07-26 21:56:22 -04:00
Michael Gapczynski add8f09355 No longer need hash() in shared storage, already implemented by the common file storage 2012-07-25 17:13:48 -04: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
Michael Gapczynski f25ccaff59 Fix filesystem hash, no longer using basicOperation() 2012-07-25 16:55:01 -04:00
Michael Gapczynski 4d17ed2f71 Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Michael Gapczynski fc72d4b10f Add root directory checks for CRUDS permissions in shared storage 2012-07-24 21:16:47 -04:00
Michael Gapczynski f7b89f0475 Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable() 2012-07-24 20:10:28 -04:00
Michael Gapczynski c60c6024a7 Remove toTmpFile() from shared storage, no longer needed 2012-07-24 14:50:43 -04:00
Michael Gapczynski eac297e8c4 Improve file source caching for shared folders 2012-07-24 14:41:19 -04:00
Michael Gapczynski e8675586af Fix permission check for rmdir(), implement unlink(), rename(), and copy() 2012-07-24 14:22:07 -04:00
Michael Gapczynski e6678bd454 Permission check should be made on parent folder when creating a new folder 2012-07-23 22:39:29 -04:00
Michael Gapczynski 7b01e3285e Include a few CRUDS permissions checks in shared storage, plus a little clean-up in shared storage 2012-07-23 22:05:53 -04:00
Robin Appelman 48ec78299e cleanup some obsolete foldersize code from the shared storage backend 2012-07-21 00:20:27 +02:00
Robin Appelman 7152b8b4ee remove unused and depricated getFolderSize 2012-07-20 18:32:40 +02:00
Robin Appelman b45d3ced79 fix remote and public.php 2012-07-13 22:44:35 +02: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 91a15bae76 Revert santizing toaddress, because PHPMailer now throws exceptions 2012-07-11 16:02:43 -04:00
Michael Gapczynski 7077678f7f Sanitize toaddress for emailing private links 2012-07-11 15:26:22 -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
Lukas Reschke 04a0755fd3 CSRF checks 2012-07-07 16:03:21 +02:00
Michael Gapczynski 5e8ef33190 Clean up in the dropdown for unsharing 2012-07-03 14:00:09 -04:00
Michael Gapczynski eca2e073f8 Don't reload the page after sending private link to email address 2012-07-01 11:54:32 -04:00
Michael Gapczynski 2418d9a1a9 Change registerBackend calls class argument to strings 2012-06-30 17:33:30 -04:00
Michael Gapczynski 2c773d549d Don't overwrite fake directory stream for Shared storage 2012-06-27 12:07:42 -04:00
Michael Gapczynski 28b7793d5b Fixes and change database table from sharing to share 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
Michael Gapczynski 71350bc618 I'm having trouble making up my mind... translateItem -> getItems() -> formatItems(). It may change again. Preparing shared storage for new api. 2012-06-27 01:05:36 +02:00