summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
| |/ / / / / / /
* | | | | | | | Merge pull request #19077 from owncloud/check-maintenance-before-everything-e...Thomas Müller2015-09-161-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Check for maintenance mode first so we send the 503 instead of login verific...Joas Schilling2015-09-161-1/+1
* | | | | | | | Merge pull request #18185 from owncloud/share-dialog-files-sidebarThomas Müller2015-09-1621-2150/+3191
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
| * | | | | | | | Removed obsolete testsVincent Petry2015-09-161-76/+2
| * | | | | | | | Fix allow reshare for owner when sharing with self through groupVincent Petry2015-09-162-2/+22
| * | | | | | | | More unit tests for share dialogVincent Petry2015-09-167-408/+203
| * | | | | | | | Update JS unit tests for share dialog (WIP)Vincent Petry2015-09-1610-1172/+1217
| * | | | | | | | Remove unused/obsoleted OC.Share codeVincent Petry2015-09-161-424/+0
| * | | | | | | | Implement email autocomplete for link shareVincent Petry2015-09-161-0/+27
| * | | | | | | | Implement email share linkVincent Petry2015-09-162-2/+59
| * | | | | | | | Implement "notify by email" checkbox in share dialogVincent Petry2015-09-162-3/+40
| * | | | | | | | Clear field after adding userVincent Petry2015-09-161-0/+1
| * | | | | | | | Fix shares list eventsVincent Petry2015-09-163-31/+29
| * | | | | | | | Bring back the share icon and update its statusVincent Petry2015-09-165-28/+123
| * | | | | | | | Add expiration date handling in share tabVincent Petry2015-09-164-25/+147
| * | | | | | | | cleanupArthur Schiwon2015-09-161-80/+0
| * | | | | | | | make permission/cruds checkboxes workArthur Schiwon2015-09-163-37/+36
| * | | | | | | | toggle visibility of detailed cruds permissionsArthur Schiwon2015-09-162-6/+7
| * | | | | | | | cleanupArthur Schiwon2015-09-161-24/+0
| * | | | | | | | make unshare workArthur Schiwon2015-09-163-43/+34
| * | | | | | | | make 'Allow editing' (aka public upload) checkbox workArthur Schiwon2015-09-163-41/+18
| * | | | | | | | fix allow upload checkbox appeareanceArthur Schiwon2015-09-163-3/+3
| * | | | | | | | implements setting and removing password for link shares, including forced onesArthur Schiwon2015-09-165-74/+58
| * | | | | | | | mark url on clickArthur Schiwon2015-09-162-5/+6