summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6220 from owncloud/debug_oracle_errorsBjörn Schießle2013-12-063-18/+28
|\ | | | | cherry-picks from #5884, just for debugging purpose
| * 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
| |
* | Merge pull request #6218 from leo-b/fix_ldap_setOption_returncodeblizzz2013-12-061-1/+1
|\ \ | | | | | | correctly propagate the return value of ldap_set_option
| * | 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)
* | | Merge pull request #6222 from owncloud/enc_reset_enc_file_sizeBjörn Schießle2013-12-061-1/+1
|\ \ \ | |_|/ |/| | set unencrypted_size to 0 after decryption
| * | 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
* | Merge pull request #6213 from owncloud/fix-full-name-editVincent Petry2013-12-061-1/+4
|\ \ | | | | | | Fix full name edit for repetitive edit
| * | parent().parent() -> closest()Morris Jobke2013-12-061-1/+1
| | |
| * | Fix full name edit for repetive editMorris Jobke2013-12-051-1/+4
| | | | | | | | | | | | | | | | | | | | | fixes #6212 fixes the data attributes after edit fixes markup to successfully re-edit display name
* | | Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expireBjörn Schießle2013-12-062-16/+27
|\ \ \ | | | | | | | | Sharing etag propagation on expire
| * | | add a optional parameter to skip check for expired files, this is necessary ↵Bjoern Schiessle2013-12-051-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-051-2/+6
| | | | | | | | | | | | | | | | /Shared folder than the owner is different from the currently logged in user
* | | | Merge pull request #6211 from owncloud/fix-5865Morris Jobke2013-12-061-6/+7
|\ \ \ \ | | | | | | | | | | Multiselect too slow patched
| * | | | Slide duration set to 200ms for multiselect (same duration as user menu)unknown2013-12-051-6/+7
| | |/ / | |/| |
* | | | it is not possible to unshare filesBjoern Schiessle2013-12-061-14/+5
| | | |
* | | | fix typoBjoern Schiessle2013-12-061-1/+1
| | | |
* | | | only create new key on password change if a recovery key exists or if the ↵Bjoern Schiessle2013-12-061-23/+28
| | | | | | | | | | | | | | | | user don't have any private/public keys
* | | | show change password form if key couldn't be decryptedBjoern Schiessle2013-12-061-1/+1
| | | |
* | | | add method to check if users private/public key existsBjoern Schiessle2013-12-061-4/+13
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-0585-195/+219
|/ / /
* | | Revert "Merge pull request #6210 from owncloud/fix-5865"Morris Jobke2013-12-051-14/+13
| | | | | | | | | | | | | | | This reverts commit f12363d90b31e03a9f2e95911dda54af728a2df6, reversing changes made to eba35d28cd974507f9e81e15430d3d33dbbd9973.
* | | Revert "Revert "Fix user's displayName being overwritten by (old) cookie""Morris Jobke2013-12-051-1/+0
| | | | | | | | | | | | This reverts commit eba35d28cd974507f9e81e15430d3d33dbbd9973.
* | | Merge pull request #6210 from owncloud/fix-5865pdessauw2013-12-051-13/+14
|\ \ \ | | | | | | | | #5865 Multiselect animation is too slow patch
| * | | Changed duration of slideDown, slideUp and fadeOut to 200msunknown2013-12-051-13/+14
|/ / /
* | | Revert "Fix user's displayName being overwritten by (old) cookie"Morris Jobke2013-12-051-0/+1
| | | | | | | | | | | | This reverts commit 2a7380cc21e56ce12b1a0e1460fabc978a83090b.
* | | Merge pull request #6199 from nicokaiser/fix-5306-masterMorris Jobke2013-12-051-1/+0
|\ \ \ | | | | | | | | Fix user's displayName being overwritten by (old) cookie. #3694
| * | | Fix user's displayName being overwritten by (old) cookieNico Kaiser2013-12-051-1/+0
| | | |
* | | | Merge pull request #6196 from owncloud/installation-error-cssMorris Jobke2013-12-051-5/+6
|\ \ \ \ | |/ / / |/| | | fix appearance of error message - .errors is outdated
| * | | fix appearance of error message - .errors is outdatedMorris Jobke2013-12-051-5/+6
|/ / /
* | | master is ownCloud 7 pre alpha nowFrank Karlitschek2013-12-051-2/+2
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-04125-3427/+4557
| | |
* | | LDAP Wizard: don't generate filter when not allowedArthur Schiwon2013-12-041-1/+3
| | |
* | | some equals are more equal than other equalsArthur Schiwon2013-12-041-2/+2
| | |
* | | LDAP Wizard: return correct varArthur Schiwon2013-12-041-1/+1
| | |
* | | LDAP Wizard: make sure auto-detected suggestions are really applied ↵Arthur Schiwon2013-12-041-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-041-0/+2
| | | | | | | | | | | | inactive connections cannot be tested properly
* | | LDAP: set default value for login filter to empty, otherwise the wizard ↵Arthur Schiwon2013-12-041-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-041-1/+0
| | | | | | | | | | | | was removed, for it is detected fully automatically. Resolves an JS error and thus an ever-spinning spinner
* | | 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
|/ /
* | Merge pull request #6181 from owncloud/auto_expire_trashBjörn Schießle2013-12-042-3/+11
|\ \ | |/ |/| config switch to disable auto expire for the trash bin
| * 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.
* | Merge pull request #6169 from owncloud/php_version_warningMorris Jobke2013-12-043-2/+25
|\ \ | |/ |/| PHP version warning
| * lower required php version to 5.3.3Frank Karlitschek2013-12-043-2/+25
| |
* | Merge pull request #6168 from owncloud/extstorage-testtestmethodFrank Karlitschek2013-12-032-0/+15
|\ \ | | | | | | Added unit test for the test() method of ext storage
| * | Added unit test for the test() methodVincent Petry2013-12-032-0/+15
| | | | | | | | | | | | This is to make sure that method isn't broken
* | | Merge pull request #6076 from owncloud/fix-6073-masterThomas Müller2013-12-032-24/+43
|\ \ \ | | | | | | | | Correct property name. It's just 'tableprefix', without the 'db' prefix.
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-03 06:25:48 +0000