summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5814 from owncloud/add-indexesFrank Karlitschek2013-11-151-0/+30
|\
| * Add some more indexes to tables to improve db queriesBart Visscher2013-11-111-0/+30
* | Merge pull request #5700 from owncloud/ldapWizSetDisplayNamesThomas Müller2013-11-151-0/+13
|\ \
| * | LDAP Wizard: do not forget to set display name attributes for user and group,...Arthur Schiwon2013-11-051-0/+13
* | | Merge pull request #5813 from owncloud/fix-4736-masterThomas Müller2013-11-152-3/+3
|\ \ \
| * | | fix DB schema test - no default valueMorris Jobke2013-11-121-2/+2
| * | | Don't set a default value when there isn't a default specifiedBart Visscher2013-11-111-1/+1
| | |/ | |/|
* | | Merge pull request #5767 from owncloud/moviepreviewfallbackMorris Jobke2013-11-141-12/+48
|\ \ \
| * \ \ Merge branch 'master' into moviepreviewfallbackThomas Müller2013-11-14535-4152/+8674
| |\ \ \
| * | | | Added missing escapingVincent Petry2013-11-111-1/+1
| * | | | Fixed undefined variable error when using avconvVincent Petry2013-11-101-0/+2
| * | | | Fixed the rebellous space, replaced with a tabVincent Petry2013-11-081-1/+1
| * | | | Added ffmpeg fallback when avconv is not availableVincent Petry2013-11-081-11/+45
* | | | | Merge pull request #5867 from owncloud/users-groupadmindropdownMorris Jobke2013-11-142-2/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Added min-height in case of empty multi-selectVincent Petry2013-11-141-0/+1
| * | | | Fixed multiselect to not set the button's height on itself after selectVincent Petry2013-11-141-2/+0
* | | | | Merge pull request #5824 from owncloud/fix-publicshare-non-existingThomas Müller2013-11-141-1/+1
|\ \ \ \ \
| * | | | | Fix fatal error when trying to open a non existing public linkRobin Appelman2013-11-121-1/+1
* | | | | | Merge pull request #5862 from owncloud/files-singledotdirsThomas Müller2013-11-144-6/+76
|\ \ \ \ \ \
| * | | | | | Added missing test with leading backslashVincent Petry2013-11-141-0/+2
| * | | | | | Files app backend now normalizes paths before rendering templatesVincent Petry2013-11-142-2/+3
| * | | | | | Fixed normalizePath() to strip out single dot dirsVincent Petry2013-11-142-4/+71
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5850 from owncloud/oc_api_testsThomas Müller2013-11-142-17/+174
|\ \ \ \ \ \
| * | | | | | make use of data providersThomas Müller2013-11-141-111/+80
| * | | | | | Merge multiple failed third party responses when returning the resulttomneedham2013-11-141-3/+10
| * | | | | | Merge multiple shipped failures before responding.tomneedham2013-11-141-2/+10
| * | | | | | Return failed shipped responses over succedded shipped responsestomneedham2013-11-141-3/+3
| * | | | | | Fix type in unit testtomneedham2013-11-141-1/+1
| * | | | | | Return result object when only one successful response is returnedtomneedham2013-11-141-2/+2
| * | | | | | Update lib/private/api.php after merge conflicttomneedham2013-11-141-1/+1
| * | | | | | Merge branch 'ocs_api_fix_success_code' into oc_api_teststomneedham2013-11-141-2/+13
| |\ \ \ \ \ \
| | * | | | | | Pick any none 100 status code before defaulting to 100Tom Needham2013-11-131-2/+13
| * | | | | | | Merge branch 'master' into oc_api_teststomneedham2013-11-1425-217/+531
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Add tests for OC_API::mergeResponses()tomneedham2013-11-141-0/+159
| * | | | | | | Remove OC_App dependancy from OC_API::mergeResponses()tomneedham2013-11-131-9/+12
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #5214 from owncloud/no_extra_slashesFrank Karlitschek2013-11-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Don't double-slash filenames at the root.ringmaster2013-10-081-1/+1
* | | | | | | | Merge pull request #5827 from owncloud/avoid_preview_errorsThomas Müller2013-11-145-7/+12
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Use dedicated OC_Image loader methodsThomas Tanghus2013-11-135-7/+12
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'master' of https://github.com/owncloud/corev6.0.0beta4Frank Karlitschek2013-11-1317-140/+397
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #5805 from owncloud/shared-storage-copy-folderlistFrank Karlitschek2013-11-131-59/+47
| |\ \ \ \ \ \ \
| | * | | | | | | Use View::copy and View::rename when copying or renaming files in the shared ...Robin Appelman2013-11-111-59/+47
| * | | | | | | | Merge pull request #5806 from owncloud/styles-fix-external_storageFrank Karlitschek2013-11-132-0/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix spacing issue for checkboxes, vertically center checkboxes on personal pageMorris Jobke2013-11-112-0/+9
| | |/ / / / / / /
| * | | | | | | | Merge pull request #5809 from owncloud/fix5753Morris Jobke2013-11-135-53/+35
| |\ \ \ \ \ \ \ \
| | * | | | | | | | LDAP Wizard: make UI behaviour more consistent and more pleasant when determi...Arthur Schiwon2013-11-112-7/+6
| | * | | | | | | | LDAP Wizard: remove ugly whitespace where it should not beArthur Schiwon2013-11-111-2/+1
| | * | | | | | | | LDAP Wizard: determine port without credentials. don't hide the port input fieldArthur Schiwon2013-11-113-13/+12
| | * | | | | | | | LDAP Wizard: improve check for Agent DN and CredentialsArthur Schiwon2013-11-111-26/+16
| | * | | | | | | | LDAP Wizard: keep Base DN always visibleArthur Schiwon2013-11-082-6/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-22 04:35:09 +0000