summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8499 from owncloud/shareextstoragemountpointfixVincent Petry2014-05-083-6/+65
|\ | | | | Fix sharing of ext storage mount points
| * Fix getPathById for OracleVincent Petry2014-05-081-0/+4
| | | | | | | | | | Added extra code to handle the case of Oracle which saves empty strings as null values.
| * Added unit test for sharing ext storage mount pointsVincent Petry2014-05-081-2/+55
| |
| * Fix sharing of ext storage mount pointsVincent Petry2014-05-081-4/+6
| | | | | | | | | | When sharing an ext storage mount point, it will now use the name of the mount point instead of an empty string for the target path.
* | Merge pull request #8493 from ↵Andreas Fischer2014-05-081-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/we-certainly-don't-want-type-juggling-on-that Use strict type comparison * owncloud/we-certainly-don't-want-type-juggling-on-that: Use strict type comparison
| * | Use strict type comparisonLukas Reschke2014-05-071-2/+2
| |/ | | | | We certainly don't want to have type juggling on that.
* | Merge pull request #8293 from owncloud/files_external_fix_readDataVincent Petry2014-05-081-19/+18
|\ \ | | | | | | Fix issue with personal mount points and sharing
| * | Permit personal mount points to be used for sharingRobin McCorkell2014-04-211-19/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An issue existed where `readData` used `OCP\User::getUser()` to get the user for personal mount points, which worked in all situations apart from when a personal mount point was used for sharing, so the return from `getUser()` is not the user that owns the share. As such, any personal mount points would not work correctly when shared. `readData` and `writeData` have been changed from using a `$isPersonal` boolean to using a `$user` string|null. `$isPersonal = false` can now be written as `$user = NULL` (or left out in the case of `readData`), and `$isPersonal = true` can be written as `$user = OCP\User::getUser()`.
* | | Merge pull request #8221 from owncloud/type-hinting-sharingVincent Petry2014-05-085-168/+179
|\ \ \ | | | | | | | | Type hinting fixes for sharing
| * | | Use 'boolean' as type instead of 'bool'Bart Visscher2014-05-071-21/+21
| | | |
| * | | TypoBart Visscher2014-05-061-1/+1
| | | |
| * | | Correct return type for getFilePathBart Visscher2014-05-011-1/+1
| | | |
| * | | Better documentation for isValidSource functionBart Visscher2014-05-011-4/+1
| | | |
| * | | Some more params are optionalBart Visscher2014-05-011-3/+3
| | | |
| * | | Merge branch 'master' into type-hinting-sharingBart Visscher2014-04-281045-20063/+51293
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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\ShareBart Visscher2014-04-152-155/+158
| | | | |
| * | | | Fix PHPdoc in apps/files_sharingBart Visscher2014-04-154-1/+15
| | | | | | | | | | | | | | | | | | | | using scrutinizer patch
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-0814-17/+20
| | | | |
* | | | | Merge pull request #8497 from owncloud/sharing_cleanupBjörn Schießle2014-05-073-24/+9
|\ \ \ \ \ | |_|_|_|/ |/| | | | [sharing] some small clean ups and bug fixes
| * | | | Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanupBjoern Schiessle2014-05-072-2/+2
| |\ \ \ \
| | * | | | Fix endless loop on windows serversJoas Schilling2014-05-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Directory seperator is \ on windows However we can just check for path != dirname(path) because that is the same for '' (empty string), '.' and DIRECTORY_SEPARATOR on all OS
| * | | | | remove error_log outputBjoern Schiessle2014-05-071-2/+1
| |/ / / /
| * / / / we can take the permission directly from the share, no need to call the ↵Bjoern Schiessle2014-05-071-20/+6
|/ / / / | | | | | | | | | | | | share api first
* | | | Merge pull request #8488 from owncloud/sabre-notfoundloglevelLukas Reschke2014-05-072-6/+20
|\ \ \ \ | | | | | | | | | | Some expected Sabre exceptions are now logged with DEBUG level
| * | | | Some expected Sabre exceptions are now logged with DEBUG levelVincent Petry2014-05-072-6/+20
| | | | |
* | | | | Merge pull request #8223 from owncloud/fix_linkToPublicVincent Petry2014-05-073-5/+231
|\ \ \ \ \ | | | | | | | | | | | | Fix linkToPublic and linkToAbsolute.
| * | | | | Remove unused varThomas Tanghus2014-04-161-5/+0
| | | | | |
| * | | | | Add tests for linkTo, linkToPublic, linkToRemote, linkToRemoteBaseThomas Tanghus2014-04-162-0/+223
| | | | | |
| * | | | | Also fix linkToAbsoluteThomas Tanghus2014-04-161-3/+7
| | | | | |
| * | | | | Fix linkToPublic. Refs #8218Thomas Tanghus2014-04-151-2/+6
| | | | | |
* | | | | | Merge pull request #8489 from owncloud/share_updater_ignore_part_filesVincent Petry2014-05-072-1/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | [sharing] share updater ignore part files
| * | | | | | check if we have a fileinfoBjoern Schiessle2014-05-071-1/+5
| | | | | | |
| * | | | | | ignore part filesBjoern Schiessle2014-05-071-0/+6
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-0755-225/+341
| | | | | |
* | | | | | Merge pull request #8045 from josh4trunks/nginx_x-accel_send_uriVincent Petry2014-05-061-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Send URI instead of filepath to NGINX for X-Accel
| * | | | | | Send URI instead of filepath to NGINX for X-Acceljosh4trunks2014-04-031-1/+4
| | | | | | |
* | | | | | | Merge pull request #8466 from owncloud/fix-installation-caretMorris Jobke2014-05-061-2/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix enlarged caret on installation page
| * | | | | | | fix enlarged caret on installation pageJan-Christoph Borchardt2014-05-061-2/+0
|/ / / / / / /
* | | | | | | Merge pull request #8459 from owncloud/fix-getUserFolderMorris Jobke2014-05-051-2/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix getUserFolder() of server container
| * | | | | | | fix getUserFolder() of server containerMorris Jobke2014-05-051-2/+10
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #8456 from owncloud/extstorage-unittestssuiteThomas Müller2014-05-054-6/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added ext storage app in autotest unit test run
| * | | | | | | Added ext storage app in autotest unit test runVincent Petry2014-05-054-6/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make sure that the dynamic mount config and config classes from external storages are tested, these are now added into the autotest.sh test run by enabling the app.
* | | | | | | Merge pull request #8458 from snai/masterVincent Petry2014-05-051-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Updated Owncloud Mailinglist URL
| * | | | | | | Updated Owncloud Mailinglist URLMartin Grohmann2014-05-051-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #8455 from owncloud/preview-scaleupicewind19912014-05-051-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Dont create borders around previews when scaling up is disabled
| * | | | | | | Dont create borders around previews when scaling up is disabledRobin Appelman2014-05-051-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #8386 from owncloud/fix_6946_masterVincent Petry2014-05-0511-127/+95
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix 6946 master
| * | | | | | the group manager calls exists check less often, adjust test accordinglyArthur Schiwon2014-04-281-1/+1
| | | | | | |
| * | | | | | Group Database backend must not gather user details itself but ask userArthur Schiwon2014-04-2811-127/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backends. This is a port to master from PR #7745 remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends Conflicts: lib/private/group/backend.php LDAP: getDisplayNamesInGroup is not an option for group backends anymore Conflicts: apps/user_ldap/group_ldap.php apps/user_ldap/group_proxy.php clean up group backends Conflicts: lib/private/group/database.php remove now unnecessary test implement getDisplayNames in group manager adjust user manager tests test for group manager's displayNamesInGroup trim must not be used in empty in PHP < 5.5 keep the constant to not provoke PHP warnings Conflicts: lib/private/group/backend.php
* | | | | | | Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-masterThomas Müller2014-05-0514-76/+135
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Images on public sharing get downscaled to increase use experience - thi...
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 19:36:36 +0000