summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | throw exception if file is to large for trash binBjoern Schiessle2014-07-143-6/+46
| | | | |
* | | | | append file extension to the temporary file which contains the downloaded ↵Thomas Müller2014-07-141-9/+4
| | | | | | | | | | | | | | | | | | | | archive - in case of zip files fileinfo doesn't seem to return anything reliable
* | | | | Merge pull request #9581 from owncloud/backport-9500blizzz2014-07-114-14/+85
|\ \ \ \ \ | |_|_|_|/ |/| | | | Backport of #9500 to stable6
| * | | | do not write to appconfig or preference tables if the value is unchangedArthur Schiwon2014-07-113-10/+85
| | | | |
| * | | | don't trigger update from checkPassword, it is already called by userExists, ↵Arthur Schiwon2014-07-101-4/+0
|/ / / / | | | | | | | | | | | | this is enough.
* | | | Merge pull request #9523 from owncloud/stable6-fix-9302-masterVincent Petry2014-07-095-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üller2014-07-085-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 storageChristopher T. Johnson2014-07-081-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 #9156Arthur Schiwon2014-07-048-12/+99
|/ /
* | Merge pull request #9250 from owncloud/enc_check_if_file_exists_oc6Björn Schießle2014-07-012-38/+237
|\ \ | | | | | | [encryption] check if file exists (OC6)
| * | improved error messageBjoern Schiessle2014-06-301-7/+8
| | |
| * | unit testsBjoern Schiessle2014-06-271-19/+192
| | |
| * | check if file exists before deleting keys, and add debug output for everyBjoern Schiessle2014-06-271-15/+40
| | | | | | | | | | | | delete operation
* | | Merge pull request #9251 from owncloud/enc_always_find_mount_pointVincent Petry2014-06-271-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 Schiessle2014-06-271-1/+2
|/ / | | | | | | point
* | Merge pull request #9173 from owncloud/enc_always_use_oc_filesview_oc6Björn Schießle2014-06-265-70/+89
|\ \ | | | | | | [encryption] always use oc filesview, backport for OC6
| * | always use a \OC\Files\ViewBjoern Schiessle2014-06-234-64/+58
| | |
| * | always use oc filesystem for rename operationBjoern Schiessle2014-06-232-10/+35
| | |
* | | Merge pull request #9219 from owncloud/stable6-trashwarningMorris Jobke2014-06-262-0/+6
|\ \ \ | | | | | | | | [stable6] Fix trashbin warnings in logs
| * | | Do not retrieve storage stats for trash binVincent Petry2014-06-261-0/+5
| | | |
| * | | Remove etag warning in trashbinVincent Petry2014-06-261-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_oc6Morris Jobke2014-06-251-1/+1
|\ \ \ \ | | | | | | | | | | always use '/' as dir seperator
| * | | | always use '/' as dir seperatorBjoern Schiessle2014-06-241-1/+1
|/ / / /
* | / / 6.0.4v6.0.4Frank Karlitschek2014-06-241-2/+2
| |/ / |/| |
* | | Merge pull request #9075 from owncloud/autosetup-trusteddomainsFrank Karlitschek2014-06-201-1/+7
|\ \ \ | | | | | | | | trusted domains shall not be ignored on autosetup
| * | | trusted domains shall not be ignored on autosetupArthur Schiwon2014-06-171-1/+7
| | |/ | |/|
* / | Backport subset of #4179, re-established Oracle compatibility for LDAPArthur Schiwon2014-06-202-3/+4
|/ /
* | Merge pull request #9002 from owncloud/ldap_wizard_pagedsearchblizzz2014-06-174-63/+135
|\ \ | | | | | | LDAP Wizard: get correct total no of users, groups and complete list of groups on big setups
| * | remove unused vars; increase scrutinizer happinessArthur Schiwon2014-06-161-2/+1
| | |
| * | simplify two methods a bit, because they are not used for group search anymoreArthur Schiwon2014-06-162-13/+6
| | |
| * | make all this work in an early configuration state in the wizard by marking ↵Arthur Schiwon2014-06-162-1/+15
| | | | | | | | | | | | the config active and ignoring the validation state.
| * | Wizard: get really all groups from LDAP by power of Paged SearchArthur Schiwon2014-06-161-5/+55
| | |
| * | fix PHPdocArthur Schiwon2014-06-161-2/+2
| | |
| * | consolidate requirement checkArthur Schiwon2014-06-161-22/+21
| | |
| * | LDAP Wizard: count users and groups with the power of paged searchArthur Schiwon2014-06-161-26/+30
| | |
| * | add method to count groups on LDAPArthur Schiwon2014-06-161-0/+12
| | |
| * | fix PHPdocArthur Schiwon2014-06-161-2/+3
| | |
* | | 6.0.4 beta 1v6.0.4beta1Frank Karlitschek2014-06-171-2/+2
|/ /
* | Merge pull request #8623 from owncloud/fix-8457blizzz2014-06-162-3/+81
|\ \ | | | | | | LDAP: fix possible infinite loop, that causes hanging wizard, fixes #8457
| * | add unit test to make sure the infinite loop never comes backArthur Schiwon2014-05-161-1/+79
| | |
| * | set result entry identifier earlier, i.e. before a continue for the same ↵Arthur Schiwon2014-05-161-2/+2
| | | | | | | | | | | | level can happen. otherwise will always get the same value and we end up in an infinite loop
* | | Merge pull request #9033 from owncloud/validate-direLukas Reschke2014-06-161-5/+16
|\ \ \ | | | | | | | | Add deprecation notice to load* functions
| * | | Add deprecation notice to load* functionsLukas Reschke2014-06-141-5/+16
| | | | | | | | | | | | | | | | | | | | This functions are deprecated and/or removed since ownCloud 7. Additionally a issubdirectory check has been added here to prevent developers to use this function in a potentially insecure way. Please review @karlitschek and others. Backport to stable5 and master requested.
* | | | Merge pull request #9008 from owncloud/repair-parent-stable6Vincent Petry2014-06-163-43/+94
|\ \ \ \ | |/ / / |/| | | Repair broken parent link in the scanner - stable6
| * | | Fix unit testRobin Appelman2014-06-161-2/+2
| | | |
| * | | remove unused argumentRobin Appelman2014-06-121-4/+3
| | | |
| * | | add some commentsRobin Appelman2014-06-121-0/+2
| | | |
| * | | Repair broken parent link in the scannerRobin Appelman2014-06-122-37/+87
| | |/ | |/|
* | | Merge pull request #9015 from owncloud/stable6-downloadwithdisabledzipMorris Jobke2014-06-132-5/+14
|\ \ \ | | | | | | | | [stable6] Fix public download link when zip download is disabled
| * | | Fix public download link when zip download is disabledVincent Petry2014-06-122-5/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When zip download is disabled, the public download action defined in public.js is overridden by the one in fileactions.js because of the JS loading order. This quick fix prevents the override to happen when a download action is already defined. There are additional changes that were required to make the download action icon work when registered from the public page.