summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-2828-50/+224
|
* Merge pull request #13700 from owncloud/dav-objecttree-required-a-collectionMorris Jobke2015-01-281-2/+2
|\ | | | | let init() take a ICollection or an INode - fixes PHP message
| * let init() take an INode - fixes PHP messageThomas Müller2015-01-271-2/+2
| |
* | Merge pull request #13704 from ↵Morris Jobke2015-01-282-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 filelistJoas Schilling2015-01-272-3/+6
| | |
* | | Merge pull request #13717 from owncloud/storage-donotwrapnullstorageMorris Jobke2015-01-282-1/+89
|\ \ \ | | | | | | | | Prevent wrapping null storage
| * | | Prevent wrapping null storageVincent Petry2015-01-272-1/+89
| | | | | | | | | | | | | | | | | | | | | | | | Can happen when trying to instantiate external storages that have incomplete config, where the constructor throws an exception (the exception is caught in createStorage())
* | | | Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorageMorris Jobke2015-01-286-27/+200
|\ \ \ \ | | | | | | | | | | Catch storage exception in scanner for remote shares
| * | | | Add back exit()Vincent Petry2015-01-261-1/+1
| | | | |
| * | | | Replace OC_Log::ERROR with OCP\Util::ERRORVincent Petry2015-01-261-1/+1
| | | | |
| * | | | Catch storage exception in scanner for remote sharesVincent Petry2015-01-266-27/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever an exception occurs during scan of a remote share, the share is checked for availability. If the storage is gone, it will be removed automatically. Also, getDirectoryContent() will now skip unavailable storages.
* | | | | Merge pull request #13718 from owncloud/use-proper-namespaceBernhard Posselt2015-01-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Use proper namespace
| * | | | | Use proper namespaceLukas Reschke2015-01-271-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | IAppManager lives in OCP\App and not in OCP. Fixes https://github.com/owncloud/core/issues/13710
* | | | | Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefixVincent Petry2015-01-2712-15/+306
|\ \ \ \ \ | |/ / / / |/| | | | Call final unlink in trash wrapper's storage
| * | | | Fix return type of addStorageWrapper in PHPDocVincent Petry2015-01-271-1/+1
| | | | |
| * | | | Fix bogus deletion on copy + unlink through renameVincent Petry2015-01-263-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | Cross-storage rename would cause copy + unlink. That unlink operation must not trigger the trashbin.
| * | | | Add trashbin storage wrapper unit test for versionsVincent Petry2015-01-231-6/+76
| | | | |
| * | | | Simplify trash storage unit testsVincent Petry2015-01-231-46/+16
| | | | | | | | | | | | | | | | | | | | Needed to make it properly init the mount points
| * | | | Unregister trashbin storage wrapper at the end of testsVincent Petry2015-01-232-0/+4
| | | | | | | | | | | | | | | | | | | | Some more tests that uses the storage wrapper now remove it afterwards
| * | | | Preserve mtime when doing cross storage moveRobin Appelman2015-01-233-45/+40
| | | | |
| * | | | Remove storage wrapper for oc_trashbin in unit testVincent Petry2015-01-231-0/+2
| | | | |
| * | | | Only move files from the current user to the trashbinRobin Appelman2015-01-231-4/+5
| | | | |
| * | | | Apply wrappers to existing mounts before registering itRobin Appelman2015-01-232-8/+11
| | | | |
| * | | | Call final unlink in trash wrapper's storageVincent Petry2015-01-234-2/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of cross-storage delete, the files are copied to the trash, then deleted. The final delete on the source storage would still reach the trash wrapper. This fix makes forwards that second call to the wrapped storage to make the final delete work. It fixes the issue with remote shares, local shares and external storage. Also, it uses a new function "renameRecursive" that renames the files and preserves the mtimes (like "copy_recursive" did in the past))
| * | | | removeStorageWrapper to unregister a storage wrapperVincent Petry2015-01-232-3/+24
| | | | |
| * | | | Do not call wrapStorage if storate with same name added twiceVincent Petry2015-01-223-1/+12
| | | | |
* | | | | Merge pull request #13707 from owncloud/extstorage-fixincompletestorageconfigVincent Petry2015-01-272-9/+96
|\ \ \ \ \ | | | | | | | | | | | | Allow saving incomplete external storage config
| * | | | | Allow saving incomplete external storage configVincent Petry2015-01-272-2/+67
| | | | | | | | | | | | | | | | | | | | | | | | This is needed for Dropbox and others that need a token.
| * | | | | Fix mount config unit test failuresVincent Petry2015-01-271-7/+29
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because setStorageId now instantiates storages, they might throw exceptions if arguments are missing. This fixes the unit test to not throw exceptions and have their default config arguments set.
* | | | | Merge pull request #13699 from owncloud/check-if-file-existsMorris Jobke2015-01-271-1/+3
|\ \ \ \ \ | | | | | | | | | | | | Use `file_exists` to verify that config file exists
| * | | | | Use `file_exists` to verify that config file existsLukas Reschke2015-01-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There might be the case that `fopen($file, 'r')` returns false and thus ownCloud might believe that the config file is empty and thus potentially leading to an overwrite of the config file. This changeset introduces `file_exists` again which was used in ownCloud 5 where no such problems where reported and should not be affected by such problems. Ref https://github.com/owncloud/core/issues/12785#issuecomment-71548720
* | | | | | Merge pull request #13636 from ↵Lukas Reschke2015-01-275-36/+235
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/add-warning-if-restore-of-data-is-not-possible Add value if restore of data is possible for a user
| * | | | | | Add value if restore of data is possible for a userMorris Jobke2015-01-275-36/+235
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * reason: nice to know before password change in user management * restore is possible: * encryption is disabled * encryption is enabled, admin and user has checked the restore option * if not possible: * highlight users row in red once the admin wants to change the password * show also a little tipsy
* | | | | | Merge pull request #13701 from owncloud/disable-appcode-checkerLukas Reschke2015-01-271-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | disable the app code checker - some previous shipped apps cannot be inst...
| * | | | | disable the app code checker - some previous shipped apps cannot be ↵Thomas Müller2015-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | installed from the appstore now :facepunch:
* | | | | | Merge pull request #13676 from owncloud/fix-node-ifaceThomas Müller2015-01-272-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix node interface
| * | | | | | fix node interfaceBernhard Posselt2015-01-262-3/+2
| | | | | | |
* | | | | | | Merge pull request #13679 from owncloud/public-disablesharejspluginThomas Müller2015-01-273-3/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Disable JS plugin for sharing in public mode
| * | | | | | | Do not disclose share owner in public file listVincent Petry2015-01-261-1/+4
| | | | | | | |
| * | | | | | | Disable JS plugin for sharing in public modeVincent Petry2015-01-262-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the logic that registers the share action and modifies the rows. Share actions aren't needed in the public file list.
* | | | | | | | Merge pull request #13691 from owncloud/s2s-acceptsinglefileThomas Müller2015-01-272-4/+124
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Only reload file list after remote share accept request returns
| * | | | | | | Only reload file list after remote share accept request returnsVincent Petry2015-01-262-4/+124
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | When accepting a remote share, an ajax request is sent to the server. Only once this request returns should the file list be reloaded.
* | | | | | | Merge pull request #13694 from ↵Thomas Müller2015-01-271-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/little-bit-more-descriptive-htaccess-error Make error more descriptive
| * | | | | | | Make error more descriptiveLukas Reschke2015-01-261-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Ref https://github.com/owncloud/core/issues/13693#issuecomment-71546767
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-276-0/+12
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #13490 from owncloud/fix_reshare_s2s_shareVincent Petry2015-01-2610-68/+98
|\ \ \ \ \ \ | | | | | | | | | | | | | | use uid provided by setupfs hook to mount server2server shares
| * | | | | | certificate manager should always use a \OC\Files\View otherwise we will get ↵Bjoern Schiessle2015-01-264-19/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | problems for different primary storages
| * | | | | | certificate manager only needs the user-id, no need to pass on the complete ↵Bjoern Schiessle2015-01-266-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | user object
| * | | | | | use uid provided by setupfs hook to mount server2server shares, otherwise ↵Bjoern Schiessle2015-01-265-35/+34
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | mount will fail for public link shares
* | | | | | Merge pull request #13677 from owncloud/s2s-doubleslashrequestVincent Petry2015-01-261-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Prevent double slash in shareinfo request URL
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-04 20:58:13 +0000