summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into fix-5388-mastertomneedham2013-12-11900-19907/+33355
|\
| * Merge pull request #6244 from owncloud/memcached-connectivity-testsThomas Müller2013-12-101-3/+9
| |\ | | | | | | Only run memcached tests if server is available.
| | * Ensure memcached extension is there before attempting to create an instance.Andreas Fischer2013-12-091-4/+3
| | |
| | * Only run memcached tests if server is available.Andreas Fischer2013-12-091-0/+7
| | |
| * | Merge pull request #5968 from owncloud/legacy-popup-fixesVincent Petry2013-12-101-3/+11
| |\ \ | | | | | | | | fix the legacy popup to make calendar settings look nicer
| | * | fix shadow size and arrow positionJan-Christoph Borchardt2013-12-091-2/+2
| | | |
| | * | fix the legacy popup to make calendar settings look nicerJan-Christoph Borchardt2013-11-201-2/+10
| | | |
| * | | Merge pull request #6246 from owncloud/memcached-config-sampleAndreas Fischer2013-12-091-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document memcached settings in config.sample.php * owncloud/memcached-config-sample: Document memcached settings in config.sample.php
| | * | | Document memcached settings in config.sample.phpAndreas Fischer2013-12-091-0/+3
| | | |/ | | |/|
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-0946-92/+3380
| | | |
| * | | Merge pull request #6231 from owncloud/fix-plural-l10nblizzz2013-12-095-5/+5
| |\ \ \ | | |/ / | |/| | fix plural translation - fixes #6226
| | * | fix wrong test data in l10nMorris Jobke2013-12-073-3/+3
| | | |
| | * | fix plural translation - fixes #6226Morris Jobke2013-12-072-2/+2
| | | |
| * | | [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
| |\ \ \ | | |/ / | |/| | Add overlay noscript message to fix #6032
| | * | 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
| |\ \ \ | | | | | | | | | | Remove background jobs that are giving errors
| | * | | 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
| |\ \ \ \ | | | | | | | | | | | | reuse etags when doing a background scan
| | * \ \ \ 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
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 21:29:26 +0000