Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-31 | 14 | -36/+62 |
| | |||||
* | Merge pull request #15312 from owncloud/activity-fix-compilation | Lukas Reschke | 2015-03-30 | 1 | -12/+7 |
|\ | | | | | Correct the app name for sharing events | ||||
| * | Correct the app name for sharing events | Joas Schilling | 2015-03-30 | 1 | -12/+7 |
| | | |||||
* | | Merge pull request #15076 from owncloud/fix-smb-oc-admin | Robin McCorkell | 2015-03-30 | 1 | -4/+11 |
|\ \ | |/ |/| | Support constructing an SMB_OC without saved session credentials | ||||
| * | Support constructing an SMB_OC without saved session credentials | Robin McCorkell | 2015-03-20 | 1 | -4/+11 |
| | | |||||
* | | Merge pull request #13964 from rullzer/capabilities | Morris Jobke | 2015-03-30 | 3 | -0/+280 |
|\ \ | | | | | | | Add OCS sharing info to capabilities - take 2 | ||||
| * | | Mark functions private | Roeland Jago Douma | 2015-03-11 | 1 | -2/+2 |
| | | | |||||
| * | | Slight better formatting | Roeland Jago Douma | 2015-03-11 | 2 | -47/+11 |
| | | | |||||
| * | | New array syntax | Roeland Jago Douma | 2015-03-11 | 2 | -56/+56 |
| | | | |||||
| * | | Added new header | Roeland Jago Douma | 2015-03-11 | 2 | -11/+35 |
| | | | |||||
| * | | Now added enabled element | Roeland Jago Douma | 2015-03-11 | 2 | -9/+13 |
| | | | | | | | | | | | | This change allows for more generic parsing for the capabilities. | ||||
| * | | Added route again | Roeland Jago Douma | 2015-03-11 | 1 | -0/+6 |
| | | | |||||
| * | | Add file_sharing info to capabilities | Roeland Jago Douma | 2015-03-11 | 2 | -0/+282 |
| | | | | | | | | | | | | | | | Display the capabilities regarding file sharing in the capabilities API. This will allow the clients to provide users a better experince. | ||||
* | | | Merge pull request #15239 from owncloud/see-no-evil | Morris Jobke | 2015-03-30 | 1 | -14/+16 |
|\ \ \ | | | | | | | | | Move federated cloud sharing, files externals and updater to special pos... | ||||
| * | | | fix layout for Sharing settings | Jan-Christoph Borchardt | 2015-03-27 | 1 | -13/+15 |
| | | | | |||||
| * | | | Move federated cloud sharing, files externals and updater to special positions | Joas Schilling | 2015-03-27 | 1 | -2/+2 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-30 | 2 | -0/+4 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-29 | 8 | -4/+12 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-28 | 52 | -4/+104 |
| | | | | |||||
* | | | | Merge pull request #13938 from owncloud/deprecate-iappconfig | Thomas Müller | 2015-03-27 | 1 | -5/+15 |
|\ \ \ \ | | | | | | | | | | | Deprecated \OCP\IAppConfig - add missing methods to IConfig | ||||
| * | | | | fix unit tests | Morris Jobke | 2015-03-17 | 1 | -5/+15 |
| | | | | | |||||
* | | | | | 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 | ||||
| * | | | | | Adding a pending indicator to the files summary - fixes #14853 | Thomas Müller | 2015-03-27 | 2 | -11/+60 |
| | | | | | | |||||
* | | | | | | Merge pull request #15227 from owncloud/ocetag-header | Vincent Petry | 2015-03-27 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Copy Etag header to OC-Etag for sabre calls | ||||
| * | | | | | | Copy Etag header to OC-Etag for sabre calls | Vincent Petry | 2015-03-26 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #15260 from owncloud/adjust-controls-bar-width | Morris Jobke | 2015-03-27 | 1 | -1/+6 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | adjust controls bar width to not overlay scrollbar | ||||
| * | | | | | | adjust controls bar width to not overlay scrollbar | Jan-Christoph Borchardt | 2015-03-27 | 1 | -1/+6 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-27 | 336 | -696/+24 |
|/ / / / / / | |||||
* | | | | | | adjust emptycontent messages for files and files_external | Jan-Christoph Borchardt | 2015-03-26 | 2 | -2/+2 |
| | | | | | | |||||
* | | | | | | 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 | ||||
| * | | | | | | 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 | 6 | -27/+345 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Mount options GUI for external storage | ||||
| * | | | | | | Make sure mountOptions keep their data type | Vincent Petry | 2015-03-26 | 2 | -6/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 GUI | Vincent Petry | 2015-03-26 | 4 | -21/+283 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #13802 from owncloud/share-partfilepermissions | Morris Jobke | 2015-03-26 | 3 | -20/+208 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Fix share permission checks | ||||
| * | | | | | | Fix share permission related unit tests | Vincent Petry | 2015-03-20 | 1 | -9/+13 |
| | | | | | | | |||||
| * | | | | | | Rename must be possible with update-only permission | Vincent Petry | 2015-03-19 | 1 | -17/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | and this as long as the rename is done within the same folder. | ||||
| * | | | | | | Reenable trashbin after failed rename | Vincent Petry | 2015-03-18 | 1 | -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 checks | Vincent Petry | 2015-03-18 | 2 | -4/+166 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #15001 from owncloud/kill-share-proxy | Thomas Müller | 2015-03-26 | 7 | -79/+23 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Replace share proxy with a hook | ||||
| * | | | | | | | 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 | 4 | -0/+172 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | core part of encryption 2.0 | ||||
| * | | | | | | | | implement basic encryption functionallity in core to enable multiple ↵ | Bjoern Schiessle | 2015-03-26 | 4 | -0/+172 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encryption modules | ||||
* | | | | | | | | | Merge pull request #15237 from owncloud/remove-ide-autocomplete-fail | Thomas Müller | 2015-03-26 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove IDE autocomplete fail | ||||
| * | | | | | | | | | Remove IDE autocomplete fail | Lukas Reschke | 2015-03-26 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :see_no_evil: *cough* *cough* | ||||
* | | | | | | | | | | 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 | ||||
| * | | | | | | | | | no php execution timeout for webdav | Thomas Müller | 2015-03-26 | 1 | -0/+4 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #15129 from owncloud/version-command-bus | Lukas Reschke | 2015-03-26 | 3 | -6/+92 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | expire versions in a background command | ||||
| * | | | | | | | | teardown after we're done | Robin Appelman | 2015-03-26 | 1 | -0/+1 |
| | | | | | | | | |