summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-094-1/+38
|
* Merge pull request #8499 from owncloud/shareextstoragemountpointfixVincent Petry2014-05-082-6/+61
|\ | | | | Fix sharing of ext storage mount points
| * 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 #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-083-2/+13
|\ \ \ | | | | | | | | Type hinting fixes for sharing
| * \ \ Merge branch 'master' into type-hinting-sharingBart Visscher2014-04-28203-1314/+1506
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/lib/share/file.php apps/files_sharing/tests/api.php lib/private/share/share.php
| * | | | Fix PHPdoc in apps/files_sharingBart Visscher2014-04-154-1/+15
| | | | | | | | | | | | | | | | | | | | using scrutinizer patch
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-081-0/+2
| | | | |
* | | | | 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
* | | | 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-079-0/+42
| | | |
* | | | Merge pull request #8456 from owncloud/extstorage-unittestssuiteThomas Müller2014-05-053-5/+1
|\ \ \ \ | | | | | | | | | | Added ext storage app in autotest unit test run
| * | | | Added ext storage app in autotest unit test runVincent Petry2014-05-053-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #8386 from owncloud/fix_6946_masterVincent Petry2014-05-052-39/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix 6946 master
| * | | | Group Database backend must not gather user details itself but ask userArthur Schiwon2014-04-282-39/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-056-53/+78
|\ \ \ \ \ | | | | | | | | | | | | Images on public sharing get downscaled to increase use experience - thi...
| * | | | | load image via javascript and use $(document).width() to determine the ↵Thomas Müller2014-05-022-48/+62
| | | | | | | | | | | | | | | | | | | | | | | | proper side of the image to be returned
| * | | | | Images on public sharing get downscaled to increase use experience - this ↵Thomas Müller2014-05-025-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | will speed up loading time - adding keep aspect to core/ajax/preview.php - remove duplicate method Preview::show() - no more hard coded mimetype of preview - remove .png from the preview urls - keep old route preview.png for backwards compatibility - aspect preserving previews are now cached
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-055-0/+23
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-0479-37/+194
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-0334-35/+27
| | | | | |
* | | | | | Merge pull request #8377 from youngguns-nl/issue_8376Vincent Petry2014-05-021-1/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | | RecursiveDirectoryIterator does not work on NFS
| * | | | | refs #8376; spaces=>tabsSjors van der Pluijm2014-04-291-1/+1
| | | | | |
| * | | | | refs #8376; added comment and applied patch on other filesSjors van der Pluijm2014-04-281-1/+9
| |/ / / /
* | | | | Merge pull request #8400 from owncloud/download-button-public-folderThomas Müller2014-05-023-7/+14
|\ \ \ \ \ | | | | | | | | | | | | reintroduce download button on public shares
| * | | | | disable download button if zip download is disabledThomas Müller2014-05-022-1/+4
| | | | | |
| * | | | | fix position and look of public download buttonJan-Christoph Borchardt2014-05-021-3/+0
| | | | | |
| * | | | | remove file name from upper right buttonThomas Müller2014-04-291-1/+1
| | | | | |
| * | | | | reintroduce download button on public sharesThomas Müller2014-04-291-3/+10
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-023-5/+35
| | | | | |
* | | | | | Merge pull request #8415 from owncloud/sharing_fix_renameBjörn Schießle2014-05-011-4/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | [sharing] return the new name if a mount point was renamed
| * | | | | | return the new name if a mount point was renamedBjoern Schiessle2014-04-301-4/+7
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-0118-0/+128
| | | | | | |
* | | | | | | Merge pull request #8412 from owncloud/sharing_fix_part_file_renameLukas Reschke2014-04-303-9/+98
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [sharing] fix rename of part files
| * | | | | | get the correct owner path for part filesBjoern Schiessle2014-04-302-1/+92
| | | | | | |
| * | | | | | only update the values which really changedBjoern Schiessle2014-04-301-8/+6
| |/ / / / /
* | | | | | Merge pull request #8404 from owncloud/fix-checkboxesThomas Müller2014-04-301-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed too generic checkbox and link selectors
| * | | | | | Fixed too generic checkbox and link selectorsVincent Petry2014-04-291-5/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that the sharing dropdown is embedded into the table row for some reason. This fix makes use of a more specific selector for the checkboxes and file name links to make sure it doesn't spill into any other potential elements like the sharing dialog.
* | | | | | Merge pull request #8408 from owncloud/delete-spinnerMorris Jobke2014-04-302-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | Show spinner for all files when deleting all
| * | | | | | Show spinner for all files when deleting allVincent Petry2014-04-292-0/+17
| |/ / / / /
* / / / / / [tx-robot] updated from transifexJenkins for ownCloud2014-04-3091-0/+621
|/ / / / /
* | | | | Merge pull request #8382 from owncloud/enc_fix_decrypt_allVincent Petry2014-04-292-10/+52
|\ \ \ \ \ | | | | | | | | | | | | fix shouldEncrypt() method and improved decryptAll() unit tests
| * | | | | fix shouldEncrypt() method and improved decryptAll() unit testsBjoern Schiessle2014-04-282-10/+52
| |/ / / /
* | | | | Merge pull request #8285 from owncloud/better_getmountby_handlingicewind19912014-04-292-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Handle return values better from Filesystem::getMountBy*
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-27 21:44:36 +0000