Commit Graph

152 Commits

Author SHA1 Message Date
Bart Visscher 72864d1c53 Typo 2014-05-06 18:05:06 +02:00
Bart Visscher 50f49c57b5 Some more params are optional 2014-05-01 18:11:30 +02:00
Bart Visscher 66b1ad0a9b Merge branch 'master' into type-hinting-sharing
Conflicts:
	apps/files_sharing/lib/share/file.php
	apps/files_sharing/tests/api.php
	lib/private/share/share.php
2014-04-28 17:59:41 +02:00
Robin McCorkell 77e3d067f0 Better handle return values from Filesystem::getMountBy*
getMountByStorageId and getMountByNumericId return an empty array on error,
which should be detected to avoid possible errors. This commit also adds in
some new logging points and throws to aid debugging
2014-04-25 09:50:34 +01:00
Björn Schießle f520305848 Merge pull request #8026 from owncloud/remove_shared_folder
remove the "Shared" folder
2014-04-24 18:45:45 +02:00
Bjoern Schiessle 35321c7d41 add additional rows to the select statement, 'stime' is needed for the expire check 2014-04-24 15:18:25 +02:00
Bjoern Schiessle 6650be9913 add setting to set default expire date 2014-04-24 13:34:31 +02:00
Volkan Gezer ff0dab6e92 This adds one more missing untranslated text from lib/share
Also displays the untrusted domain warning in English
2014-04-24 01:42:18 +02:00
Bjoern Schiessle b312d38d38 remove hard-coded shared folder 2014-04-23 12:59:22 +02:00
Bjoern Schiessle fb88aba8f4 some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code 2014-04-23 12:54:26 +02:00
Bjoern Schiessle 652d417a58 we don't allow to share a folder if it contains a share mount point 2014-04-23 12:54:26 +02:00
Bjoern Schiessle bffcbac7a7 allow to rename group share mount points 2014-04-23 12:54:25 +02:00
Bjoern Schiessle 4c840cb61d fix target generation for group shares 2014-04-23 12:54:25 +02:00
Bjoern Schiessle ed981294f1 fix share api tests 2014-04-23 12:54:25 +02:00
Bjoern Schiessle c4e0fb75a4 add api to get shares from a specific user 2014-04-23 12:54:24 +02:00
Bjoern Schiessle cfc52ccc3d add some action items 2014-04-23 12:54:24 +02:00
Joas Schilling 704b9e6a0d Merge pull request #8009 from owncloud/feature/add-sharing-target
Add option to getUsersSharingFile() to get the paths for the shared users
2014-04-23 12:49:06 +02:00
Thomas Müller dcc48f9b46 Merge pull request #8068 from wakeup/fix-share.php-string-extraction
Make lib/** share.php strings extractable for translation
2014-04-23 09:58:10 +02:00
Volkan Gezer 6e857de6b7 Make lib/** share.php strings extractable for translation
They were not ready for translation as they had no placeholders
and/nor wrapper function to be translated

This should fix: #8011
2014-04-22 14:56:44 +02:00
Bart Visscher a9bf3df82d Fix PHPdoc in OC\Share\Share and OCP\Share 2014-04-15 21:05:44 +02:00
Björn Schießle 2dbb2db7e0 Merge pull request #7780 from owncloud/share-file-exists
Verify that a file exists before we share it
2014-04-15 11:23:17 +02:00
Joas Schilling 352063cf0a Fix Undefined index: storage in share.php
There parameter was removed when the code was cleaned up:
{"app":"PHP","message":"Undefined index: storage at
E:\\ownCloud\\owncloud\\lib\\private\\share\\share.php#1160",
"level":0,"time":"2014-04-09T12:56:23+00:00"}
2014-04-09 15:14:44 +02:00
Joas Schilling d418e176ce Do not query when the list is empty 2014-04-09 15:02:06 +02:00
Joas Schilling 015b9b1dac Add option to getUsersSharingFile() to get the paths for the shared users 2014-04-09 15:02:05 +02:00
Thomas Müller 20f26068e7 Merge pull request #7476 from owncloud/type-hinting
Type hinting
2014-04-03 20:02:27 +02:00
Robin Appelman 850a0e7388 Verify that a file exists before we share it 2014-04-02 13:47:11 +02:00
Bart Visscher 6b061c236d Merge branch 'master' into type-hinting
Conflicts:
	lib/private/image.php
	lib/private/l10n.php
	lib/private/request.php
	lib/private/share/mailnotifications.php
	lib/private/template/base.php
2014-03-31 21:38:54 +02:00
Bjoern Schiessle 3a731a01b1 select statement always need to contain file_source respectively item_source 2014-03-31 15:03:35 +02:00
Morris Jobke e4069e1553 Emit event after setting a new expiration for a share
all credits to @frisco82
https://github.com/owncloud/core/pull/5335
2014-03-28 15:00:13 +01:00
Bjoern Schiessle 31681a3a27 finally fix the paths for the OCS Share API 2014-03-25 17:52:45 +01:00
Bjoern Schiessle 3653a51af2 fix path creation for re-shares, issue #7662 2014-03-25 17:48:50 +01:00
Bjoern Schiessle 2d8607fae9 don't assign variables in if condition 2014-03-25 17:47:24 +01:00
Bjoern Schiessle 5db3b049fd add todo 2014-03-25 17:47:24 +01:00
Bjoern Schiessle bc0292c16d always return an array 2014-03-25 17:47:24 +01:00
Bjoern Schiessle 154277ab11 seperate formatResults() 2014-03-25 17:47:24 +01:00
Bjoern Schiessle ecde48fce8 don't assign variables in if conditions 2014-03-25 17:47:24 +01:00
Bjoern Schiessle 078fafdc5a use variable 2014-03-25 17:47:24 +01:00
Bjoern Schiessle 3a459db358 seperate transformDBResults 2014-03-25 17:47:24 +01:00
Bjoern Schiessle 6607f7cb5e seperate creation of select statement 2014-03-25 17:47:24 +01:00
Bjoern Schiessle 6afd496d9b remove prepFileTarget() seems that it is no longer in use 2014-03-25 17:47:24 +01:00
Bjoern Schiessle b602662578 add a "helper" and a "hooks" class. Move constants needed by multiple classes
to a "constants" class
2014-03-25 17:47:24 +01:00
Bjoern Schiessle 8b6d1d3bf2 added private share api 2014-03-25 17:47:24 +01:00
Thomas Müller f1ecc758f5 send an individual email to each recipient 2014-03-10 21:54:23 +01:00
Bart Visscher 35a8dfb2fa More PHPDoc fixes, using scrutinizer patches as hints 2014-02-28 13:53:41 +01:00
Björn Schießle 16eb43c033 Merge pull request #7247 from owncloud/sharing_cleanup_step1
clean up the sharing ajax calls, add mail notification class
2014-02-20 11:56:20 +01:00
Bjoern Schiessle 2fd75d8f1c clean up the sharing ajax calls, add mail notification class 2014-02-19 19:33:00 +01:00
Scrutinizer Auto-Fixer adaee6a5a1 Scrutinizer Auto-Fixes
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720

Enabled analysis tools:
 - PHP Analyzer
 - JSHint
 - PHP Copy/Paste Detector
 - PHP PDepend
2014-02-19 09:31:54 +01:00
Arthur Schiwon af781bdea7 fix DI 2014-02-11 10:50:03 +01:00
Arthur Schiwon 32afdcbefe Inject logger 2014-02-11 10:49:59 +01:00
Arthur Schiwon 20bfbb0fd9 wrong tld 2014-02-11 10:49:54 +01:00
Arthur Schiwon 82716ced48 sort following entries in alphabetical order 2014-02-11 10:49:41 +01:00
Arthur Schiwon 41e8d44cf7 move sorter into a class 2014-02-11 10:49:34 +01:00