Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | allow admin to disable sharing for specific groups of users | Bjoern Schiessle | 2014-05-22 | 1 | -1/+9 |
| | |||||
* | Remove all occurences of @brief and @returns from PHPDoc | Morris Jobke | 2014-05-19 | 3 | -8/+8 |
| | | | | * test case added to avoid adding them later | ||||
* | Automatically copy the share expiration date when new shares are created | Joas Schilling | 2014-05-19 | 1 | -31/+93 |
| | | | | Fix #4823 | ||||
* | Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links | Björn Schießle | 2014-05-16 | 2 | -8/+12 |
|\ | | | | | use default expire date only for link shares | ||||
| * | use default expire date only for link shares | Bjoern Schiessle | 2014-05-16 | 2 | -8/+12 |
| | | |||||
* | | allow admin to enforce passwords for public link shares | Bjoern Schiessle | 2014-05-16 | 1 | -1/+10 |
|/ | |||||
* | fix PHPDoc | Thomas Müller | 2014-05-13 | 1 | -3/+5 |
| | |||||
* | adding PHPDoc | Thomas Müller | 2014-05-13 | 1 | -2/+21 |
| | |||||
* | fixing typo and missing @throws | Thomas Müller | 2014-05-13 | 1 | -1/+2 |
| | |||||
* | Fix all PHPDoc types and variable names, in /lib | Robin McCorkell | 2014-05-13 | 5 | -30/+30 |
| | |||||
* | Squash 'a | b' into 'a|b', in /lib | Robin McCorkell | 2014-05-13 | 1 | -1/+1 |
| | |||||
* | Fix @return array PHPDocs, in /lib | Robin McCorkell | 2014-05-13 | 1 | -1/+1 |
| | |||||
* | Merge pull request #8221 from owncloud/type-hinting-sharing | Vincent Petry | 2014-05-08 | 1 | -94/+95 |
|\ | | | | | Type hinting fixes for sharing | ||||
| * | Use 'boolean' as type instead of 'bool' | Bart Visscher | 2014-05-07 | 1 | -21/+21 |
| | | |||||
| * | Typo | Bart Visscher | 2014-05-06 | 1 | -1/+1 |
| | | |||||
| * | Some more params are optional | Bart Visscher | 2014-05-01 | 1 | -3/+3 |
| | | |||||
| * | Merge branch 'master' into type-hinting-sharing | Bart Visscher | 2014-04-28 | 3 | -99/+265 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/lib/share/file.php apps/files_sharing/tests/api.php lib/private/share/share.php | ||||
| * | | Fix PHPdoc in OC\Share\Share and OCP\Share | Bart Visscher | 2014-04-15 | 1 | -87/+88 |
| | | | |||||
* | | | Better handle return values from Filesystem::getMountBy* | Robin McCorkell | 2014-04-25 | 1 | -1/+1 |
| |/ |/| | | | | | | | | | 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 | ||||
* | | Merge pull request #8026 from owncloud/remove_shared_folder | Björn Schießle | 2014-04-24 | 2 | -20/+58 |
|\ \ | | | | | | | remove the "Shared" folder | ||||
| * | | remove hard-coded shared folder | Bjoern Schiessle | 2014-04-23 | 1 | -1/+1 |
| | | | |||||
| * | | some fixes to make the gallery work, this made it necessary to adjust some ↵ | Bjoern Schiessle | 2014-04-23 | 1 | -0/+1 |
| | | | | | | | | | | | | tests and the encryption code | ||||
| * | | we don't allow to share a folder if it contains a share mount point | Bjoern Schiessle | 2014-04-23 | 1 | -0/+16 |
| | | | |||||
| * | | allow to rename group share mount points | Bjoern Schiessle | 2014-04-23 | 1 | -0/+1 |
| | | | |||||
| * | | fix target generation for group shares | Bjoern Schiessle | 2014-04-23 | 1 | -10/+18 |
| | | | |||||
| * | | fix share api tests | Bjoern Schiessle | 2014-04-23 | 1 | -5/+1 |
| | | | |||||
| * | | add api to get shares from a specific user | Bjoern Schiessle | 2014-04-23 | 1 | -0/+16 |
| | | | |||||
| * | | add some action items | Bjoern Schiessle | 2014-04-23 | 1 | -4/+4 |
| | | | |||||
* | | | add additional rows to the select statement, 'stime' is needed for the ↵ | Bjoern Schiessle | 2014-04-24 | 1 | -3/+3 |
| | | | | | | | | | | | | expire check | ||||
* | | | add setting to set default expire date | Bjoern Schiessle | 2014-04-24 | 2 | -2/+62 |
| | | | |||||
* | | | This adds one more missing untranslated text from lib/share | Volkan Gezer | 2014-04-24 | 1 | -3/+4 |
|/ / | | | | | | | Also displays the untrusted domain warning in English | ||||
* | | Merge pull request #8009 from owncloud/feature/add-sharing-target | Joas Schilling | 2014-04-23 | 1 | -11/+52 |
|\ \ | | | | | | | Add option to getUsersSharingFile() to get the paths for the shared users | ||||
| * | | Do not query when the list is empty | Joas Schilling | 2014-04-09 | 1 | -14/+16 |
| | | | |||||
| * | | Add option to getUsersSharingFile() to get the paths for the shared users | Joas Schilling | 2014-04-09 | 1 | -11/+50 |
| | | | |||||
* | | | Merge pull request #8068 from wakeup/fix-share.php-string-extraction | Thomas Müller | 2014-04-23 | 1 | -63/+89 |
|\ \ \ | |_|/ |/| | | Make lib/** share.php strings extractable for translation | ||||
| * | | Make lib/** share.php strings extractable for translation | Volkan Gezer | 2014-04-22 | 1 | -63/+89 |
| |/ | | | | | | | | | | | | | They were not ready for translation as they had no placeholders and/nor wrapper function to be translated This should fix: #8011 | ||||
* | | Merge pull request #7780 from owncloud/share-file-exists | Björn Schießle | 2014-04-15 | 1 | -0/+10 |
|\ \ | | | | | | | Verify that a file exists before we share it | ||||
| * | | Verify that a file exists before we share it | Robin Appelman | 2014-04-02 | 1 | -0/+10 |
| | | | |||||
* | | | Fix Undefined index: storage in share.php | Joas Schilling | 2014-04-09 | 1 | -1/+1 |
| |/ |/| | | | | | | | | | | | 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"} | ||||
* | | Merge pull request #7476 from owncloud/type-hinting | Thomas Müller | 2014-04-03 | 1 | -1/+0 |
|\ \ | |/ |/| | Type hinting | ||||
| * | Merge branch 'master' into type-hinting | Bart Visscher | 2014-03-31 | 5 | -10/+1986 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/image.php lib/private/l10n.php lib/private/request.php lib/private/share/mailnotifications.php lib/private/template/base.php | ||||
| * | | More PHPDoc fixes, using scrutinizer patches as hints | Bart Visscher | 2014-02-28 | 1 | -2/+1 |
| | | | |||||
* | | | select statement always need to contain file_source respectively item_source | Bjoern Schiessle | 2014-03-31 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Emit event after setting a new expiration for a share | Morris Jobke | 2014-03-28 | 1 | -1/+8 |
| | | | | | | | | | | all credits to @frisco82 https://github.com/owncloud/core/pull/5335 | ||||
* | | finally fix the paths for the OCS Share API | Bjoern Schiessle | 2014-03-25 | 1 | -2/+4 |
| | | |||||
* | | fix path creation for re-shares, issue #7662 | Bjoern Schiessle | 2014-03-25 | 1 | -2/+7 |
| | | |||||
* | | don't assign variables in if condition | Bjoern Schiessle | 2014-03-25 | 1 | -18/+17 |
| | | |||||
* | | add todo | Bjoern Schiessle | 2014-03-25 | 1 | -1/+1 |
| | | |||||
* | | always return an array | Bjoern Schiessle | 2014-03-25 | 1 | -11/+4 |
| | | |||||
* | | seperate formatResults() | Bjoern Schiessle | 2014-03-25 | 1 | -18/+31 |
| | |