35ab770b11
Close cursor early in calculateFolderSize
...
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
2014-11-28 09:35:31 +01:00
099d43b1f9
Merge pull request #13604 from owncloud/encryption-key-migration-as-repair-step
...
adding console command to migrate encryption keys - refs #13450
2015-01-29 10:30:12 +01:00
65871ffea3
[tx-robot] updated from transifex
2015-01-29 01:54:35 -05:00
659f958d01
Merge pull request #13401 from is-apps/amazon_s3_checkboxes
...
Tidy formatting of Amazon S3 checkboxes
2015-01-28 18:50:14 +01:00
41382ef7fc
Merge pull request #13667 from owncloud/rename-always-update-cache
...
Update the cache when renaming even if we dont emit hooks
2015-01-28 17:15:11 +01:00
a59612752e
Fix trash error when deleting files with the same name at the same time (happens in unit tests)
2015-01-28 15:16:55 +01:00
723f2a1cba
Merge pull request #13730 from owncloud/fix-htaccess
...
Reference module with `.c`
2015-01-28 15:07:49 +01:00
cec43df0f0
Add unit test
2015-01-28 13:44:39 +01:00
8c9f1a982c
Update the cache when renaming even if we dont emit hooks
2015-01-28 13:44:39 +01:00
20199dd168
Reference module with `.c`
...
Fixes https://github.com/owncloud/core/issues/13657
2015-01-28 13:15:32 +01:00
55142186de
[tx-robot] updated from transifex
2015-01-28 01:55:53 -05:00
1efb1fee11
Merge pull request #13700 from owncloud/dav-objecttree-required-a-collection
...
let init() take a ICollection or an INode - fixes PHP message
2015-01-28 01:14:47 +01:00
e0b0643528
Merge pull request #13704 from owncloud/issue/13571-indicate-remote-sharee-in-filelist
...
Indicate that the share owner is remote in the filelist
2015-01-28 01:06:32 +01:00
752b94d363
Merge pull request #13717 from owncloud/storage-donotwrapnullstorage
...
Prevent wrapping null storage
2015-01-28 01:00:20 +01:00
87b39e8f03
Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorage
...
Catch storage exception in scanner for remote shares
2015-01-28 00:31:37 +01:00
6d8985b671
Prevent wrapping null storage
...
Can happen when trying to instantiate external storages that have
incomplete config, where the constructor throws an exception (the
exception is caught in createStorage())
2015-01-27 17:40:08 +01:00
3fa6e0f4dc
Merge pull request #13718 from owncloud/use-proper-namespace
...
Use proper namespace
2015-01-27 17:39:35 +01:00
bedf358b40
Use proper namespace
...
IAppManager lives in OCP\App and not in OCP.
Fixes https://github.com/owncloud/core/issues/13710
2015-01-27 17:34:25 +01:00
acec40fe5a
Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix
...
Call final unlink in trash wrapper's storage
2015-01-27 17:05:38 +01:00
12867b9c78
Fix return type of addStorageWrapper in PHPDoc
2015-01-27 16:41:43 +01:00
3478634df1
Merge pull request #13707 from owncloud/extstorage-fixincompletestorageconfig
...
Allow saving incomplete external storage config
2015-01-27 16:31:59 +01:00
4d90fd933f
Merge pull request #13699 from owncloud/check-if-file-exists
...
Use `file_exists` to verify that config file exists
2015-01-27 14:16:40 +01:00
a870dbe70b
Merge pull request #13636 from owncloud/add-warning-if-restore-of-data-is-not-possible
...
Add value if restore of data is possible for a user
2015-01-27 14:12:05 +01:00
3764515365
Allow saving incomplete external storage config
...
This is needed for Dropbox and others that need a token.
2015-01-27 13:44:05 +01:00
c4b02176dc
Fix mount config unit test failures
...
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.
2015-01-27 13:44:05 +01:00
9fbeaf0fd9
Add value if restore of data is possible for a user
...
* 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
2015-01-27 13:23:19 +01:00
3f8e850dc6
Indicate that the share owner is remote in the filelist
2015-01-27 12:32:32 +01:00
9771ead7dd
Merge pull request #13701 from owncloud/disable-appcode-checker
...
disable the app code checker - some previous shipped apps cannot be inst...
2015-01-27 11:53:03 +01:00
b7cf4d551e
let init() take an INode - fixes PHP message
2015-01-27 11:31:37 +01:00
956de27e94
Merge pull request #13676 from owncloud/fix-node-iface
...
Fix node interface
2015-01-27 09:34:59 +01:00
1add2f3f58
Merge pull request #13679 from owncloud/public-disablesharejsplugin
...
Disable JS plugin for sharing in public mode
2015-01-27 09:33:38 +01:00
29f49ddc3d
Merge pull request #13691 from owncloud/s2s-acceptsinglefile
...
Only reload file list after remote share accept request returns
2015-01-27 09:32:33 +01:00
9a75304b02
disable the app code checker - some previous shipped apps cannot be installed from the appstore now 👊
2015-01-27 09:27:38 +01:00
f248ee013b
Merge pull request #13694 from owncloud/little-bit-more-descriptive-htaccess-error
...
Make error more descriptive
2015-01-27 09:15:57 +01:00
c8f58054b0
[tx-robot] updated from transifex
2015-01-27 01:54:34 -05:00
17f2cfbb9c
Use `file_exists` to verify that config file exists
...
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
2015-01-27 00:50:14 +01:00
d8559dc78f
Make error more descriptive
...
Ref https://github.com/owncloud/core/issues/13693#issuecomment-71546767
2015-01-26 23:00:15 +01:00
182b1937bb
Only reload file list after remote share accept request returns
...
When accepting a remote share, an ajax request is sent to the server.
Only once this request returns should the file list be reloaded.
2015-01-26 21:22:22 +01:00
efcd89cb18
Do not disclose share owner in public file list
2015-01-26 19:55:48 +01:00
86689ef400
Disable JS plugin for sharing in public mode
...
This removes the logic that registers the share action and modifies the
rows. Share actions aren't needed in the public file list.
2015-01-26 19:55:48 +01:00
bd888748bd
Merge pull request #13490 from owncloud/fix_reshare_s2s_share
...
use uid provided by setupfs hook to mount server2server shares
2015-01-26 19:54:14 +01:00
44d69d7178
Merge pull request #13677 from owncloud/s2s-doubleslashrequest
...
Prevent double slash in shareinfo request URL
2015-01-26 17:17:04 +01:00
5ba19ba7fc
certificate manager should always use a \OC\Files\View otherwise we will get problems for different primary storages
2015-01-26 16:58:52 +01:00
67da1f7e5a
certificate manager only needs the user-id, no need to pass on the complete user object
2015-01-26 16:58:52 +01:00
66f0db30b2
use uid provided by setupfs hook to mount server2server shares, otherwise mount will fail for public link shares
2015-01-26 16:54:50 +01:00
d5b61f9afe
Prevent double slash in shareinfo request URL
2015-01-26 16:19:38 +01:00
5376b0b123
Add back exit()
2015-01-26 16:07:28 +01:00
b8769802df
fix node interface
2015-01-26 15:58:41 +01:00
87ce64c24e
Replace OC_Log::ERROR with OCP\Util::ERROR
2015-01-26 15:51:31 +01:00
836b80919f
Merge pull request #13660 from owncloud/remove-duplicate-service-definition
...
Remove duplicated definition of APIController
2015-01-26 15:48:41 +01:00
Vincent Petry
Thomas Müller
Jenkins for ownCloud
Robin Appelman
Robin Appelman
Morris Jobke
Lukas Reschke
Bernhard Posselt
Joas Schilling
Bjoern Schiessle
Bernhard Posselt