summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-12-07275-4625/+4977
* Merge pull request #6202 from owncloud/fix_6032_altMorris Jobke2013-12-073-0/+34
|\
| * fix IE8 transparent backgroundMorris Jobke2013-12-071-0/+5
| * Remove reference to ownCloud.ringmaster2013-12-051-1/+1
| * Link to enable-javascript.comringmaster2013-12-052-1/+8
| * Make noscript message translatableringmaster2013-12-051-1/+1
| * Move message up 10%ringmaster2013-12-051-1/+1
| * Add overlay noscript message to fix #6032ringmaster2013-12-052-0/+22
* | Merge pull request #6150 from owncloud/backgroundjob-log-exceptionblizzz2013-12-068-47/+136
|\ \
| * | add test case for removing background jobs that are throwing exceptionsRobin Appelman2013-12-052-3/+59
| * | Dont use exceptions for the backgroundjob test casesRobin Appelman2013-12-042-35/+46
| * | remove background jobs if they are failingRobin Appelman2013-12-021-0/+1
| * | Catch exceptions from background jobs and log themRobin Appelman2013-12-024-9/+30
* | | Merge pull request #6201 from owncloud/backgroundscan-reuse-etagVincent Petry2013-12-064-25/+104
|\ \ \
| * \ \ Merge branch 'master' into backgroundscan-reuse-etagRobin Appelman2013-12-06205-3639/+4894
| |\ \ \
| * | | | 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-052-1/+80
* | | | | Merge pull request #6220 from owncloud/debug_oracle_errorsBjörn Schießle2013-12-063-18/+28
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | XSendfile and encryption don't work togetherBart Visscher2013-12-061-0/+3
| * | | | 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_optionroot2013-12-061-1/+1
| | |/ / / | |/| | |
* | | | | 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... so that the unencrypted_size ge...Bjoern Schiessle2013-12-061-1/+1
|/ / / /
* | | | Merge pull request #6213 from owncloud/fix-full-name-editVincent Petry2013-12-061-1/+4
|\ \ \ \
| * | | | parent().parent() -> closest()Morris Jobke2013-12-061-1/+1
| * | | | Fix full name edit for repetive editMorris Jobke2013-12-051-1/+4
* | | | | Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expireBjörn Schießle2013-12-062-16/+27
|\ \ \ \ \
| * | | | | add a optional parameter to skip check for expired files, this is necessary t...Bjoern Schiessle2013-12-051-14/+21
| * | | | | get owner from share item, if we expire a share while the user updates his /S...Bjoern Schiessle2013-12-051-2/+6
* | | | | | Merge pull request #6211 from owncloud/fix-5865Morris Jobke2013-12-061-6/+7
|\ \ \ \ \ \
| * | | | | | 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 use...Bjoern Schiessle2013-12-061-23/+28
* | | | | | 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
* | | | | Revert "Revert "Fix user's displayName being overwritten by (old) cookie""Morris Jobke2013-12-051-1/+0
* | | | | Merge pull request #6210 from owncloud/fix-5865pdessauw2013-12-051-13/+14
|\ \ \ \ \
| * | | | | 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
* | | | | Merge pull request #6199 from nicokaiser/fix-5306-masterMorris Jobke2013-12-051-1/+0
|\ \ \ \ \
| * | | | | 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 outdatedMorris Jobke2013-12-051-5/+6
|/ / / /
* | | | master is ownCloud 7 pre alpha nowFrank Karlitschek2013-12-051-2/+2
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-16 17:42:12 +0000