summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-09-1822-20/+52
|
* Merge pull request #19090 from owncloud/ext-priority-logicThomas Müller2015-09-173-3/+136
|\ | | | | Properly implement external mount priorities
| * Unit tests for UserGlobalStoragesService::getUniqueStorages()Robin McCorkell2015-09-161-2/+78
| |
| * Fix external storage priority logicRobin McCorkell2015-09-162-1/+58
| |
* | Merge pull request #19121 from owncloud/sidebar-design-detailsThomas Müller2015-09-174-36/+22
|\ \ | | | | | | fix Files sidebar layout of Versions and Sharing
| * | fix sidebar Sharing layout a bitJan-Christoph Borchardt2015-09-172-24/+16
| | |
| * | fix sidebar Versions layoutJan-Christoph Borchardt2015-09-172-12/+6
| | |
* | | Merge pull request #19123 from owncloud/listener-sabre-pluginThomas Müller2015-09-175-4/+69
|\ \ \ | | | | | | | | Add a Sabre plugin that emits an event
| * | | Do not "use" ServerJoas Schilling2015-09-171-3/+2
| | | |
| * | | Add a Sabre plugin that emits an event for appsJoas Schilling2015-09-175-4/+70
| | | |
* | | | Merge pull request #19131 from owncloud/versionsphp-php53Thomas Müller2015-09-171-2/+2
|\ \ \ \ | |/ / / |/| | | Make version.php PHP 5.3 compatible for the build scripts
| * | | Make version.php PHP 5.3 compatible for the build scriptsVincent Petry2015-09-171-2/+2
|/ / /
* | | Merge pull request #19046 from owncloud/issue-18924-throw-error-on-invalid-pageThomas Müller2015-09-172-30/+96
|\ \ \ | | | | | | | | Throw an error when the page count or perPage setting is invalid
| * | | Fix status codeJoas Schilling2015-09-152-18/+16
| | | |
| * | | Throw an error when the page count or perPage setting is invalidJoas Schilling2015-09-152-28/+96
| | | |
* | | | Merge pull request #19113 from ↵Thomas Müller2015-09-174-12/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/issue-19106-fix-singleuser-config-name-encryption Fix the singleuser config casing in new encryption code
| * | | | Fix the singleuser config casing in new encryption codeJoas Schilling2015-09-174-12/+12
| | | | |
* | | | | Merge pull request #19108 from owncloud/ext-smb-storageconfigThomas Müller2015-09-171-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | Correct manipulateStorageConfig parameter
| * | | | Correct manipulateStorageConfig parameterRobin McCorkell2015-09-171-0/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-17182-2328/+2084
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-17210-256/+370
|/ / / /
* | | | Merge pull request #17998 from owncloud/highres_avatarThomas Müller2015-09-161-2/+4
|\ \ \ \ | | | | | | | | | | Highres avatar in top bar
| * | | | Use srcset to select best avatar sizeRoeland Jago Douma2015-09-141-2/+4
| | | | | | | | | | | | | | | | | | | | * Allow the browser to select the best available avatar for the screen
* | | | | Merge pull request #18473 from owncloud/smb-workgroupThomas Müller2015-09-161-0/+12
|\ \ \ \ \ | | | | | | | | | | | | Allow domain to be specified for SMB
| * \ \ \ \ Merge branch 'master' into smb-workgroupRobin McCorkell2015-09-151570-14926/+27435
| |\ \ \ \ \
| * | | | | | Allow domain to be specified for SMBRobin McCorkell2015-08-211-0/+12
| | | | | | |
* | | | | | | Merge pull request #19093 from owncloud/increment-oci-docker-timeoutThomas Müller2015-09-161-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Increment timeout on Oracle startup
| * | | | | | | Increment timeout on Oracle startupThomas Müller2015-09-161-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #19086 from owncloud/restore-loadapp-autoloadThomas Müller2015-09-162-3/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Restore loadApp() autoload registration
| * | | | | | | Restore loadApp() autoload registrationRobin McCorkell2015-09-162-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also changes the autoloader validRoots into a hashmap to try and reduce duplicate entries
* | | | | | | | Merge pull request #19022 from owncloud/console-loader-validrootThomas Müller2015-09-161-1/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Register valid root for all installed apps in console
| * | | | | | | Register valid root for all installed apps in consoleRobin McCorkell2015-09-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | We need to use commands from apps that aren't enabled (so don't get loaded).
* | | | | | | | Merge pull request #18692 from fuhaoshih/patch-2Thomas Müller2015-09-161-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Update apps.css (Scroll more smoothly for Webkit browser)
| * | | | | | | Update apps.cssfuhaoshih2015-08-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Scroll more smoothly for Webkit browser(mobile).
* | | | | | | | Merge pull request #19048 from owncloud/details-iconThomas Müller2015-09-164-0/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | add details icon for file actions dropdown
| * | | | | | | | Add details icon for details menu itemVincent Petry2015-09-151-0/+1
| | | | | | | | |
| * | | | | | | | add details iconJan-Christoph Borchardt2015-09-153-0/+8
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #19066 from owncloud/fix-new-menu-mobileThomas Müller2015-09-161-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix new menu not showing on mobile, fix #18879
| * | | | | | | | fix new menu not showing on mobile, fix #18879Jan-Christoph Borchardt2015-09-161-0/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #19085 from owncloud/fix-new-accessibilityThomas Müller2015-09-161-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | fix accessibility of New button, use alt text instead of tooltip
| * | | | | | | | fix accessibility of New button, use alt text instead of tooltipJan-Christoph Borchardt2015-09-161-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #19055 from owncloud/navigation-text-opacityThomas Müller2015-09-161-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | adjust navigation text opacity, fix #19016
| * | | | | | | | adjust navigation text opacity, fix #19016Jan-Christoph Borchardt2015-09-161-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #19077 from ↵Thomas Müller2015-09-161-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | owncloud/check-maintenance-before-everything-else-master Check for maintenance mode first so we send the 503 instead of login…
| * | | | | | | Check for maintenance mode first so we send the 503 instead of login ↵Joas Schilling2015-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verification
* | | | | | | | Merge pull request #18185 from owncloud/share-dialog-files-sidebarThomas Müller2015-09-1621-2150/+3191
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Share dialog files sidebar
| * | | | | | | | Properly show sidebar when clicking on share buttonVincent Petry2015-09-161-0/+1
| | | | | | | | |
| * | | | | | | | Port share.css styles to the sidebar panelVincent Petry2015-09-163-15/+20
| | | | | | | | |
| * | | | | | | | Fix cruds button in share dialogVincent Petry2015-09-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only toggle the current row
| * | | | | | | | Removed obsolete testsVincent Petry2015-09-161-76/+2
| | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 05:26:18 +0000