summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-09-0612-0/+14
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-09-0520-0/+52
|
* Merge pull request #18833 from owncloud/share-prevent-twiceMorris Jobke2015-09-041-0/+12
|\ | | | | Prevent sharing twice with user when already a group
| * Prevent sharing twice with user when already a groupVincent Petry2015-09-041-0/+12
| |
* | Merge pull request #18832 from owncloud/fix-infinite-loop-share-propagationRobin Appelman2015-09-041-0/+8
|\ \ | | | | | | Avoid re-propagation of shares during one propagation run
| * | Avoid re-propagation of shares during one propagation runMorris Jobke2015-09-041-0/+8
|/ / | | | | | | * fix was proposed by @nickvergessen
* | Merge pull request #18823 from owncloud/filetype-pngsMorris Jobke2015-09-0423-4/+3
|\ \ | | | | | | export correct 48px png fallbacks for filetype icons
| * | also modify other places icons to fit new styleJan-Christoph Borchardt2015-09-034-4/+3
| | |
| * | export correct 48px png fallbacks for filetype iconsJan-Christoph Borchardt2015-09-0320-0/+0
| | |
* | | Merge pull request #18762 from owncloud/use-json-instead-of-unserializeMorris Jobke2015-09-042-4/+4
|\ \ \ | | | | | | | | Use "json_encode" and "json_decode" instead of unserialize
| * | | Use "json_encode" and "json_decode" instead of unserializeLukas Reschke2015-09-022-4/+4
| | | |
* | | | Merge pull request #18794 from individual-it/reuse_systemConfigIndividual IT Services2015-09-041-1/+1
|\ \ \ \ | | | | | | | | | | reuse existing $systemConfig variable
| * | | | reuse existing $systemConfig variableIndividual IT Services2015-09-031-1/+1
| | | | |
* | | | | [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"
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-10 00:27:41 +0000