wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
22600 commits 157 branches 562 tags 714 MiB
Commit graph

22600 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bernhard Posselt
983563d7d9 add tests for closing the cursor 2015-01-29 19:23:57 +01:00
Bernhard Posselt
37e8969d34 ignore cursorclosing 2015-01-29 19:16:28 +01:00
Jenkins for ownCloud
55142186de [tx-robot] updated from transifex 2015-01-28 01:55:53 -05:00
Morris Jobke
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
Morris Jobke
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
Morris Jobke
752b94d363 Merge pull request #13717 from owncloud/storage-donotwrapnullstorage 
Prevent wrapping null storage
 2015-01-28 01:00:20 +01:00
Morris Jobke
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
Vincent Petry
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
Bernhard Posselt
3fa6e0f4dc Merge pull request #13718 from owncloud/use-proper-namespace 
Use proper namespace
 2015-01-27 17:39:35 +01:00
Lukas Reschke
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
Vincent Petry
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
Vincent Petry
12867b9c78 Fix return type of addStorageWrapper in PHPDoc 2015-01-27 16:41:43 +01:00
Vincent Petry
3478634df1 Merge pull request #13707 from owncloud/extstorage-fixincompletestorageconfig 
Allow saving incomplete external storage config
 2015-01-27 16:31:59 +01:00
Morris Jobke
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
Lukas Reschke
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
Vincent Petry
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
Vincent Petry
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
Morris Jobke
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
Joas Schilling
3f8e850dc6 Indicate that the share owner is remote in the filelist 2015-01-27 12:32:32 +01:00
Lukas Reschke
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
Thomas Müller
b7cf4d551e let init() take an INode - fixes PHP message 2015-01-27 11:31:37 +01:00
Thomas Müller
956de27e94 Merge pull request #13676 from owncloud/fix-node-iface 
Fix node interface
 2015-01-27 09:34:59 +01:00
Thomas Müller
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
Thomas Müller
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
Thomas Müller
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
Thomas Müller
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
Jenkins for ownCloud
c8f58054b0 [tx-robot] updated from transifex 2015-01-27 01:54:34 -05:00
Lukas Reschke
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
Lukas Reschke
d8559dc78f Make error more descriptive 
Ref https://github.com/owncloud/core/issues/13693#issuecomment-71546767
 2015-01-26 23:00:15 +01:00
Vincent Petry
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
Vincent Petry
efcd89cb18 Do not disclose share owner in public file list 2015-01-26 19:55:48 +01:00
Vincent Petry
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
Vincent Petry
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
Vincent Petry
44d69d7178 Merge pull request #13677 from owncloud/s2s-doubleslashrequest 
Prevent double slash in shareinfo request URL
 2015-01-26 17:17:04 +01:00
Bjoern Schiessle
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
Bjoern Schiessle
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
Bjoern Schiessle
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
Vincent Petry
d5b61f9afe Prevent double slash in shareinfo request URL 2015-01-26 16:19:38 +01:00
Vincent Petry
5376b0b123 Add back exit() 2015-01-26 16:07:28 +01:00
Bernhard Posselt
b8769802df fix node interface 2015-01-26 15:58:41 +01:00
Vincent Petry
87ce64c24e Replace OC_Log::ERROR with OCP\Util::ERROR 2015-01-26 15:51:31 +01:00
Thomas Müller
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
f6e644b43f Catch storage exception in scanner for remote shares 
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.
 2015-01-26 13:59:49 +01:00
Thomas Müller
5da4071c45 Merge pull request #13621 from owncloud/system-config-multiset 
Add a method to set/unset multiple config values with one write
 2015-01-26 13:36:22 +01:00
Thomas Müller
9ad9d7bfbb naming fixes while reviewing 2015-01-26 12:59:25 +01:00
Vincent Petry
02b9bad81b Fix bogus deletion on copy + unlink through rename 
Cross-storage rename would cause copy + unlink. That unlink operation
must not trigger the trashbin.
 2015-01-26 12:22:22 +01:00
Joas Schilling
d6939d67da Remove duplicated definition of APIController 2015-01-26 10:20:01 +01:00
Jenkins for ownCloud
810d5a6a67 [tx-robot] updated from transifex 2015-01-26 01:54:29 -05:00
Frank Karlitschek
0f3f20d134 8.0 beta 2 2015-01-26 04:41:37 +01:00
Jenkins for ownCloud
a698637e91 [tx-robot] updated from transifex 2015-01-25 01:54:38 -05:00