aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Do not set single user in constructorJoas Schilling2015-09-184-8/+36
* Merge pull request #19088 from owncloud/fix-availability-intThomas Müller2015-09-181-1/+1
|\
| * Explicitly cast number to integerRobin McCorkell2015-09-161-1/+1
* | Merge pull request #19095 from owncloud/set-priority-to-1-for-maintenanceThomas Müller2015-09-181-1/+1
|\ \
| * | Make sure Maintenance is checked before auth and othersJoas Schilling2015-09-171-1/+1
* | | Merge pull request #19126 from owncloud/fix-19117Thomas Müller2015-09-181-6/+12
|\ \ \
| * | | fix missing checkboxes in share dialogHendrik Leppelsack2015-09-171-6/+12
* | | | [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
|\ \ \ \
| * | | | 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 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
|\ \ \ \ \ \
| * | | | | | 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 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
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | 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 owncloud/issue-19106-fix-singleuser-config-nam...Thomas Müller2015-09-174-12/+12
|\ \ \ \ \ \
| * | | | | | 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 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
|\ \ \ \ \ \
| * | | | | | Use srcset to select best avatar sizeRoeland Jago Douma2015-09-141-2/+4
* | | | | | | Merge pull request #18473 from owncloud/smb-workgroupThomas Müller2015-09-161-0/+12
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ 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 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 registrationRobin McCorkell2015-09-162-3/+7
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #19022 from owncloud/console-loader-validrootThomas Müller2015-09-161-1/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Register valid root for all installed apps in consoleRobin McCorkell2015-09-141-1/+3
* | | | | | | | Merge pull request #18692 from fuhaoshih/patch-2Thomas Müller2015-09-161-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Update apps.cssfuhaoshih2015-08-311-0/+1
* | | | | | | | Merge pull request #19048 from owncloud/details-iconThomas Müller2015-09-164-0/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 #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 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 #19016Jan-Christoph Borchardt2015-09-161-1/+1
| |/ / / / / / /