summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15252 from ↵Thomas Müller2015-03-272-0/+18
|\ | | | | | | | | owncloud/prevent-directory-characters-in-temporary-path Filter potential dangerous characters in path name
| * Filter potential dangerous characters in path nameLukas Reschke2015-03-262-0/+18
| | | | | | | | We should not allow / or \ in the postfix here.
* | Merge pull request #15256 from owncloud/emptycontent-messagesThomas Müller2015-03-275-7/+7
|\ \ | | | | | | fine-tuning the empty content messages
| * | adjust shade of empty content icons, fix files icon shadeJan-Christoph Borchardt2015-03-263-5/+5
| | |
| * | adjust emptycontent messages for files and files_externalJan-Christoph Borchardt2015-03-262-2/+2
| |/
* | Merge pull request #15255 from owncloud/test-namespacesforrepairtestsMorris Jobke2015-03-274-4/+7
|\ \ | | | | | | Fix namespace for repair step tests
| * | Fix namespace for repair step testsVincent Petry2015-03-264-4/+7
| | |
* | | Merge pull request #15245 from owncloud/fix-14864-masterThomas Müller2015-03-261-1/+1
|\ \ \ | |_|/ |/| | More elaborate command description for upgrade
| * | More elaborate command description for upgrade - fixes #14864Thomas Müller2015-03-261-1/+1
| | |
* | | Merge pull request #13654 from oparoz/tmpfile-with-extensionVincent Petry2015-03-263-9/+16
|\ \ \ | |_|/ |/| | Keep the extension in temp files
| * | Make the method compatible with all types of extensionsOlivier Paroz2015-03-192-7/+10
| | | | | | | | | | | | Fix existing tests
| * | Fix the office classOlivier Paroz2015-03-191-3/+7
| | | | | | | | | | | | The office converter already replaces the original extension with '.pdf', so we need to switch the extensions of the tmp file instead of appending '.pdf' to it
| * | Keep the extension in temp filesOlivier Paroz2015-03-191-1/+1
| | | | | | | | | | | | | | | The file extension helps some applications like ImageMagick to properly process files
* | | Merge pull request #15244 from owncloud/use_default_share_folderMorris Jobke2015-03-263-5/+20
|\ \ \ | | | | | | | | always fall back to default share folder
| * | | always fall back to default share folderBjoern Schiessle2015-03-263-5/+20
| | | |
* | | | Merge pull request #14925 from owncloud/ext-mountoptions-uiRobin McCorkell2015-03-269-28/+366
|\ \ \ \ | |_|_|/ |/| | | Mount options GUI for external storage
| * | | Make sure mountOptions keep their data typeVincent Petry2015-03-263-7/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | str_replace for $user substitution was converting the data type of mountOptions to string. This fix prevents this to happen by making sure only strings are processed by substitution. Also added a int conversion when reading the watcher policy
| * | | Added ext storage mount options GUIVincent Petry2015-03-266-21/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added option to disable autoscan of external storages Mount option file system scan is now an int Move priority field to avoid undefined field in storage options All input elements inside the storage options block get parsed into storage options. Moving the priority field outside prevents it to appear in the storage config, as expected. It is still parsed by special code.
* | | | Merge pull request #14918 from owncloud/fix-password-change-ie8-and-9Jan-Christoph Borchardt2015-03-262-1/+12
|\ \ \ \ | | | | | | | | | | Don't use placeholder for password in IE8 & 9
| * | | | fix enforced password for share in IE8Morris Jobke2015-03-261-0/+5
| | | | |
| * | | | Don't use placeholder for password in IE8 & 9Morris Jobke2015-03-261-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * the placeholder is in IE 8 and 9 just set as text and styled a bit grey. If the form is then serialized without typing something in the placeholder is sent as value * this fixes that behaviour for the password field and properly detects empyt passwords * fixes #14912
* | | | | Merge pull request #13802 from owncloud/share-partfilepermissionsMorris Jobke2015-03-265-28/+225
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix share permission checks
| * | | | Fix share permission related unit testsVincent Petry2015-03-202-11/+15
| | | | |
| * | | | Rename must be possible with update-only permissionVincent Petry2015-03-191-17/+23
| | | | | | | | | | | | | | | | | | | | and this as long as the rename is done within the same folder.
| * | | | Fix permission checks in Sabre connectorVincent Petry2015-03-191-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | This fixes moving files in and out of shared folders with some exotic permission combinations.
| * | | | Reenable trashbin after failed renameVincent Petry2015-03-181-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a failed rename, the post_rename hook is not called. This quickfix makes sure the trashbin storage logic is reenabled also after a failed rename.
| * | | | Fix shared storage permission checksVincent Petry2015-03-182-4/+166
| | | | |
* | | | | Merge pull request #14488 from owncloud/enhancement/security/inline-dispositionMorris Jobke2015-03-261-0/+19
|\ \ \ \ \ | | | | | | | | | | | | Serve all files with a Content-Disposition of 'attachment' via WebDAV
| * | | | | Remove unneeded argumentLukas Reschke2015-03-261-1/+1
| | | | | |
| * | | | | Serve all files with a Content-Disposition of 'attachment' via WebDAVLukas Reschke2015-03-261-0/+19
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As an additional security hardening it's sensible to serve these files with a Content-Disposition of 'attachment'. Currently they are served 'inline' and get a "secure mimetype" assigned in case of potential dangerous files. To test this change ensure that: - [ ] Syncing with the Desktop client still works - [ ] Syncing with the Android client still works - [ ] Syncing with the iOS client still works I verified that the 1.8 OS X and iOS client still work with this change.
* | | | | Merge pull request #15001 from owncloud/kill-share-proxyThomas Müller2015-03-267-79/+23
|\ \ \ \ \ | | | | | | | | | | | | Replace share proxy with a hook
| * | | | | replace share proxy with hookRobin Appelman2015-03-267-74/+18
| | | | | |
| * | | | | rename proxy testRobin Appelman2015-03-261-7/+7
| |/ / / /
* | | | | Merge pull request #15234 from owncloud/encryption2_coreThomas Müller2015-03-2628-2/+2980
|\ \ \ \ \ | | | | | | | | | | | | core part of encryption 2.0
| * | | | | implement basic encryption functionallity in core to enable multiple ↵Bjoern Schiessle2015-03-2628-2/+2980
| | | | | | | | | | | | | | | | | | | | | | | | encryption modules
* | | | | | Merge pull request #15237 from owncloud/remove-ide-autocomplete-failThomas Müller2015-03-261-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove IDE autocomplete fail
| * | | | | | Remove IDE autocomplete failLukas Reschke2015-03-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | :see_no_evil: *cough* *cough*
* | | | | | | Merge pull request #15214 from owncloud/no-php-timeouts-on-webdav-masterMorris Jobke2015-03-261-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | no php execution timeout for webdav
| * | | | | | | no php execution timeout for webdavThomas Müller2015-03-261-0/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #14399 from owncloud/ignore-empty-pluralsLukas Reschke2015-03-265-43/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Ignore empty plurals just like with singulars
| * | | | | | Revert "Correctly fallback to english, if the plural case is not translated"Joas Schilling2015-02-204-41/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cbad5c998b260040523ac8e6a2797591d0086938.
| * | | | | | Ignore empty plurals just like with singularsJoas Schilling2015-02-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The js and php code of n() has fallbacks for when the key is missing. However there is no fallback, when the key is defined with an array of empty strings. So we just don't extract them anymore and use the english language.
* | | | | | | Merge pull request #15129 from owncloud/version-command-busLukas Reschke2015-03-267-10/+132
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | expire versions in a background command
| * | | | | | | teardown after we're doneRobin Appelman2015-03-261-0/+1
| | | | | | | |
| * | | | | | | save uid instead of user object in commandRobin Appelman2015-03-262-5/+5
| | | | | | | |
| * | | | | | | check limit of serialized command in unit testsRobin Appelman2015-03-261-0/+3
| | | | | | | |
| * | | | | | | ensure commands can be serialized in unit testsRobin Appelman2015-03-261-1/+4
| | | | | | | |
| * | | | | | | Setup the filesystem in the expire commandRobin Appelman2015-03-263-4/+24
| | | | | | | |
| * | | | | | | Handle exceptions thrown during hooks when running unit testsRobin Appelman2015-03-262-0/+11
| | | | | | | |
| * | | | | | | Force test cases using background commands to handle setting up the filesystemRobin Appelman2015-03-263-3/+22
| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-22 06:45:40 +0000