Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | fix layout for Sharing settings | Jan-Christoph Borchardt | 2015-03-27 | 2 | -14/+17 | |
| * | | | | | | | Move federated cloud sharing, files externals and updater to special positions | Joas Schilling | 2015-03-27 | 4 | -8/+106 | |
* | | | | | | | | Merge pull request #15295 from owncloud/add-more-spacing-dialog | Morris Jobke | 2015-03-30 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add more spacing to the file picker dialog | Lukas Reschke | 2015-03-28 | 2 | -2/+2 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-30 | 26 | -0/+62 | |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-29 | 56 | -18/+74 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #15289 from owncloud/min-upload-limit | Vincent Petry | 2015-03-28 | 1 | -3/+7 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Require minimum 1 MiB upload limit | Robin McCorkell | 2015-03-27 | 1 | -3/+7 | |
* | | | | | | | | Merge pull request #15288 from owncloud/check-datadir-relative | Vincent Petry | 2015-03-28 | 2 | -5/+30 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Check for relative datadirectory path | Robin McCorkell | 2015-03-27 | 2 | -5/+30 | |
| |/ / / / / / / | ||||||
* / / / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-28 | 116 | -40/+240 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #15284 from owncloud/revert-master-breakage | Morris Jobke | 2015-03-27 | 4 | -129/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Revert "Deprecated \OCP\IAppConfig - add missing methods to IConfig" | Vincent Petry | 2015-03-27 | 4 | -129/+6 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #15155 from owncloud/share-donotreturntrashedfiles | Morris Jobke | 2015-03-27 | 2 | -11/+88 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add logout in share test to avoid nasty side effects | Vincent Petry | 2015-03-27 | 1 | -0/+1 | |
| * | | | | | | | Do not return shares for files outside "files" | Vincent Petry | 2015-03-27 | 2 | -11/+87 | |
* | | | | | | | | Merge pull request #13938 from owncloud/deprecate-iappconfig | Thomas Müller | 2015-03-27 | 7 | -18/+155 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | migrate share helper method to IConfig | Morris Jobke | 2015-03-18 | 1 | -3/+5 | |
| * | | | | | | | | fix unit tests | Morris Jobke | 2015-03-17 | 1 | -5/+15 | |
| * | | | | | | | | fix failing unit test | Morris Jobke | 2015-03-17 | 1 | -4/+6 | |
| * | | | | | | | | Deprecated \OCP\IAppConfig - add missing methods to IConfig | Morris Jobke | 2015-03-17 | 4 | -6/+129 | |
* | | | | | | | | | Merge pull request #15240 from owncloud/storage-wrapper-priority | Thomas Müller | 2015-03-27 | 4 | -10/+47 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | add priority to storage wrappers | Robin Appelman | 2015-03-26 | 4 | -10/+47 | |
* | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | |