summaryrefslogtreecommitdiffstats
Commit message (Expand)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
|\
| * 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
| * make the versions and encryption app aware of the copy operationBjoern Schiessle2014-10-145-16/+67
|/
* 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
* Show a proper error message when trying to scan the filesystem for a non exis...Robin Appelman2014-10-101-1/+5
* Don't keep the full info of all children in memoryRobin Appelman2014-10-101-7/+12
* Backport of #10527Arthur Schiwon2014-10-092-12/+32
* Merge pull request #8307 from owncloud/case_insensitive_search_oracle_stable6Lukas Reschke2014-10-032-3/+28
|\
| * fix case insensitive search on oracle and postgresqlJörn Friedrich Dreyer2014-09-292-3/+28
* | Merge pull request #11153 from owncloud/parallel-upload-stable6Lukas Reschke2014-10-011-1/+15
|\ \ | |/ |/|
| * use session_write_close() because the Session class has no close() yet in thi...Thomas Müller2014-09-181-1/+1
| * close the session for all DAV calls right after authentication - no need to w...Thomas Müller2014-09-181-1/+15
* | Clarify possible preview providers for type OfficeLukas Reschke2014-09-252-2/+10
* | Merge pull request #11246 from owncloud/backport-11211-stable6Morris Jobke2014-09-237-79/+56
|\ \
| * \ Merge branch 'stable6' into backport-11211-stable6Lukas Reschke2014-09-232-7/+10
| |\ \
| * | | Add a configuration switch for enabled preview mimetypesLukas Reschke2014-09-237-79/+56
* | | | Reenable file proxy when renaming between mount pointsVincent Petry2014-09-231-1/+2
| |/ / |/| |
* | | 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
* | Merge pull request #11207 from owncloud/enc_create_backup_on_recovery_oc6Lukas Reschke2014-09-223-0/+97
|\ \ | |/ |/|
| * create backup from all keys before recoveryBjoern Schiessle2014-09-223-0/+97
|/
* Revert "Reword the description"Lukas Reschke2014-09-162-3/+3
* Reword the descriptionLukas Reschke2014-09-162-3/+3
* Merge pull request #11025 from owncloud/nojavascriptThomas Müller2014-09-124-0/+34
|\
| * 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 behaviorRobin Appelman2014-08-071-1/+1
* | Merge pull request #10645 from owncloud/backport_7728Thomas Müller2014-09-033-12/+65
|\ \
| * | 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
* | | Merge pull request #10774 from owncloud/backport-getUserFolderThomas Müller2014-09-031-2/+9
|\ \ \
| * | | Add optional user ID parameter for getUseFolderMorris Jobke2014-08-311-2/+9
|/ / /
* | | retrieve local users, groups and group members in a sorted wayArthur Schiwon2014-08-312-4/+4
* | | Merge pull request #10694 from owncloud/allow_empty_hostname_and_dots_in_serv...Thomas Müller2014-08-291-0/+14
|\ \ \
| * | | 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, introduce...Arthur Schiwon2014-08-261-1/+1
* | | | Escape error messagesLukas Reschke2014-08-281-4/+4
* | | | Merge pull request #10660 from owncloud/use_notification_to_show_error_on_new...Jörn Friedrich Dreyer2014-08-271-1/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | 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-01-03 05:48:45 +0000