Commit Graph

890 Commits

Author SHA1 Message Date
Jenkins for ownCloud d0b3e8aceb [tx-robot] updated from transifex 2013-04-16 02:17:30 +02:00
Jenkins for ownCloud 19afc216cf [tx-robot] updated from transifex 2013-04-13 02:15:54 +02:00
Jenkins for ownCloud c06bc81c79 [tx-robot] updated from transifex 2013-04-10 02:09:39 +02:00
Jenkins for ownCloud cbece8b12f [tx-robot] updated from transifex 2013-04-04 00:06:51 +02:00
Jenkins for ownCloud 10e37e1553 [tx-robot] updated from transifex 2013-04-03 00:04:02 +02:00
Jenkins for ownCloud 0c666cb764 [tx-robot] updated from transifex 2013-03-27 00:11:05 +01:00
Björn Schießle d121180d46 Merge pull request #2270 from owncloud/fix_json_encoded_pubic_download
let public link download handle json encoded file lists [master]
2013-03-26 01:56:47 -07:00
Björn Schießle c2a49b5c1f the old path no longer exists after rename, update the parent folder instead 2013-03-25 14:21:06 +01:00
Björn Schießle abd48496d2 fix indention 2013-03-25 12:33:03 +01:00
Björn Schießle 102120f105 skip update if the recipient is the same user as the owner, otherwise we run in a infinite loop for group shares 2013-03-25 12:32:56 +01:00
Björn Schießle 285d328ef1 use html video tag to preview videos for public shares 2013-03-14 20:10:21 +01:00
Jenkins for ownCloud 9a0cb2ccaa [tx-robot] updated from transifex 2013-03-14 00:06:29 +01:00
Björn Schießle 30831b6b55 we need to listen to the pre delete hook, otherwise the file is already gone 2013-03-13 15:39:39 +01:00
Björn Schießle f971ce0b66 let public link download handle json encoded file lists 2013-03-13 11:15:17 +01:00
Bernhard Posselt 049a4df259 Merge pull request #1786 from owncloud/shared-folder-etags
Include etags for the root of the shared folder
2013-03-11 02:38:50 -07:00
Michael Gapczynski e743386acf Fix correctFolders and retrieve the correct storage cache 2013-03-08 14:27:30 -05:00
Lukas Reschke 546fb72b25 Merge pull request #2165 from owncloud/fix_2155
Offer download of whole shared dir only if it does not exceed zip input ...
2013-03-08 10:31:48 -08:00
Björn Schießle 02e2f7384e not only files can be reshared but also folders 2013-03-08 17:32:04 +01:00
Michael Gapczynski 20828488bc Fix share hook for updater 2013-03-08 10:59:22 -05:00
Björn Schießle 2d00d13a5d use pre_unshare hook, otherwise the share is already removed. Which means that we have no chance to determine which folder has to be updated 2013-03-08 15:13:00 +01:00
Michael Gapczynski 4826564344 Merge branch 'master' into shared-folder-etags
Conflicts:
	apps/files_sharing/lib/sharedstorage.php
2013-03-07 17:14:34 -05:00
Michael Gapczynski a5cab28bea Fix fetching source path of shared files 2013-03-07 11:12:59 -05:00
Michael Gapczynski 4cb5cb9693 itemSource parameter should be fileSource 2013-03-07 10:00:03 -05:00
Arthur Schiwon 2ae1ad23b0 Offer download of whole shared dir only if it does not exceed zip input limit 2013-03-07 15:48:10 +01:00
Michael Gapczynski 812e306e6e Update Shared folders ETags of users with reshares 2013-03-06 17:33:27 -05:00
Michael Gapczynski 771e01af35 Move hook connectors from shared storage to app.php, add post_unshare hook 2013-03-05 21:57:32 -05:00
Michael Gapczynski 4dcbaa1d7b Merge branch 'master' into shared-folder-etags
Conflicts:
	apps/files_sharing/appinfo/app.php
2013-03-05 21:54:32 -05:00
Michael Gapczynski e466d680fe Fix variable name in Shared_Updater 2013-03-02 13:11:57 -05:00
Michael Gapczynski 9b4d7d9925 Update ETag when file is shared 2013-03-02 12:57:29 -05:00
Lukas Reschke fdb37d191b Merge pull request #2092 from owncloud/infieldlabels-placeholder
explicitly add empty placeholder to inputs which use infield labels
2013-03-04 13:31:21 -08:00
Jan-Christoph Borchardt 07dee24cb2 explicitly add empty placeholder to inputs which use infield labels, fix #2049 2013-03-04 22:11:57 +01:00
Bernhard Posselt 10b108ed8a Merge pull request #2030 from j-ed/master
suppress log messages like `include path for class ... starts with "apps/"`
2013-03-04 12:59:39 -08:00
Michael Gapczynski ec2a9169b9 Change remove() $user parameter to optional 2013-03-04 11:44:09 -05:00
j-ed d3e0a41dad Update app.php
suppress log messages like `include path for class \"OC\\Files\\Storage\\Shared\" starts with \"apps\/\"`
2013-03-02 12:14:52 +01:00
Michael Gapczynski b5989c933f Merge branch 'master' into shared-folder-etags
Conflicts:
	apps/files_sharing/lib/sharedstorage.php
2013-02-28 10:39:23 -05:00
Lukas Reschke 221ecf63ab [files_sharing] From echo to p 2013-02-27 21:37:14 +01:00
Jenkins for ownCloud fd654e9c2f [tx-robot] updated from transifex 2013-02-27 14:37:12 +01:00
Jenkins for ownCloud 348812f2ce [tx-robot] updated from transifex 2013-02-27 00:09:33 +01:00
Michael Gapczynski ea83acedeb Fix target path and reuse mtime 2013-02-26 01:43:04 -05:00
Michael Gapczynski 8983465210 Correct parent folders' ETags for all users with access to a shared file 2013-02-26 01:21:48 -05:00
Frank Karlitschek 9ee5069f2a Merge pull request #1856 from owncloud/fix_error_handling_stream_copy
don't use the number of written bytes as indicator if streamCopy() was successful
2013-02-25 02:04:12 -08:00
Frank Karlitschek 8f65916904 Merge pull request #1882 from owncloud/required_version
Set required owncloud version to 4.93
2013-02-25 00:37:22 -08:00
Jenkins for ownCloud 21f3291eee [tx-robot] updated from transifex 2013-02-25 00:06:17 +01:00
Robin Appelman 4e826b1673 Set required owncloud version to 4.93 2013-02-24 17:38:36 +01:00
Michael Gapczynski 36827d1549 Fix variable 2013-02-23 16:09:56 -05:00
Michael Gapczynski 00e28cf156 Return unknown free space for shared root folder so we can still upload partial files 2013-02-23 15:42:01 -05:00
Michael Gapczynski b6a21cc4b5 Fix WebDAV uploading of partial shared files 2013-02-23 15:32:59 -05:00
Michael Gapczynski 09a2730f57 Include etag field for folder contents 2013-02-23 15:22:34 -05:00
Bart Visscher bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Björn Schießle d8137fdf66 return both, count and result if the operation succeeded or failed. Maybe in some cases it is useful to know how much bytes where copied 2013-02-22 16:43:11 +01:00
Bart Visscher 59a3238d1a Style cleanup files_sharing 2013-02-21 23:46:50 +01:00
Michael Gapczynski 3dfb1628ce Include etags for the root of the shared folder 2013-02-19 20:42:48 -05:00
Jan-Christoph Borchardt d1dcb282cb fix multiselect bar offset on shared page, close #1339 finally 2013-02-14 17:40:08 +01:00
Robin Appelman d0d6d973a9 Share: fix table head color for public shared folders 2013-02-11 12:35:39 +01:00
Robin Appelman a1db280a46 Share: fix downloading selected files from public shared folder 2013-02-11 11:54:44 +01:00
Robin Appelman 7fa9181a26 Share: fix sorting of files in public shared folder 2013-02-11 11:50:41 +01:00
Robin Appelman bbf672f453 Share: fix nested subfolders in public shared folders 2013-02-11 11:48:49 +01:00
Robin Appelman 7842b416d1 Share: fix breadcrumbs for public shared folder 2013-02-11 11:44:18 +01:00
Robin Appelman 762688762f Share: fix downloading files from a public shared folder 2013-02-11 11:38:52 +01:00
Robin Appelman d0a005ea97 Sharing: fix position of file list in public link view of folder 2013-02-11 11:20:51 +01:00
Björn Schießle d7d9e2a15a fix positioning of password label, add autofocus to password field 2013-02-11 10:20:31 +01:00
Michael Gapczynski a6bd086867 Set permissions to read only 2013-02-10 20:01:25 -05:00
Michael Gapczynski 56df48b40f Remove additional old compatibility code 2013-02-10 19:14:20 -05:00
Michael Gapczynski 0d3c58d6b6 Replace filename key with fileTarget in template 2013-02-10 19:13:13 -05:00
Michael Gapczynski 8e3b8c7f47 Proper fix for shared links 2013-02-10 19:09:58 -05:00
Michael Gapczynski c6985d6cd4 Merge branch 'master' into fix-shared-links 2013-02-10 00:54:20 -05:00
Michael Gapczynski 71affd528c Fix public links 2013-02-10 00:53:58 -05:00
Jenkins for ownCloud 35bd7a400d [tx-robot] updated from transifex 2013-02-07 00:11:04 +01:00
Michael Gapczynski cc19df22a1 Remove old OC4 link compatibility 2013-02-06 13:09:04 -05:00
Jenkins for ownCloud 335b6cd060 [tx-robot] updated from transifex 2013-02-06 00:06:28 +01:00
Jenkins for ownCloud 98f37f4bed [tx-robot] updated from transifex 2013-02-05 00:20:29 +01:00
Thomas Müller 5ceddabaa6 Merge pull request #1340 from owncloud/fixing-js-errors-public-link-master
Fixing js errors public link master
2013-02-03 21:53:02 -08:00
Jenkins for ownCloud da6e79a381 [tx-robot] updated from transifex 2013-02-04 00:05:52 +01:00
Jenkins for ownCloud 2936140838 [tx-robot] updated from transifex 2013-02-03 00:06:15 +01:00
Thomas Mueller 2af6d74bc1 Merge branch 'master' into fixing-js-errors-public-link-master
Conflicts:
	apps/files/js/files.js
	apps/files/templates/part.list.php
2013-01-31 23:23:10 +01:00
Robin Appelman 207aa22d12 merge master into filesystem 2013-01-30 19:24:24 +01:00
Lukas Reschke 250c565d2b Merge pull request #1360 from owncloud/display_name
introduction of display names
2013-01-29 14:05:54 -08:00
Robin Appelman a67f11c8af Sharing: partailly fix searchByMime 2013-01-28 21:25:19 +01:00
Robin Appelman 7207211f3a change required ownCloud version to 4.91 2013-01-28 19:58:24 +01:00
Robin Appelman 74f6f85628 merge master into filesystem 2013-01-28 19:37:58 +01:00
Robin Appelman c9c919da57 Move streamwrappers to seperate files and put them in a namespace 2013-01-28 15:34:15 +01:00
Thomas Mueller 47ce3c2160 include keyboardshortcuts.js 2013-01-28 09:47:21 +01:00
Thomas Müller 31d83fddc4 Merge pull request #1321 from owncloud/csp-fixes
Files: CSP fixes
2013-01-28 00:29:46 -08:00
Robin Appelman bca5ce724e Merge branch 'master' into filesystem 2013-01-28 02:35:51 +01:00
Jenkins for ownCloud 00a28062e1 [tx-robot] updated from transifex 2013-01-27 00:06:21 +01:00
Robin Appelman 930b9b9cd0 merge master into filesystem 2013-01-26 18:49:45 +01:00
Lukas Reschke 2e42c6f54f Use HTML5 data attribute + fix undefined variable 2013-01-26 14:07:35 +01:00
Lukas Reschke 047f1988c3 Merge branch 'master' into no-inline-js 2013-01-25 16:11:07 +01:00
Björn Schießle 839f4bd949 show display name instead of uid in the public shared files view 2013-01-25 13:01:53 +01:00
Jenkins for ownCloud 6832dddf39 [tx-robot] updated from transifex 2013-01-25 00:05:56 +01:00
Jenkins for ownCloud 3ff32eba25 [tx-robot] updated from transifex 2013-01-24 00:07:38 +01:00
Thomas Mueller 5fadd53088 missing renames of publicListView to disableSharing 2013-01-23 09:18:26 +01:00
Lukas Reschke 9bc8df3649 Move publicListView to external JS 2013-01-21 20:36:19 +01:00
Michael Gapczynski 8ca30d244c Implement getETag() in shared storage 2013-01-19 00:02:40 -05:00
Robin Appelman 5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Bart Visscher 5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Robin Appelman 9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +01:00
Michael Gapczynski 36cac7f924 Return NOT_FOUND in shared cache 2013-01-10 22:29:47 -05:00
Thomas Müller 60489764f3 Merge pull request #1133 from owncloud/add_linebreaks_in_sharing
add more linebreaks, replace SQL LIMIT with param
2013-01-10 15:14:14 -08:00
Jenkins for ownCloud d03dce1283 [tx-robot] updated from transifex 2013-01-11 00:06:14 +01:00
Jenkins for ownCloud 912050afa0 [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00
Jörn Friedrich Dreyer 42e3eaf45a add more linebreaks, replace SQL LIMIT with param 2013-01-09 13:57:51 +01:00
Michael Gapczynski e8b195bf10 Almost fix Shared scanner... 2013-01-07 20:52:51 -05:00
Michael Gapczynski 8f8a5bbfb7 Maked Shared_Permissions extend Permissions class 2013-01-07 18:17:14 -05:00
Michael Gapczynski a7d4d04223 Fix mimetypes in shared cache 2013-01-07 15:27:22 -05:00
Robin Appelman e8d08d4930 merge master into filesystem 2013-01-07 00:16:10 +01:00
Michael Gapczynski 0b13b41189 Merge pull request #1053 from owncloud/ocs_api
External API for ownCloud based on OCS
2013-01-04 17:18:58 -08:00
Michael Gapczynski f144be8857 Don't mount shared storage unless there are shared files 2013-01-03 11:37:19 -05:00
Robin Appelman e40be93e87 merge master into filesystem 2013-01-03 15:59:17 +01:00
Jenkins for ownCloud 3bcdd8c900 [tx-robot] updated from transifex 2013-01-03 00:05:19 +01:00
Michael Gapczynski a1f7c28e28 Use the source Scanner for shared storage when the path is specified 2013-01-01 14:47:25 -05:00
Michael Gapczynski fe90130618 Initialize storageId variable in shared cache 2013-01-01 14:24:18 -05:00
Michael Gapczynski 268c7acfc4 Actually add Shared_Watcher 2013-01-01 13:16:42 -05:00
Michael Gapczynski 3b67613afc Remove Shared_Scanner and add Shared_Watcher instead 2013-01-01 12:43:38 -05:00
Robin Appelman 0ac78a6411 Share: fix cache put function 2013-01-01 18:10:38 +01:00
Robin Appelman 4b65dd608a Share: small phpdoc fixes 2013-01-01 18:07:10 +01:00
Michael Gapczynski f2ca7023e1 Fix Shared root problems with Watcher and Quota proxy 2013-01-01 11:19:33 -05:00
Tom Needham 3d23e98390 Remove the WIP external sharing api 2012-12-31 16:31:22 +00:00
Tom Needham 6eb194b702 Merge branch 'master' into ocs_api
Conflicts:
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/files_encryption.pot
	l10n/templates/files_external.pot
	l10n/templates/files_sharing.pot
	l10n/templates/files_versions.pot
	l10n/templates/lib.pot
	l10n/templates/settings.pot
	l10n/templates/user_ldap.pot
	l10n/templates/user_webdavauth.pot
2012-12-31 15:47:15 +00:00
Jenkins for ownCloud 329bddab48 [tx-robot] updated from transifex 2012-12-31 00:05:31 +01:00
Jenkins for ownCloud 66e57f5fb1 [tx-robot] updated from transifex 2012-12-30 00:05:52 +01:00
Michael Gapczynski cfc3526b25 Fix data for shared root folder 2012-12-29 11:45:13 -05:00
Michael Gapczynski fb053f8e73 Fix retrieving of shared source paths 2012-12-29 11:09:57 -05:00
Michael Gapczynski 8bdfb04056 Fix shared folders 2012-12-28 15:06:12 -05:00
Michael Gapczynski 1910057900 Fix shared statuses inside folders 2012-12-26 16:20:10 -05:00
Robin Appelman 7e36f730ec merge master into filesystem 2012-12-25 14:29:29 +01:00
Jenkins for ownCloud 0656b41747 [tx-robot] updated from transifex 2012-12-23 00:10:23 +01:00
Jenkins for ownCloud a4b0df419e [tx-robot] updated from transifex 2012-12-18 00:14:58 +01:00
Tom Needham 3c98f36121 Merge branch 'master' into ocs_api 2012-12-16 22:29:00 +00:00
Michael Gapczynski bf05ff351f Initial support for file sharing with filesystem branch 2012-12-15 19:44:59 -05:00
Robin Appelman 946d58eaa8 merge master into filesystem 2012-12-15 02:21:26 +01:00
Bart Visscher 2ef2dc4dda Fix "There must be a single space between the closing parenthesis and the opening brace" 2012-12-15 00:43:46 +01:00
Tom Needham 5fe6129698 Merge master into ocs_api, fix conflicts. 2012-12-14 15:15:05 +00:00
Thomas Müller 8b4aad73c7 Merge pull request #810 from owncloud/send-share-link-by-email
restoring feature to send sharing link via email
2012-12-12 04:54:51 -08:00
Robin Appelman 7969d6e646 Merge branch 'master' into filesystem 2012-12-11 23:57:59 +01:00
Thomas Mueller 162a2c0fba moving sharing email code to core 2012-12-10 23:22:42 +01:00
Thomas Mueller 45074d5023 restoring feature to send sharing link via email 2012-12-10 18:41:08 +01:00
Jenkins for ownCloud a444999a8c [tx-robot] updated from transifex 2012-12-10 00:12:32 +01:00
Robin Appelman 98f42d314c merge master into filesystem 2012-12-06 17:47:28 +01:00
Björn Schießle bf0f39f5b4 make sure that all expected array keys are available 2012-12-06 15:57:53 +01:00
Jenkins for ownCloud 524f3c3c0b [tx-robot] updated from transifex 2012-12-05 00:04:55 +01:00
Thomas Mueller 18663100d9 fixing syntax error + reformat the code 2012-12-02 12:12:20 +01:00
Robin Appelman 72b6faa69d merge master into filesystem 2012-12-02 03:03:48 +01:00
Robin Appelman d33f697a5f merge master into filesystem 2012-11-30 00:18:42 +01:00
Jenkins for ownCloud 16a630024c [tx-robot] updated from transifex 2012-11-30 00:05:16 +01:00
Jenkins for ownCloud 1d4d4fd678 [tx-robot] updated from transifex 2012-11-28 00:11:21 +01:00
Jörn Friedrich Dreyer 71e8755d31 Merge pull request #380 from butonic/feature_share_link_with_token
Feature share link with token
2012-11-26 07:42:53 -08:00
Jörn Friedrich Dreyer 995b5c0739 readd fallback code for pre token links 2012-11-23 15:51:57 +01:00
Robin Appelman 95057e727d merge master into filesystem 2012-11-23 00:40:58 +01:00
Thomas Müller c773d071ee Merge pull request #506 from owncloud/fix_505
refs #505 - defining publicListView based on template parameter
2012-11-22 02:53:10 -08:00
Jenkins for ownCloud 3a5f5e127c [tx-robot] updated from transifex 2012-11-22 00:02:16 +01:00
Robin Appelman 97380f3485 merge master into filesystem 2012-11-21 22:37:14 +01:00
Jenkins for ownCloud 9204be827b [tx-robot] updated from transifex 2012-11-21 00:02:33 +01:00
Jörn Friedrich Dreyer d8a171df26 implement share via link token 2012-11-20 15:03:12 +01:00
Jenkins for ownCloud 568def2b61 [tx-robot] updated from transifex 2012-11-20 00:02:08 +01:00
Thomas Mueller 2af7ac78d2 refs #505 - defining publicListView based on template parameter 2012-11-18 12:28:04 +01:00
Robin Appelman bf2ac9f113 merge master into filesystem 2012-11-15 00:37:54 +01:00
Thomas Tanghus 56239df2e7 Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_* 2012-11-11 23:10:23 +01:00
Robin Appelman 961ff01a93 merge master into filesystem 2012-11-07 17:18:56 +01:00
Björn Schießle 12983cf0b0 urlencode file/dir to allow special characters in filename/path (issue #95) 2012-11-07 10:47:19 +01:00
Felix Moeller a4b2ea586d Style: Remove all the dangling white spaces 2012-11-04 22:16:04 +01:00
Robin Appelman 4b940955dd merge master into filesystem 2012-11-04 21:12:18 +01:00
Felix Moeller 9795bc19bf Checkstyle: Fix the last two InvalidEOLChar 2012-11-04 18:42:18 +01:00
Felix Moeller afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Robin Appelman 51ba12890d Merge branch 'master' into filesystem 2012-11-01 16:16:02 +01:00
Tom Needham 43917e187b External Share API: Move url down one level in response 2012-10-31 11:31:19 +00:00
Jenkins for ownCloud aca6d3252f [tx-robot] updated from transifex 2012-10-31 00:02:32 +01:00
Robin Appelman 6e9e263497 merge master into filesystem 2012-10-30 22:59:55 +01:00
Jenkins for ownCloud 56cf7660bd [tx-robot] updated from transifex 2012-10-30 00:01:50 +01:00
Michael Gapczynski 60e5054ae8 Fix shared status icons 2012-10-28 16:02:05 -04:00
Tom Needham 6675a46679 Fix url generated for public shared files 2012-10-28 15:03:21 +00:00
Tom Needham bcdf3a23db Merge master into ocs_api 2012-10-28 11:16:04 +00:00
Tom Needham b079447988 Add API method for sharing a file, currently only via a link. 2012-10-28 11:06:47 +00:00
Robin Appelman 0fb707d2c9 some more porting of the sharing 2012-10-27 14:25:15 +02:00
Robin Appelman 86be7e8872 remove last uses of depricated OC_Filesystem 2012-10-27 12:23:13 +02:00
Robin Appelman dea0d20a9a fix delete and sort files 2012-10-27 12:18:01 +02:00
Robin Appelman cbc71784c0 Merge branch 'master' into filesystem 2012-10-27 10:02:26 +02:00
Jenkins for ownCloud 3bef19c623 [tx-robot] updated from transifex 2012-10-27 00:02:05 +02:00
Robin Appelman 6db81afab9 move some stuff to the new api 2012-10-26 23:05:02 +02:00
Robin Appelman 7bc49d2a57 merge master into filesystem 2012-10-25 18:26:08 +02:00
Lukas Reschke 7454186806 Forget to urlencode the path 2012-10-24 18:00:19 +02:00
Lukas Reschke ff6d2f16c4 urlencode 2012-10-24 17:58:52 +02:00
Robin Appelman 7b150dfa96 merge master into filesystem 2012-10-24 15:32:29 +02:00
Thomas Müller 41898a473e Apply coding style guide 2012-10-24 14:43:34 +03:00
Björn Schießle a9a27306de fix copy&paste bug from previous commit 2012-10-24 13:11:29 +02:00
Björn Schießle 1d200c554f Shared files are not stored in the file cache. Therefore we need to
use the share table from the db to find the item source if the public
link re-shares a already shared file.
2012-10-24 13:11:29 +02:00
Lukas Reschke 916e0fc343 Place the brackets in the first line 2012-10-24 13:09:09 +02:00
Thomas Müller 4c234bd666 Apply coding style guide
http://owncloud.org/dev/coding-style-guide/
2012-10-24 12:12:16 +03:00
Björn Schießle 070fe02448 calling OC_Filesystem at this point will initialize file system with wrong user (for public shared links if another user is logged in). Therefore remove trailing slashes without the help of OC_Filesystem. 2012-10-24 10:06:00 +02:00
Lukas Reschke a7eb56c799 Merge pull request #76 from fmms/master
checkstyle: some more cleanups
2012-10-23 23:48:27 -07:00
Lukas Reschke dfecdb9700 Remove uneeded vendor prefixes 2012-10-24 00:00:33 +02:00
Lukas Reschke f363bde121 Format the CSS in a readable way 2012-10-23 23:57:55 +02:00
Robin Appelman 7424f3aef6 merge master into filesystem 2012-10-23 16:16:46 +02:00
icewind1991 ab944094e2 Merge pull request #12 from scambra/fixes
check free space using folder's owner
2012-10-23 07:02:21 -07:00
Felix Moeller 36d0d75901 Codestyle: FunctionCallArgumentSpacing 2012-10-23 08:35:54 +02:00
Jenkins for ownCloud bc2a648f2d [tx-robot] updated from transifex 2012-10-23 02:06:03 +02:00
Robin Appelman 5217ca219a Merge branch 'master' into filesystem 2012-10-21 15:16:23 +02:00
Jenkins for ownCloud 16c4eb66d7 [tx-robot] updated from transifex 2012-10-21 02:06:44 +02:00
Robin Appelman 6f1fbf97f7 some namespaces fixed for the shared backend 2012-10-21 00:27:55 +02:00
Robin Appelman cfa036eaa9 drop filectime from the filesystem api's 2012-10-20 23:58:07 +02:00
Robin Appelman f7722abcb0 Merge branch 'master' into filesystem 2012-10-20 23:50:14 +02:00
Jenkins for ownCloud cfbd310d34 [tx-robot] updated from transifex 2012-10-20 02:03:53 +02:00
Robin Appelman 9712a78559 merge master into filesystem 2012-10-18 23:24:28 +02:00
Arthur Schiwon 81cf726b18 unset UserID after Update 2012-10-18 18:45:03 +02:00
Robin Appelman 77cef5f514 merge master into filesystem 2012-10-17 13:14:17 +02:00
Jenkins for ownCloud fd6adc7d08 [tx-robot] updated from transifex 2012-10-16 23:39:13 +02:00
Björn Schießle b08a1696f5 normalize path to avoid problems with trailing slashes, double-slashes, etc. 2012-10-16 12:48:56 +02:00
Bart Visscher 4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Jenkins for ownCloud c88cf5cae5 [tx-robot] updated from transifex 2012-10-14 02:08:47 +02:00
Robin Appelman 11e9ce25e6 merge master into filesystem 2012-10-13 04:29:20 +02:00
Jenkins for ownCloud b761143047 [tx-robot] updated from transifex 2012-10-12 02:07:10 +02:00
Robin Appelman fb2d2bc201 merge master into filesystem 2012-10-11 22:54:39 +02:00
Björn Schießle 77d91d5a03 generate correct link for shared files and shared directories 2012-10-11 13:45:16 +02:00
Robin Appelman 5c6e9518ed drop Filesystem::getInternalPath and Filesystem::getStorage in favor of Filesystem::resolvePath 2012-10-10 17:46:29 +02:00
Björn Schießle 41640b4b91 don't show the share action in the file view for publically shared files. 2012-10-10 17:44:21 +02:00
Robin Appelman aaa1b73364 don't use depricated OC_Filesystem 2012-10-10 13:18:36 +02:00
Robin Appelman 13e7e82d19 merge master into filesystem 2012-10-10 11:30:44 +02:00
Jenkins for ownCloud fce6ce9bc6 [tx-robot] updated from transifex 2012-10-10 02:09:28 +02:00
Michael Gapczynski 4e6f720f14 Fix closing the sharing dropdown by clicking on the share button 2012-10-09 19:23:44 +02:00
Robin Appelman e7899e17de merge phpunit into filesystem 2012-10-08 13:53:53 +02:00
Michael Gapczynski 995b8bf12a Remove old Shared folders from the file cache, fixes bug oc-1911 2012-10-07 17:34:21 -04:00
Jenkins for ownCloud e36317c21a [tx-robot] updated from transifex 2012-10-07 02:08:12 +02:00
Björn Schießle 5e2bce24b4 enable user to download selected files from publically shared directory 2012-10-05 16:12:04 +02:00
Björn Schießle c99f62891a breadcrumbs fixed for public share view 2012-10-05 15:06:59 +02:00
Björn Schießle 0d081ac5ac register download action for directories 2012-10-05 14:28:23 +02:00
Björn Schießle ef8a4a1629 register download action for files 2012-10-05 14:28:23 +02:00
Björn Schießle 99f4d949c1 fix download link for single files in publicly shared directory 2012-10-05 14:28:23 +02:00
Björn Schießle 72a48ca35e fix download of single publically shared files. 2012-10-05 12:01:18 +02:00
Björn Schießle dcad7aec82 fixed download of complete publically shared folder 2012-10-05 11:38:00 +02:00
Björn Schießle a611ce4f33 baseDir has to be the whole path to work with shared directories below the root directory. 2012-10-05 10:32:38 +02:00
Björn Schießle b88a61c633 no content area, it overlaps the file list 2012-10-05 10:32:38 +02:00
Michael Gapczynski 51321526e2 Prevent displaying errors if public link url parameters are incorrect 2012-10-03 16:14:54 -04:00
Robin Appelman ac44506b40 Merge branch 'master' into filesystem 2012-10-02 23:29:13 +02:00
Jenkins for ownCloud 32a6b3b862 [tx-robot] updated from transifex 2012-10-02 23:18:26 +02:00
Frank Karlitschek 3fdebaa5dc automatically remove and prevent installation of apps with a require version less than the current one. We check now the first ad second part of the version number.
Also increase the require tags of the core apps to 4.9 Please note that 4.9 is the internal versionnumber of the upcoming 4.5 release.
You have to pu a <require>4.9</require> into the info.xml of your app to make it as compatible with 4.5
2012-10-02 12:10:45 +02:00
Björn Schießle 550813ce41 don't use the complete path but the basename if the file/foder has no extension. Otherwise
we can end up with  different items in the shared directory with the same name (Also folder names can contain dots)
2012-10-02 11:41:26 +02:00
Jenkins for ownCloud f0c4356392 [tx-robot] updated from transifex 2012-10-02 02:06:08 +02:00
Arthur Schiwon b23ad579dc Sharing: backward compatibility to links from OC 4.0. 2012-10-01 14:39:53 +02:00
Robin Appelman b7eb3f3dff merge master into filesystem 2012-10-01 14:21:49 +02:00
Jenkins for ownCloud 377fb19818 [tx-robot] updated from transifex 2012-10-01 02:08:31 +02:00
Jenkins for ownCloud 27bd9df027 [tx-robot] updated from transifex 2012-09-28 23:36:09 +02:00
Jenkins for ownCloud 5144d26088 [tx-robot] updated from transifex 2012-09-28 02:06:03 +02:00
Jenkins for ownCloud 09aa95586a [tx-robot] updated from transifex 2012-09-27 02:03:09 +02:00
Robin Appelman 88bca9bc49 Merge branch 'master' into filesystem 2012-09-26 17:52:28 +02:00
Jenkins for ownCloud 2c00f8c850 [tx-robot] updated from transifex 2012-09-26 13:22:37 +02:00
Arthur Schiwon 0192d920f0 Sharing: write update errors to logfile; do not die on errors 2012-09-26 12:27:43 +02:00
Jenkins for ownCloud 5855355faa [tx-robot] updated from transifex 2012-09-26 02:06:37 +02:00
Arthur Schiwon 7b8c7aaf0d Add missing Sharing permission 2012-09-25 18:01:56 +02:00
Arthur Schiwon 80fde2d8d1 Sharing update: take over reshares and thus don't fail 2012-09-25 12:14:20 +02:00
Arthur Schiwon 15e02726d7 Fix files_sharing update script, by making filesystem and users available 2012-09-25 11:47:53 +02:00