summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-09-04130-46/+128
|
* Merge pull request #18815 from owncloud/ext-updateRobin McCorkell2015-09-031-0/+7
|\ | | | | Set default mount options for external storages
| * Set default mount options for external storagesRobin McCorkell2015-09-031-0/+7
| |
* | Merge pull request #18799 from owncloud/appconfig-with-one-requestMorris Jobke2015-09-032-314/+356
|\ \ | | | | | | Only query the appconfig once per request
| * | Make sure the array existsJoas Schilling2015-09-031-0/+8
| | |
| * | Only query the appconfig onceJoas Schilling2015-09-032-315/+349
| | |
* | | Merge pull request #18810 from owncloud/shared-mount-delay-setupVincent Petry2015-09-033-7/+8
|\ \ \ | | | | | | | | Delay setting up the filesystem for a share owner untill the share is used
| * | | setup owner when getting users for shareRobin Appelman2015-09-031-0/+2
| | | |
| * | | Delay setting up the filesystem for a share owner untill the share is usedRobin Appelman2015-09-032-7/+6
| | | |
* | | | Merge pull request #18812 from owncloud/move_updater_above_versionRobin McCorkell2015-09-031-4/+4
|\ \ \ \ | | | | | | | | | | move updater panel above version number
| * | | | move updater panel above version numberGeorg Ehrke2015-09-031-4/+4
| | | | |
* | | | | Merge pull request #18811 from owncloud/better-submodule-warningRobin McCorkell2015-09-031-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Proper details about git submodule update
| * | | | Proper details about git submodule updateMorris Jobke2015-09-031-1/+1
| | |_|/ | |/| | | | | | | | | | * fixes #18801
* | | | Merge pull request #18781 from ↵Morris Jobke2015-09-038-9/+31
|\ \ \ \ | |/ / / |/| | | | | | | | | | | owncloud/move-background-job-registration-to-install-update Move background job registration to install update
| * | | Move registration of background job to install/updateJoas Schilling2015-09-024-5/+24
| | | |
| * | | Move registration of LDAP background jobs to the install and updateJoas Schilling2015-09-024-4/+7
| | | |
* | | | Merge pull request #18809 from owncloud/fix-tags-fileinfomodelRobin Appelman2015-09-032-1/+22
|\ \ \ \ | | | | | | | | | | Tags in FileInfo map must be an array
| * | | | Tags in FileInfo map must be an arrayVincent Petry2015-09-032-1/+22
| | |/ / | |/| | | | | | | | | | | | | | Fixes FileList.elementToFile to make an array for the tags instead of keeping the original joined string
* | | | Merge pull request #18803 from owncloud/toggle-svgRobin Appelman2015-09-033-4/+4
|\ \ \ \ | |/ / / |/| | | use SVG for toggle image on installation instead of PNG
| * | | use SVG for toggle image instead of PNG, fix installation and personal ↵Jan-Christoph Borchardt2015-09-033-4/+4
| | | | | | | | | | | | | | | | settings toggle
* | | | Merge pull request #18798 from owncloud/collapse-html-codeJan-Christoph Borchardt2015-09-032-5/+10
|\ \ \ \ | | | | | | | | | | Collapse HTML code for federated code
| * | | | Collapse HTML code for federated codeLukas Reschke2015-09-032-5/+10
| | | | |
* | | | | Merge pull request #18777 from owncloud/locking-defaultMorris Jobke2015-09-032-8/+6
|\ \ \ \ \ | |/ / / / |/| | | | enable transational locking by default
| * | | | update config sampleRobin Appelman2015-09-021-4/+2
| | | | |
| * | | | enable transational locking by defaultRobin Appelman2015-09-021-4/+4
| | |/ / | |/| |
* | | | Merge pull request #18780 from owncloud/isimage-fallbackMorris Jobke2015-09-032-15/+64
|\ \ \ \ | | | | | | | | | | fallback for isimage
| * | | | Fix sidebar thumbnail loading JS unit testsVincent Petry2015-09-032-15/+64
| | | | |
| * | | | fallback for isimageRobin Appelman2015-09-021-1/+1
| |/ / /
* | | | Merge pull request #18787 from owncloud/encode-tags-in-jsonLukas Reschke2015-09-033-8/+22
|\ \ \ \ | | | | | | | | | | Encode HTML tags in JSON
| * | | | Encode HTML tags in JSONLukas Reschke2015-09-033-8/+22
| | | | | | | | | | | | | | | | | | | | While not encoding the HTML tags in the JSON response is perfectly fine since we set the proper mimetype as well as disable content sniffing a lot of automated code scanner do report this as security bug. Encoding them leads to less discussions and a lot of saved time.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-036-16/+192
| |_|/ / |/| | |
* | | | Merge pull request #18764 from owncloud/login-template-accessibilityMorris Jobke2015-09-031-1/+1
|\ \ \ \ | | | | | | | | | | add title attribute for the login button
| * | | | add title attribute for the login buttonChristoph Wurst2015-09-021-1/+1
| | | | |
* | | | | Merge pull request #18682 from owncloud/quota-select-styleJan-Christoph Borchardt2015-09-033-2/+14
|\ \ \ \ \ | |_|/ / / |/| | | | Makes settings quota select like multiselect.
| * | | | use proper triangle for multiselect dropdowns as wellJan-Christoph Borchardt2015-09-033-2/+4
| | | | |
| * | | | Makes settings select like multiselectRaghu Nayyar2015-09-031-0/+10
| | | | |
* | | | | Merge pull request #18783 from owncloud/revert-18773-fix-useless-deletesJoas Schilling2015-09-021-4/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | Revert "Soft fail when deleting and no entry found"
| * | | | Revert "Soft fail when deleting and no entry found"Joas Schilling2015-09-021-4/+0
|/ / / /
* | | | Merge pull request #18773 from owncloud/fix-useless-deletesRobin McCorkell2015-09-021-0/+4
|\ \ \ \ | |_|_|/ |/| | | Soft fail when deleting and no entry found
| * | | Soft fail when deleting and no entry foundRobin McCorkell2015-09-021-0/+4
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-026-0/+218
| | |
* | | Merge pull request #18632 from owncloud/sidebad-image-previewJan-Christoph Borchardt2015-09-026-13/+154
|\ \ \ | | | | | | | | larger preview for images in the sidebar
| * | | larger preview for images in the sidebarRobin Appelman2015-09-024-7/+81
| | | |
| * | | allow handling thumbnail errorsRobin Appelman2015-09-021-1/+4
| | | |
| * | | Allow creating previewss that cover the specified dimensionsRobin Appelman2015-09-022-6/+70
| | |/ | |/|
* | | Merge pull request #18752 from owncloud/proper-setup-checkMorris Jobke2015-09-022-1/+29
|\ \ \ | |/ / |/| | use config.php value instead of version string for appstore detection
| * | use config.php value instead of version stringMorris Jobke2015-09-022-1/+29
| | |
* | | Merge pull request #18744 from owncloud/fix-ocs-routerMorris Jobke2015-09-021-2/+3
|\ \ \ | |/ / |/| | Delay adding OCS prefix to route collection until all is loaded
| * | Delay adding OCS prefix to route collection until all is loadedRobin McCorkell2015-09-011-2/+3
| | | | | | | | | | | | | | | ->addPrefix() iterates over all registered routes, so must be run after all apps have had a chance to load their OCS routes.
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-09-0134-2/+248
| | |