| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-11 | 4 | -5/+8 |
| | | |||||
| * | Merge pull request #8520 from owncloud/jslint_polishing_in_file_upload | Lukas Reschke | 2014-05-10 | 1 | -45/+61 |
| |\ | | | | | polish jslint for files-upload.js | ||||
| | * | polish jslint for files-upload.js | Jörn Friedrich Dreyer | 2014-05-09 | 1 | -45/+61 |
| | | | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-10 | 14 | -0/+104 |
| |/ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-09 | 4 | -1/+38 |
| | | |||||
| * | Merge pull request #8499 from owncloud/shareextstoragemountpointfix | Vincent Petry | 2014-05-08 | 2 | -6/+61 |
| |\ | | | | | Fix sharing of ext storage mount points | ||||
| | * | Added unit test for sharing ext storage mount points | Vincent Petry | 2014-05-08 | 1 | -2/+55 |
| | | | |||||
| | * | Fix sharing of ext storage mount points | Vincent Petry | 2014-05-08 | 1 | -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_readData | Vincent Petry | 2014-05-08 | 1 | -19/+18 |
| |\ \ | | | | | | | Fix issue with personal mount points and sharing | ||||
| | * | | Permit personal mount points to be used for sharing | Robin McCorkell | 2014-04-21 | 1 | -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-sharing | Vincent Petry | 2014-05-08 | 3 | -2/+13 |
| |\ \ \ | | | | | | | | | Type hinting fixes for sharing | ||||
| | * \ \ | Merge branch 'master' into type-hinting-sharing | Bart Visscher | 2014-04-28 | 203 | -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_sharing | Bart Visscher | 2014-04-15 | 4 | -1/+15 |
| | | | | | | | | | | | | | | | | | | | | | using scrutinizer patch | ||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-08 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanup | Bjoern Schiessle | 2014-05-07 | 2 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix endless loop on windows servers | Joas Schilling | 2014-05-07 | 2 | -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 output | Bjoern Schiessle | 2014-05-07 | 1 | -2/+1 |
| |/ / / / / | |||||
| * | | | / | we can take the permission directly from the share, no need to call the ↵ | Bjoern Schiessle | 2014-05-07 | 1 | -20/+6 |
| | |_|_|/ |/| | | | | | | | | | | | share api first | ||||
| * | | | | check if we have a fileinfo | Bjoern Schiessle | 2014-05-07 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | ignore part files | Bjoern Schiessle | 2014-05-07 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-07 | 9 | -0/+42 |
| | | | | | |||||
| * | | | | Merge pull request #8456 from owncloud/extstorage-unittestssuite | Thomas Müller | 2014-05-05 | 3 | -5/+1 |
| |\ \ \ \ | | | | | | | | | | | Added ext storage app in autotest unit test run | ||||
| | * | | | | Added ext storage app in autotest unit test run | Vincent Petry | 2014-05-05 | 3 | -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_master | Vincent Petry | 2014-05-05 | 2 | -39/+1 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Fix 6946 master | ||||
| | * | | | | Group Database backend must not gather user details itself but ask user | Arthur Schiwon | 2014-04-28 | 2 | -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-master | Thomas Müller | 2014-05-05 | 6 | -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üller | 2014-05-02 | 2 | -48/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | proper side of the image to be returned | ||||
| | * | | | | | Images on public sharing get downscaled to increase use experience - this ↵ | Thomas Müller | 2014-05-02 | 5 | -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 transifex | Jenkins for ownCloud | 2014-05-05 | 5 | -0/+23 |
| | | | | | | | |||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-04 | 79 | -37/+194 |
| | | | | | | | |||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-03 | 34 | -35/+27 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #8377 from youngguns-nl/issue_8376 | Vincent Petry | 2014-05-02 | 1 | -1/+9 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | RecursiveDirectoryIterator does not work on NFS | ||||
| | * | | | | | refs #8376; spaces=>tabs | Sjors van der Pluijm | 2014-04-29 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | refs #8376; added comment and applied patch on other files | Sjors van der Pluijm | 2014-04-28 | 1 | -1/+9 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #8400 from owncloud/download-button-public-folder | Thomas Müller | 2014-05-02 | 3 | -7/+14 |
| |\ \ \ \ \ | | | | | | | | | | | | | reintroduce download button on public shares | ||||
| | * | | | | | disable download button if zip download is disabled | Thomas Müller | 2014-05-02 | 2 | -1/+4 |
| | | | | | | | |||||
| | * | | | | | fix position and look of public download button | Jan-Christoph Borchardt | 2014-05-02 | 1 | -3/+0 |
| | | | | | | | |||||
| | * | | | | | remove file name from upper right button | Thomas Müller | 2014-04-29 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | reintroduce download button on public shares | Thomas Müller | 2014-04-29 | 1 | -3/+10 |
| | | | | | | | |||||
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-02 | 3 | -5/+35 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #8415 from owncloud/sharing_fix_rename | Björn Schießle | 2014-05-01 | 1 | -4/+7 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | [sharing] return the new name if a mount point was renamed | ||||
| | * | | | | | | return the new name if a mount point was renamed | Bjoern Schiessle | 2014-04-30 | 1 | -4/+7 |
| | | | | | | | | |||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-01 | 18 | -0/+128 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #8412 from owncloud/sharing_fix_part_file_rename | Lukas Reschke | 2014-04-30 | 3 | -9/+98 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | [sharing] fix rename of part files | ||||
| | * | | | | | | get the correct owner path for part files | Bjoern Schiessle | 2014-04-30 | 2 | -1/+92 |
| | | | | | | | | |||||
| | * | | | | | | only update the values which really changed | Bjoern Schiessle | 2014-04-30 | 1 | -8/+6 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #8404 from owncloud/fix-checkboxes | Thomas Müller | 2014-04-30 | 1 | -5/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed too generic checkbox and link selectors | ||||
| | * | | | | | | Fixed too generic checkbox and link selectors | Vincent Petry | 2014-04-29 | 1 | -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-spinner | Morris Jobke | 2014-04-30 | 2 | -0/+17 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Show spinner for all files when deleting all | ||||
| | * | | | | | | Show spinner for all files when deleting all | Vincent Petry | 2014-04-29 | 2 | -0/+17 |
| | |/ / / / / | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |