Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge pull request #15261 from owncloud/fix-14268-master | Thomas Müller | 2015-03-27 | 3 | -47/+10 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | use StreamResponse to download the log file - fixes #14268 | Thomas Müller | 2015-03-27 | 3 | -47/+10 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #15265 from owncloud/enc2_fixes | Thomas Müller | 2015-03-27 | 6 | -6/+63 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | add deleteAllFileKeys to public interface and add "uid" as parameter for the | Bjoern Schiessle | 2015-03-27 | 3 | -2/+11 | |
| * | | | | | | | | | | fix check if a file is excluded from encryption or not | Bjoern Schiessle | 2015-03-27 | 3 | -4/+52 | |
* | | | | | | | | | | | Merge pull request #15247 from owncloud/fix_group_share_master_backport | Morris Jobke | 2015-03-27 | 1 | -4/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | also call generateTarget for group share to add the correct prefix if share_f... | Bjoern Schiessle | 2015-03-26 | 1 | -4/+5 | |
* | | | | | | | | | | | | Merge pull request #15254 from owncloud/fix-14853-master | Thomas Müller | 2015-03-27 | 2 | -11/+60 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Adding a pending indicator to the files summary - fixes #14853 | Thomas Müller | 2015-03-27 | 2 | -11/+60 | |
* | | | | | | | | | | | | | Merge pull request #15259 from owncloud/fix-change-password-ie8 | Vincent Petry | 2015-03-27 | 2 | -1/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Show label for password change in IE8 | Morris Jobke | 2015-03-27 | 2 | -1/+15 | |
* | | | | | | | | | | | | | Merge pull request #15227 from owncloud/ocetag-header | Vincent Petry | 2015-03-27 | 3 | -0/+90 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Copy Etag header to OC-Etag for sabre calls | Vincent Petry | 2015-03-26 | 3 | -0/+90 | |
* | | | | | | | | | | | | | | Merge pull request #15260 from owncloud/adjust-controls-bar-width | Morris Jobke | 2015-03-27 | 2 | -1/+61 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | fix scrutinizer issues | Jan-Christoph Borchardt | 2015-03-27 | 1 | -6/+9 | |
| * | | | | | | | | | | | | | adjust controls bar width to not overlay scrollbar | Jan-Christoph Borchardt | 2015-03-27 | 2 | -1/+58 | |
* | | | | | | | | | | | | | | Merge pull request #15258 from owncloud/users-addtofilteredgroup | Morris Jobke | 2015-03-27 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Don't append user in a filtered list if groups don't match | Vincent Petry | 2015-03-27 | 1 | -0/+4 | |
* | | | | | | | | | | | | | | | Merge pull request #15225 from owncloud/make-setups-for-users-that-tend-to-us... | Morris Jobke | 2015-03-27 | 5 | -24/+38 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Add some generic default headers as well via PHP | Lukas Reschke | 2015-03-26 | 5 | -24/+38 | |
* | | | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-27 | 632 | -1626/+358 | |
| |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | 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 |