summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 6.0.6 RC1v6.0.6RC1Frank Karlitschek2014-10-161-2/+2
|
* Merge pull request #11561 from owncloud/stable6-enc-webdavcopywithencryptionfixVincent Petry2014-10-156-46/+168
|\ | | | | [stable6] add support for webdav copy to the encryption and versions app
| * make sure that we always find all versionsBjoern Schiessle2014-10-142-23/+37
| |
| * add unit test for rename and copy operationBjoern Schiessle2014-10-143-9/+66
| | | | | | | | | | | | Conflicts: apps/files_versions/appinfo/app.php apps/files_versions/tests/versions.php
| * make the versions and encryption app aware of the copy operationBjoern Schiessle2014-10-145-16/+67
|/ | | | | | Conflicts: apps/files_encryption/hooks/hooks.php apps/files_versions/appinfo/app.php
* force loading of encryption appLukas Reschke2014-10-131-0/+3
|
* Prevent button click when enter key is pressed in LDAP wizardVincent Petry2014-10-103-4/+4
| | | | | | | | | | Pressing enter in the LDAP wizard will trigger a click on the first button. In the main page it would trigger the delete dialog, which is quite inconvenient. Added a type attribute to suppress this behavior. Backport of bb424802c8f6e8fd0e7fbe28e000400a5b0660f3 from master
* Show a proper error message when trying to scan the filesystem for a non ↵Robin Appelman2014-10-101-1/+5
| | | | | | existing user Backport of e8280c80da52399594ba116ef78bddf16b9e7f25 from master
* Don't keep the full info of all children in memoryRobin Appelman2014-10-101-7/+12
| | | | Backport of f88021dbbc3b53e4a1460a79185835770514722e from master
* Backport of #10527Arthur Schiwon2014-10-092-12/+32
| | | | | | | | | | | | | | | | properly cancel a Paginated Results operation in order to avoid protocol errors, fixes #10526 abandon ongoing paged search before starting a new one abandond paged search only if PHP supports them init a new paged search on read operations to satisfy OpenLDAP make scrutinizer happy, very minor changes Conflicts: apps/user_ldap/lib/access.php apps/user_ldap/lib/ildapwrapper.php
* Merge pull request #8307 from owncloud/case_insensitive_search_oracle_stable6Lukas Reschke2014-10-032-3/+28
|\ | | | | on oracle use regex_like to make filename search case insensitive
| * fix case insensitive search on oracle and postgresqlJörn Friedrich Dreyer2014-09-292-3/+28
| | | | | | | | | | | | on oracle use regex_like on postgres use ILIKE add unit test to check case insensitivity
* | Merge pull request #11153 from owncloud/parallel-upload-stable6Lukas Reschke2014-10-011-1/+15
|\ \ | |/ |/| close the session for all DAV calls right after authentication - no need...
| * use session_write_close() because the Session class has no close() yet in ↵Thomas Müller2014-09-181-1/+1
| | | | | | | | this version
| * close the session for all DAV calls right after authentication - no need to ↵Thomas Müller2014-09-181-1/+15
| | | | | | | | write to the session afterwards
* | Clarify possible preview providers for type OfficeLukas Reschke2014-09-252-2/+10
| | | | | | | | | | | | | | a Conflicts: lib/private/preview.php
* | Merge pull request #11246 from owncloud/backport-11211-stable6Morris Jobke2014-09-237-79/+56
|\ \ | | | | | | Add a configuration switch for enabled preview mimetypes
| * \ Merge branch 'stable6' into backport-11211-stable6Lukas Reschke2014-09-232-7/+10
| |\ \ | | | | | | | | | | | | | | | | Conflicts: config/config.sample.php
| * | | Add a configuration switch for enabled preview mimetypesLukas Reschke2014-09-237-79/+56
| | | | | | | | | | | | | | | | Backport of https://github.com/owncloud/core/pull/11211 to stable6
* | | | Reenable file proxy when renaming between mount pointsVincent Petry2014-09-231-1/+2
| |/ / |/| | | | | | | | | | | | | | | | | | | | When moving a folder into another mount point, $renamedFiles is empty because that goes over a different mechanism. In such case, this fix makes sure that the file proxy is reenable to avoid breaking the subsequent files that are being moved.
* | | Use non-empty defaultsVictor Dubiniuk2014-09-231-1/+1
| | |
* | | first check if a private key exists, if not it is always a recovery szenarioBjoern Schiessle2014-09-231-6/+9
|/ /
* | Added extra check to avoid deleting key foldersVincent Petry2014-09-221-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a delete operation is called twice in a row, it could happen that the first call already deleted the file. The second call would return an empty $ownerPath because the file does not exist. That empty $ownerPath would run the key deletion operation on the wrong path. This fix adds checks in many places to make sure we don't use $ownerPath when it's empty or null. Backport of 8aca127e52f965871bea82cb27c6ea103baf34bb from master
* | Merge pull request #11207 from owncloud/enc_create_backup_on_recovery_oc6Lukas Reschke2014-09-223-0/+97
|\ \ | |/ |/| create backup from all keys before recovery (oc6 backport)
| * create backup from all keys before recoveryBjoern Schiessle2014-09-223-0/+97
|/
* Revert "Reword the description"Lukas Reschke2014-09-162-3/+3
| | | | This reverts commit 16c5925155bfd6c7cc35745b233b0739fb513f51.
* Reword the descriptionLukas Reschke2014-09-162-3/+3
| | | | | | The old one was just horrible wrong. Conflicts: config/config.sample.php
* Merge pull request #11025 from owncloud/nojavascriptThomas Müller2014-09-124-0/+34
|\ | | | | introduce no-javascript message, manual backport of #6202 and #10944
| * introduce no-javascript message, manual backport of #6202 and #10944, fix #10841Jan-Christoph Borchardt2014-09-114-0/+34
| |
* | Add displayname for adminstomneedham2014-09-111-2/+10
|/
* Merge pull request #10250 from owncloud/block-folder-upload-stable6Vincent Petry2014-09-031-1/+1
|\ | | | | Prevent folder upload causing unexpected behavior
| * Prevent folder upload causing unexpected behaviorRobin Appelman2014-08-071-1/+1
| |
* | Merge pull request #10645 from owncloud/backport_7728Thomas Müller2014-09-033-12/+65
|\ \ | | | | | | Backport 7728
| * | unit tests for specific image type output addedThomas Müller2014-08-262-3/+28
| | |
| * | excerpt code changes from 79ba930ef90d3e54c02f62c43f61c190e11fb4ecGeorg Ehrke2014-08-261-4/+1
| | |
| * | OC_Image::_output() - throw exception instead of falling back to pngGeorg Ehrke2014-08-261-1/+1
| | |
| * | remove image/pjpeg from OC_Image::_outputGeorg Ehrke2014-08-261-1/+0
| | |
| * | don't change mimetype of whole image objectGeorg Ehrke2014-08-261-6/+6
| | |
| * | always output a pngGeorg Ehrke2014-08-261-1/+1
| | |
| * | make it possible to influence output type of \OC_ImageGeorg Ehrke2014-08-261-8/+40
| | | | | | | | | | | | | | | Conflicts: lib/private/image.php
* | | Merge pull request #10774 from owncloud/backport-getUserFolderThomas Müller2014-09-031-2/+9
|\ \ \ | | | | | | | | Add optional user ID parameter for getUseFolder
| * | | Add optional user ID parameter for getUseFolderMorris Jobke2014-08-311-2/+9
|/ / / | | | | | | | | | | | | Conflicts: lib/private/server.php
* | | retrieve local users, groups and group members in a sorted wayArthur Schiwon2014-08-312-4/+4
| | |
* | | Merge pull request #10694 from ↵Thomas Müller2014-08-291-0/+14
|\ \ \ | | | | | | | | | | | | | | | | owncloud/allow_empty_hostname_and_dots_in_service_name_for_oracle_autosetup allow empty hostname and dots in service name for oracle autosetup
| * | | allow empty hostname and dots in service name for oracle autosetupJörn Friedrich Dreyer2014-08-281-0/+14
|/ / /
* | | Merge pull request #10631 from owncloud/fixWizardTest_stable6blizzz2014-08-281-1/+1
|\ \ \ | | | | | | | | fix wizard test, adjust to changed parameters of the tested method, intr...
| * | | fix wizard test, adjust to changed parameters of the tested method, ↵Arthur Schiwon2014-08-261-1/+1
| | | | | | | | | | | | | | | | introduced by 9caa354cfc1f73159f335646ca89be4db72b125e
* | | | Escape error messagesLukas Reschke2014-08-281-4/+4
| | | |
* | | | Merge pull request #10660 from ↵Jörn Friedrich Dreyer2014-08-271-1/+5
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | owncloud/use_notification_to_show_error_on_new_via_web_stable6 use notification to show error on new via web
| * | | use notification to shw error on new via webJörn Friedrich Dreyer2014-08-271-1/+5
|/ / /
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-03 21:44:31 +0000