Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | login() must be called after getServerPublicHostKey(). | Andreas Fischer | 2014-07-18 | 1 | -5/+5 | |
|/ / / | ||||||
* | | | Merge pull request #9511 from owncloud/stable6-download-button-public-folder | Vincent Petry | 2014-07-15 | 4 | -6/+32 | |
|\ \ \ | | | | | | | | | [stable6] Bring back the download button public folder | |||||
| * | | | disable download button if zip download is disabled | Thomas Müller | 2014-07-08 | 2 | -0/+4 | |
| | | | | | | | | | | | | | | | | Backport of 6e75b37 | |||||
| * | | | fix position and look of public download button | Jan-Christoph Borchardt | 2014-07-08 | 2 | -7/+7 | |
| | | | | | | | | | | | | | | | | Backport of 899c7c0 from master | |||||
| * | | | remove unneeded header-right details styles | Jan-Christoph Borchardt | 2014-07-08 | 1 | -0/+15 | |
| | | | | | | | | | | | | | | | | Backport a280a69 | |||||
| * | | | remove file name from upper right button | Thomas Müller | 2014-07-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Backport of 003049e from master | |||||
| * | | | reintroduce download button on public shares | Thomas Müller | 2014-07-08 | 1 | -3/+10 | |
| | | | | | | | | | | | | | | | | Backport of df32254 from master | |||||
* | | | | Merge pull request #9635 from owncloud/stable6-files_external_fix_readData | Vincent Petry | 2014-07-15 | 1 | -18/+18 | |
|\ \ \ \ | | | | | | | | | | | [stable6 backport] Permit personal mount points to be used for sharing | |||||
| * | | | | Permit personal mount points to be used for sharing | Robin McCorkell | 2014-07-15 | 1 | -18/+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()`. Backport of abfd7ec from master | |||||
* | | | | Merge pull request #9618 from owncloud/fix_8345 | Vincent Petry | 2014-07-15 | 3 | -6/+46 | |
|\ \ \ \ | | | | | | | | | | | throw exception if file is to large for trash bin | |||||
| * | | | | throw exception if file is to large for trash bin | Bjoern Schiessle | 2014-07-14 | 3 | -6/+46 | |
| | | | | | ||||||
* | | | | | append file extension to the temporary file which contains the downloaded ↵ | Thomas Müller | 2014-07-14 | 1 | -9/+4 | |
| | | | | | | | | | | | | | | | | | | | | archive - in case of zip files fileinfo doesn't seem to return anything reliable | |||||
* | | | | | Merge pull request #9581 from owncloud/backport-9500 | blizzz | 2014-07-11 | 4 | -14/+85 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Backport of #9500 to stable6 | |||||
| * | | | | do not write to appconfig or preference tables if the value is unchanged | Arthur Schiwon | 2014-07-11 | 3 | -10/+85 | |
| | | | | | ||||||
| * | | | | don't trigger update from checkPassword, it is already called by userExists, ↵ | Arthur Schiwon | 2014-07-10 | 1 | -4/+0 | |
|/ / / / | | | | | | | | | | | | | this is enough. | |||||
* | | | | Merge pull request #9523 from owncloud/stable6-fix-9302-master | Vincent Petry | 2014-07-09 | 5 | -223/+64 | |
|\ \ \ \ | | | | | | | | | | | [stable6] Upload abortion is now detected within the OC_Connector_Sabre_File::put... | |||||
| * | | | | Upload abortion is now detected within the OC_Connector_Sabre_File::put() | Thomas Müller | 2014-07-08 | 5 | -223/+64 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless Adding unit test testUploadAbort() Backport of ea269f0 from master | |||||
* | / / | Fix Signiture Does Not Match when mounting Amazon S3 external storage | Christopher T. Johnson | 2014-07-08 | 1 | -13/+17 | |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason the aws-sdk-php package does not caclulate the signiture correctly when accessing an object in a bucket with a name of '.'. When we are at the top of a S3 bucket there is a need(?) to have a directory name. Per standard Unix the name picked was '.' (dot or period). This choice exercises the aws-sdk bug. This fix is to add a field to the method to store the name to use instead of '.' which at this point is hard coded to '<root>'. We also add a private function 'cleanKey()' which will test for the '.' name and replace it with the variable. Finally all calls to manipulate objects where the path is not obviously not '.' are processed through cleanKey(). An example where we don't process through clean key would be 'Key' => $path.'/', Use correct relationship operator Per feed back use === instead of == use '/' instead of '<root>' | |||||
* | | | Backport of #9156 | Arthur Schiwon | 2014-07-04 | 8 | -12/+99 | |
|/ / | ||||||
* | | Merge pull request #9250 from owncloud/enc_check_if_file_exists_oc6 | Björn Schießle | 2014-07-01 | 2 | -38/+237 | |
|\ \ | | | | | | | [encryption] check if file exists (OC6) | |||||
| * | | improved error message | Bjoern Schiessle | 2014-06-30 | 1 | -7/+8 | |
| | | | ||||||
| * | | unit tests | Bjoern Schiessle | 2014-06-27 | 1 | -19/+192 | |
| | | | ||||||
| * | | check if file exists before deleting keys, and add debug output for every | Bjoern Schiessle | 2014-06-27 | 1 | -15/+40 | |
| | | | | | | | | | | | | delete operation | |||||
* | | | Merge pull request #9251 from owncloud/enc_always_find_mount_point | Vincent Petry | 2014-06-27 | 1 | -1/+2 | |
|\ \ \ | |/ / |/| | | [encryption] make sure that we always detect the system wide mount point | |||||
| * | | normalize path before comparison to make sure that we always find the mount ↵ | Bjoern Schiessle | 2014-06-27 | 1 | -1/+2 | |
|/ / | | | | | | | point | |||||
* | | Merge pull request #9173 from owncloud/enc_always_use_oc_filesview_oc6 | Björn Schießle | 2014-06-26 | 5 | -70/+89 | |
|\ \ | | | | | | | [encryption] always use oc filesview, backport for OC6 | |||||
| * | | always use a \OC\Files\View | Bjoern Schiessle | 2014-06-23 | 4 | -64/+58 | |
| | | | ||||||
| * | | always use oc filesystem for rename operation | Bjoern Schiessle | 2014-06-23 | 2 | -10/+35 | |
| | | | ||||||
* | | | Merge pull request #9219 from owncloud/stable6-trashwarning | Morris Jobke | 2014-06-26 | 2 | -0/+6 | |
|\ \ \ | | | | | | | | | [stable6] Fix trashbin warnings in logs | |||||
| * | | | Do not retrieve storage stats for trash bin | Vincent Petry | 2014-06-26 | 1 | -0/+5 | |
| | | | | ||||||
| * | | | Remove etag warning in trashbin | Vincent Petry | 2014-06-26 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | When previews are available, the etag attribute is used for the icon. But when none is set, a warning is shown. This fix uses the timestamp as a dummy etag. | |||||
* | | | | Merge pull request #9197 from owncloud/fix_dir_seperator_oc6 | Morris Jobke | 2014-06-25 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | always use '/' as dir seperator | |||||
| * | | | | always use '/' as dir seperator | Bjoern Schiessle | 2014-06-24 | 1 | -1/+1 | |
|/ / / / | ||||||
* | / / | 6.0.4v6.0.4 | Frank Karlitschek | 2014-06-24 | 1 | -2/+2 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #9075 from owncloud/autosetup-trusteddomains | Frank Karlitschek | 2014-06-20 | 1 | -1/+7 | |
|\ \ \ | | | | | | | | | trusted domains shall not be ignored on autosetup | |||||
| * | | | trusted domains shall not be ignored on autosetup | Arthur Schiwon | 2014-06-17 | 1 | -1/+7 | |
| | |/ | |/| | ||||||
* / | | Backport subset of #4179, re-established Oracle compatibility for LDAP | Arthur Schiwon | 2014-06-20 | 2 | -3/+4 | |
|/ / | ||||||
* | | Merge pull request #9002 from owncloud/ldap_wizard_pagedsearch | blizzz | 2014-06-17 | 4 | -63/+135 | |
|\ \ | | | | | | | LDAP Wizard: get correct total no of users, groups and complete list of groups on big setups | |||||
| * | | remove unused vars; increase scrutinizer happiness | Arthur Schiwon | 2014-06-16 | 1 | -2/+1 | |
| | | | ||||||
| * | | simplify two methods a bit, because they are not used for group search anymore | Arthur Schiwon | 2014-06-16 | 2 | -13/+6 | |
| | | | ||||||
| * | | make all this work in an early configuration state in the wizard by marking ↵ | Arthur Schiwon | 2014-06-16 | 2 | -1/+15 | |
| | | | | | | | | | | | | the config active and ignoring the validation state. | |||||
| * | | Wizard: get really all groups from LDAP by power of Paged Search | Arthur Schiwon | 2014-06-16 | 1 | -5/+55 | |
| | | | ||||||
| * | | fix PHPdoc | Arthur Schiwon | 2014-06-16 | 1 | -2/+2 | |
| | | | ||||||
| * | | consolidate requirement check | Arthur Schiwon | 2014-06-16 | 1 | -22/+21 | |
| | | | ||||||
| * | | LDAP Wizard: count users and groups with the power of paged search | Arthur Schiwon | 2014-06-16 | 1 | -26/+30 | |
| | | | ||||||
| * | | add method to count groups on LDAP | Arthur Schiwon | 2014-06-16 | 1 | -0/+12 | |
| | | | ||||||
| * | | fix PHPdoc | Arthur Schiwon | 2014-06-16 | 1 | -2/+3 | |
| | | | ||||||
* | | | 6.0.4 beta 1v6.0.4beta1 | Frank Karlitschek | 2014-06-17 | 1 | -2/+2 | |
|/ / | ||||||
* | | Merge pull request #8623 from owncloud/fix-8457 | blizzz | 2014-06-16 | 2 | -3/+81 | |
|\ \ | | | | | | | LDAP: fix possible infinite loop, that causes hanging wizard, fixes #8457 | |||||
| * | | add unit test to make sure the infinite loop never comes back | Arthur Schiwon | 2014-05-16 | 1 | -1/+79 | |
| | | |