| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #15252 from owncloud/prevent-directory-characters-in-tempo... | Thomas Müller | 2015-03-27 | 2 | -0/+18 |
|\ |
|
| * | Filter potential dangerous characters in path name | Lukas Reschke | 2015-03-26 | 2 | -0/+18 |
* | | Merge pull request #15256 from owncloud/emptycontent-messages | Thomas Müller | 2015-03-27 | 5 | -7/+7 |
|\ \ |
|
| * | | adjust shade of empty content icons, fix files icon shade | Jan-Christoph Borchardt | 2015-03-26 | 3 | -5/+5 |
| * | | adjust emptycontent messages for files and files_external | Jan-Christoph Borchardt | 2015-03-26 | 2 | -2/+2 |
| |/ |
|
* | | Merge pull request #15255 from owncloud/test-namespacesforrepairtests | Morris Jobke | 2015-03-27 | 4 | -4/+7 |
|\ \ |
|
| * | | Fix namespace for repair step tests | Vincent Petry | 2015-03-26 | 4 | -4/+7 |
* | | | Merge pull request #15245 from owncloud/fix-14864-master | Thomas Müller | 2015-03-26 | 1 | -1/+1 |
|\ \ \
| |_|/
|/| | |
|
| * | | More elaborate command description for upgrade - fixes #14864 | Thomas Müller | 2015-03-26 | 1 | -1/+1 |
* | | | Merge pull request #13654 from oparoz/tmpfile-with-extension | Vincent Petry | 2015-03-26 | 3 | -9/+16 |
|\ \ \
| |_|/
|/| | |
|
| * | | Make the method compatible with all types of extensions | Olivier Paroz | 2015-03-19 | 2 | -7/+10 |
| * | | Fix the office class | Olivier Paroz | 2015-03-19 | 1 | -3/+7 |
| * | | Keep the extension in temp files | Olivier Paroz | 2015-03-19 | 1 | -1/+1 |
* | | | Merge pull request #15244 from owncloud/use_default_share_folder | Morris Jobke | 2015-03-26 | 3 | -5/+20 |
|\ \ \ |
|
| * | | | always fall back to default share folder | Bjoern Schiessle | 2015-03-26 | 3 | -5/+20 |
* | | | | Merge pull request #14925 from owncloud/ext-mountoptions-ui | Robin McCorkell | 2015-03-26 | 9 | -28/+366 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Make sure mountOptions keep their data type | Vincent Petry | 2015-03-26 | 3 | -7/+63 |
| * | | | Added ext storage mount options GUI | Vincent Petry | 2015-03-26 | 6 | -21/+303 |
* | | | | Merge pull request #14918 from owncloud/fix-password-change-ie8-and-9 | Jan-Christoph Borchardt | 2015-03-26 | 2 | -1/+12 |
|\ \ \ \ |
|
| * | | | | fix enforced password for share in IE8 | Morris Jobke | 2015-03-26 | 1 | -0/+5 |
| * | | | | Don't use placeholder for password in IE8 & 9 | Morris Jobke | 2015-03-26 | 1 | -1/+7 |
* | | | | | Merge pull request #13802 from owncloud/share-partfilepermissions | Morris Jobke | 2015-03-26 | 5 | -28/+225 |
|\ \ \ \ \
| |_|_|/ /
|/| | | | |
|
| * | | | | Fix share permission related unit tests | Vincent Petry | 2015-03-20 | 2 | -11/+15 |
| * | | | | Rename must be possible with update-only permission | Vincent Petry | 2015-03-19 | 1 | -17/+23 |
| * | | | | Fix permission checks in Sabre connector | Vincent Petry | 2015-03-19 | 1 | -6/+15 |
| * | | | | Reenable trashbin after failed rename | Vincent Petry | 2015-03-18 | 1 | -0/+16 |
| * | | | | Fix shared storage permission checks | Vincent Petry | 2015-03-18 | 2 | -4/+166 |
* | | | | | Merge pull request #14488 from owncloud/enhancement/security/inline-disposition | Morris Jobke | 2015-03-26 | 1 | -0/+19 |
|\ \ \ \ \ |
|
| * | | | | | Remove unneeded argument | Lukas Reschke | 2015-03-26 | 1 | -1/+1 |
| * | | | | | Serve all files with a Content-Disposition of 'attachment' via WebDAV | Lukas Reschke | 2015-03-26 | 1 | -0/+19 |
| | |/ / /
| |/| | | |
|
* | | | | | Merge pull request #15001 from owncloud/kill-share-proxy | Thomas Müller | 2015-03-26 | 7 | -79/+23 |
|\ \ \ \ \ |
|
| * | | | | | replace share proxy with hook | Robin Appelman | 2015-03-26 | 7 | -74/+18 |
| * | | | | | rename proxy test | Robin Appelman | 2015-03-26 | 1 | -7/+7 |
| |/ / / / |
|
* | | | | | Merge pull request #15234 from owncloud/encryption2_core | Thomas Müller | 2015-03-26 | 28 | -2/+2980 |
|\ \ \ \ \ |
|
| * | | | | | implement basic encryption functionallity in core to enable multiple encrypti... | Bjoern Schiessle | 2015-03-26 | 28 | -2/+2980 |
* | | | | | | Merge pull request #15237 from owncloud/remove-ide-autocomplete-fail | Thomas Müller | 2015-03-26 | 1 | -1/+0 |
|\ \ \ \ \ \ |
|
| * | | | | | | Remove IDE autocomplete fail | Lukas Reschke | 2015-03-26 | 1 | -1/+0 |
* | | | | | | | Merge pull request #15214 from owncloud/no-php-timeouts-on-webdav-master | Morris Jobke | 2015-03-26 | 1 | -0/+4 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | no php execution timeout for webdav | Thomas Müller | 2015-03-26 | 1 | -0/+4 |
| | |_|_|_|/ /
| |/| | | | | |
|
* | | | | | | | Merge pull request #14399 from owncloud/ignore-empty-plurals | Lukas Reschke | 2015-03-26 | 5 | -43/+7 |
|\ \ \ \ \ \ \
| |_|_|_|/ / /
|/| | | | | | |
|
| * | | | | | | Revert "Correctly fallback to english, if the plural case is not translated" | Joas Schilling | 2015-02-20 | 4 | -41/+4 |
| * | | | | | | Ignore empty plurals just like with singulars | Joas Schilling | 2015-02-20 | 1 | -2/+3 |
* | | | | | | | Merge pull request #15129 from owncloud/version-command-bus | Lukas Reschke | 2015-03-26 | 7 | -10/+132 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | teardown after we're done | Robin Appelman | 2015-03-26 | 1 | -0/+1 |
| * | | | | | | | save uid instead of user object in command | Robin Appelman | 2015-03-26 | 2 | -5/+5 |
| * | | | | | | | check limit of serialized command in unit tests | Robin Appelman | 2015-03-26 | 1 | -0/+3 |
| * | | | | | | | ensure commands can be serialized in unit tests | Robin Appelman | 2015-03-26 | 1 | -1/+4 |
| * | | | | | | | Setup the filesystem in the expire command | Robin Appelman | 2015-03-26 | 3 | -4/+24 |
| * | | | | | | | Handle exceptions thrown during hooks when running unit tests | Robin Appelman | 2015-03-26 | 2 | -0/+11 |
| * | | | | | | | Force test cases using background commands to handle setting up the filesystem | Robin Appelman | 2015-03-26 | 3 | -3/+22 |