Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-31 | 60 | -178/+296 |
| | |||||
* | 8.0.0 RC1v8.0.0RC1 | Frank Karlitschek | 2015-01-28 | 1 | -2/+2 |
| | |||||
* | Merge pull request #13804 from owncloud/check-return-before-assuming-array | Joas Schilling | 2015-01-30 | 1 | -8/+12 |
|\ | | | | | Check whether return is an error case before using it | ||||
| * | Check whether return is an error case before using it | Joas Schilling | 2015-01-30 | 1 | -8/+12 |
|/ | |||||
* | Merge pull request #13508 from owncloud/failed-delete-cache | Morris Jobke | 2015-01-30 | 5 | -7/+72 |
|\ | | | | | Dont remove a file from cache if the delete operation failed | ||||
| * | Dont do a cache rename if we cant delete the source file | Robin Appelman | 2015-01-29 | 2 | -3/+5 |
| | | |||||
| * | Make sure we delete the file when doing a cross storage trashbin move | Robin Appelman | 2015-01-29 | 1 | -0/+2 |
| | | |||||
| * | Detect failed deletes in the trashbin | Robin Appelman | 2015-01-29 | 2 | -3/+41 |
| | | |||||
| * | Dont remove a file from cache if the delete operation failed | Robin Appelman | 2015-01-29 | 2 | -1/+24 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-30 | 92 | -106/+114 |
| | | |||||
* | | Merge pull request #13774 from owncloud/fix-exception-css | Robin McCorkell | 2015-01-29 | 1 | -0/+2 |
|\ \ | | | | | | | add CSS to exception page - fixes #13747 | ||||
| * | | add CSS to exception page - fixes #13747 | Morris Jobke | 2015-01-29 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #13772 from owncloud/closecursor-allconfig | Vincent Petry | 2015-01-29 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Close cursor after checking for existing config values | ||||
| * | | Close cursor after checking for existing config values | Vincent Petry | 2014-11-28 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares | Morris Jobke | 2015-01-29 | 3 | -66/+145 |
|\ \ \ | |/ / |/| | | make sure that we always create a public share key for remote shares | ||||
| * | | Fix intendation | Joas Schilling | 2015-01-29 | 1 | -3/+3 |
| | | | |||||
| * | | Fix more assertions | Joas Schilling | 2015-01-29 | 1 | -26/+26 |
| | | | |||||
| * | | Fix 2 assertions | Joas Schilling | 2015-01-29 | 1 | -3/+3 |
| | | | |||||
| * | | make sure that we always create a public share key for remote shares | Bjoern Schiessle | 2015-01-29 | 3 | -41/+120 |
| | | | |||||
* | | | Merge pull request #13728 from owncloud/federated_cloud | Thomas Müller | 2015-01-29 | 2 | -5/+5 |
|\ \ \ | |_|/ |/| | | rename 'server-to-server sharing' to 'federated cloud' | ||||
| * | | rename 'server-to-server sharing' to 'federated cloud' | Bjoern Schiessle | 2015-01-29 | 2 | -5/+5 |
| |/ | |||||
* | | Merge pull request #13757 from ↵ | Lukas Reschke | 2015-01-29 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | owncloud/issue/13686-scroll-to-file-when-using-searchotherplaces Scroll to file in folder, when using "search in other places" link | ||||
| * | | Scroll to file in folder, when using "search in other places" link | Joas Schilling | 2015-01-29 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #13762 from owncloud/ignore_trailing_slash | Björn Schießle | 2015-01-29 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | ignore trailing slash for remote URL | ||||
| * | | | remove trailing slash | Bjoern Schiessle | 2015-01-29 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #13752 from owncloud/closecursor1 | Morris Jobke | 2015-01-29 | 2 | -0/+4 |
|\ \ \ | | | | | | | | | Close cursor early in calculateFolderSize | ||||
| * | | | Close cursor early in calculateFolderSize | Vincent Petry | 2014-11-28 | 2 | -0/+4 |
| | |/ | |/| | | | | | | | | | | This method triggers additional queries in $this->update() so to avoid potential database locks or delays, we close the cursor as soon as it is not needed any more | ||||
* | | | Merge pull request #13682 from owncloud/webdav-single-file-put | Morris Jobke | 2015-01-29 | 4 | -4/+45 |
|\ \ \ | | | | | | | | | Fix WebDAV put for single file shares | ||||
| * | | | Fix webdav put for single file webdav shares | Robin Appelman | 2015-01-29 | 2 | -3/+28 |
| | | | | |||||
| * | | | Fix resolving paths for views rooted in a file | Robin Appelman | 2015-01-29 | 2 | -1/+17 |
| |/ / | |||||
* | | | Merge pull request #13746 from owncloud/no-groups-provisioning-api | Thomas Müller | 2015-01-29 | 2 | -1/+5 |
|\ \ \ | |/ / |/| | | disallow provisioning api to be enabled for groups only | ||||
| * | | disallow provisioning api to be enabled for groups only | Thomas Müller | 2015-01-29 | 2 | -1/+5 |
| | | | |||||
* | | | Merge pull request #13604 from owncloud/encryption-key-migration-as-repair-step | Thomas Müller | 2015-01-29 | 3 | -21/+115 |
|\ \ \ | | | | | | | | | adding console command to migrate encryption keys - refs #13450 | ||||
| * | | | user fs must be setup up, so that the real user folder is mounted on the ↵ | Arthur Schiwon | 2015-01-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | username based path | ||||
| * | | | adding console command to migrate encryption keys - refs #13450 | Thomas Müller | 2015-01-22 | 3 | -21/+114 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-29 | 48 | -8/+80 |
| |/ / |/| | | |||||
* | | | Merge pull request #13401 from is-apps/amazon_s3_checkboxes | Thomas Müller | 2015-01-28 | 1 | -1/+7 |
|\ \ \ | | | | | | | | | Tidy formatting of Amazon S3 checkboxes | ||||
| * | | | Align checkbox configuration in external files | Ross Nicoll | 2015-01-19 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | Modified CSS for files_external application to render labels around checkboxes at the same width as other input elements, aligning them with other elements on the same page. | ||||
* | | | | Merge pull request #13667 from owncloud/rename-always-update-cache | Robin Appelman | 2015-01-28 | 4 | -13/+20 |
|\ \ \ \ | | | | | | | | | | | Update the cache when renaming even if we dont emit hooks | ||||
| * | | | | Fix trash error when deleting files with the same name at the same time ↵ | Robin Appelman | 2015-01-28 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | (happens in unit tests) | ||||
| * | | | | Add unit test | Robin Appelman | 2015-01-28 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Update the cache when renaming even if we dont emit hooks | Robin Appelman | 2015-01-28 | 2 | -12/+14 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #13730 from owncloud/fix-htaccess | Morris Jobke | 2015-01-28 | 3 | -6/+6 |
|\ \ \ \ | |/ / / |/| | | | Reference module with `.c` | ||||
| * | | | Reference module with `.c` | Lukas Reschke | 2015-01-28 | 3 | -6/+6 |
|/ / / | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/13657 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-28 | 28 | -50/+224 |
| | | | |||||
* | | | Merge pull request #13700 from owncloud/dav-objecttree-required-a-collection | Morris Jobke | 2015-01-28 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | let init() take a ICollection or an INode - fixes PHP message | ||||
| * | | | let init() take an INode - fixes PHP message | Thomas Müller | 2015-01-27 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #13704 from ↵ | Morris Jobke | 2015-01-28 | 2 | -3/+6 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/issue/13571-indicate-remote-sharee-in-filelist Indicate that the share owner is remote in the filelist | ||||
| * | | | | Indicate that the share owner is remote in the filelist | Joas Schilling | 2015-01-27 | 2 | -3/+6 |
| | | | | | |||||
* | | | | | Merge pull request #13717 from owncloud/storage-donotwrapnullstorage | Morris Jobke | 2015-01-28 | 2 | -1/+89 |
|\ \ \ \ \ | | | | | | | | | | | | | Prevent wrapping null storage |