summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* RC4v6.0.0RC4Frank Karlitschek2013-12-061-2/+2
|
* add test case for removing background jobs that are throwing exceptionsRobin Appelman2013-12-062-3/+59
|
* Dont use exceptions for the backgroundjob test casesRobin Appelman2013-12-062-35/+46
|
* remove background jobs if they are failingRobin Appelman2013-12-061-0/+1
|
* Catch exceptions from background jobs and log themRobin Appelman2013-12-064-9/+30
|
* Merge pull request #6225 from owncloud/stable6-backgroundscan-reuse-etagFrank Karlitschek2013-12-064-25/+104
|\ | | | | Stable6 backgroundscan reuse etag
| * get rid of failing test that don't cause additional downloadsRobin Appelman2013-12-063-25/+25
| |
| * extend test case for etag preservationRobin Appelman2013-12-061-2/+2
| |
| * reuse etags when doing a background scanRobin Appelman2013-12-062-1/+80
|/
* XSendfile and encryption don't work togetherBart Visscher2013-12-061-0/+3
| | | | The file on disk is encrypted, and not readable on client systems
* Don't try to encrypt a file when the temp file isn't createdBart Visscher2013-12-061-18/+21
|
* Users of getFolderContent are mostly interested in the unecrypted file sizeBart Visscher2013-12-061-0/+4
|
* correctly propagate the return value of ldap_set_optionroot2013-12-061-1/+1
| | | | | | otherwise LDAP_OPT_REFERRALS won't be set to 0 and in turn active directory paging will stop working (Operations error on ldap_control_paged_result_response)
* set unencrypted_size to 0 after decryption... so that the unencrypted_size ↵Bjoern Schiessle2013-12-061-1/+1
| | | | gets re-calculated if encryption was enabled again
* add a optional parameter to skip check for expired files, this is necessary ↵Bjoern Schiessle2013-12-061-14/+21
| | | | to find out to whom a file was shared after it was expired.
* get owner from share item, if we expire a share while the user updates his ↵Bjoern Schiessle2013-12-061-2/+6
| | | | /Shared folder than the owner is different from the currently logged in user
* it is not possible to unshare filesBjoern Schiessle2013-12-061-14/+5
|
* Merge pull request #6208 from ↵Björn Schießle2013-12-063-28/+42
|\ | | | | | | | | owncloud/enc_only_create_new_key_if_no_other_key_exists [Encryption] Only create new key if no other key exists
| * fix typoBjoern Schiessle2013-12-051-1/+1
| |
| * only create new key on password change if a recovery key exists or if the ↵Bjoern Schiessle2013-12-051-23/+28
| | | | | | | | user don't have any private/public keys
| * show change password form if key couldn't be decryptedBjoern Schiessle2013-12-051-1/+1
| |
| * add method to check if users private/public key existsBjoern Schiessle2013-12-051-4/+13
| |
* | Fix user's displayName being overwritten by (old) cookieNico Kaiser2013-12-051-1/+0
|/
* fix appearance of error message - .errors is outdatedMorris Jobke2013-12-051-5/+6
|
* ownCloud 6 RC3v6.0.0RC3Frank Karlitschek2013-12-051-2/+2
|
* Merge pull request #6180 from owncloud/fix_6143Vincent Petry2013-12-042-3/+22
|\ | | | | fixes checkboxes in Advanced Tab don't save unchecked state anymore, #6143
| * LDAP Wizard: avoid a manually deactivated LDAP configuration is enabled by ↵Arthur Schiwon2013-12-041-3/+10
| | | | | | | | just opening the admin page
| * LDAP: make unsetting checkboxes from Advanced tab work again, fixes #6143Arthur Schiwon2013-12-041-0/+12
| |
* | config switch to disable auto expire for the trash binBjoern Schiessle2013-12-042-3/+11
| |
* | Revert "Adjust files_encryption requirements to the new core requirement ↵Morris Jobke2013-12-041-1/+8
| | | | | | | | | | | | (PHP 5.3.8)." This reverts commit efbf18652c6eef42e2ca2fda3572d74d2be022dd.
* | Added unit test for the test() methodVincent Petry2013-12-042-0/+15
|/ | | | This is to make sure that method isn't broken
* Merge pull request #6175 from owncloud/fix_6142Thomas Müller2013-12-044-6/+60
|\ | | | | LDAP Wizard: make sure auto-detected suggestions are really applied initially, fixes #6142
| * LDAP Wizard: don't generate filter when not allowedArthur Schiwon2013-12-031-1/+3
| |
| * some equals are more equal than other equalsArthur Schiwon2013-12-031-2/+2
| |
| * LDAP Wizard: return correct varArthur Schiwon2013-12-031-1/+1
| |
| * LDAP Wizard: make sure auto-detected suggestions are really applied ↵Arthur Schiwon2013-12-031-3/+54
| | | | | | | | initially. Also make initial filter compilation and user counting robust against race conditions.
| * LDAP: on testing configuration, set active property to true, otherwise ↵Arthur Schiwon2013-12-031-0/+2
| | | | | | | | inactive connections cannot be tested properly
| * LDAP: set default value for login filter to empty, otherwise the wizard ↵Arthur Schiwon2013-12-031-1/+1
| | | | | | | | signals completed configuration too early when it might be not correct, i.e. login won't work
| * LDAP Wizard: don't send ldap_tls change back to the interface as the element ↵Arthur Schiwon2013-12-021-1/+0
| | | | | | | | was removed, for it is detected fully automatically. Resolves an JS error and thus an ever-spinning spinner
* | lower required php version to 5.3.3Frank Karlitschek2013-12-043-2/+25
| |
* | fixing PHPDoc and spellingThomas Mueller2013-12-032-6/+8
| |
* | Use getLastError() everywhere.Andreas Fischer2013-12-031-10/+10
| |
* | Add getLastError()Andreas Fischer2013-12-031-3/+20
| |
* | No function as oci_last_error. It's oci_error.Andreas Fischer2013-12-031-1/+1
| |
* | There is no property such as dbusername. It's 'dbuser'.Andreas Fischer2013-12-031-3/+3
| |
* | Correct property name. It's 'dbpassword', with the 'db' prefix.Andreas Fischer2013-12-031-1/+1
| |
* | Correct property name. It's just 'tableprefix', without the 'db' prefix.Andreas Fischer2013-12-031-1/+1
| |
* | fix time input field properly, detailsJan-Christoph Borchardt2013-12-031-2/+2
| |
* | fix public page - gallery view issuesMorris Jobke2013-12-032-3/+3
| |
* | fix trashbin and pbulic page controlsMorris Jobke2013-12-032-1/+5
| |