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

22629 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
5b4fd12b5b add CSS to exception page - fixes #13747 2015-01-29 20:18:08 +01:00
Morris Jobke
b1d8d88df8 Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares 
make sure that we always create a public share key for remote shares
 2015-01-29 17:54:04 +01:00
Joas Schilling
333f4e7913 Fix intendation 2015-01-29 16:57:46 +01:00
Joas Schilling
4a5f626979 Fix more assertions 2015-01-29 16:54:27 +01:00
Joas Schilling
9a7dd57bc8 Fix 2 assertions 2015-01-29 16:09:35 +01:00
Thomas Müller
5c8e5e223d Merge pull request #13728 from owncloud/federated_cloud 
rename 'server-to-server sharing' to 'federated cloud'
 2015-01-29 15:54:19 +01:00
Lukas Reschke
65ec950b27 Merge pull request #13757 from owncloud/issue/13686-scroll-to-file-when-using-searchotherplaces 
Scroll to file in folder, when using "search in other places" link
 2015-01-29 15:36:25 +01:00
Bjoern Schiessle
8a091629dc rename 'server-to-server sharing' to 'federated cloud' 2015-01-29 15:05:39 +01:00
Björn Schießle
2c1bacadca Merge pull request #13762 from owncloud/ignore_trailing_slash 
ignore trailing slash for remote URL
 2015-01-29 15:00:44 +01:00
Morris Jobke
acf0582029 Merge pull request #13752 from owncloud/closecursor1 
Close cursor early in calculateFolderSize
 2015-01-29 14:23:16 +01:00
Bjoern Schiessle
c78e3c4a7f make sure that we always create a public share key for remote shares 2015-01-29 14:23:14 +01:00
Morris Jobke
a685354aee Merge pull request #13682 from owncloud/webdav-single-file-put 
Fix WebDAV put for single file shares
 2015-01-29 14:19:27 +01:00
Bjoern Schiessle
82de50d5b9 remove trailing slash 2015-01-29 14:03:09 +01:00
Thomas Müller
a25063a8ed Merge pull request #13746 from owncloud/no-groups-provisioning-api 
disallow provisioning api to be enabled for groups only
 2015-01-29 12:47:54 +01:00
Robin Appelman
05035ef4af Fix webdav put for single file webdav shares 2015-01-29 12:47:12 +01:00
Robin Appelman
ddee63fa00 Fix resolving paths for views rooted in a file 2015-01-29 12:47:11 +01:00
Joas Schilling
54303484eb Scroll to file in folder, when using "search in other places" link 2015-01-29 12:21:20 +01:00
Thomas Müller
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
Thomas Müller
f60406102f disallow provisioning api to be enabled for groups only 2015-01-29 10:00:54 +01:00
Jenkins for ownCloud
65871ffea3 [tx-robot] updated from transifex 2015-01-29 01:54:35 -05:00
Thomas Müller
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
Robin Appelman
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
Robin Appelman
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
Morris Jobke
723f2a1cba Merge pull request #13730 from owncloud/fix-htaccess 
Reference module with `.c`
 2015-01-28 15:07:49 +01:00
Robin Appelman
cec43df0f0 Add unit test 2015-01-28 13:44:39 +01:00
Robin Appelman
8c9f1a982c Update the cache when renaming even if we dont emit hooks 2015-01-28 13:44:39 +01:00
Lukas Reschke
20199dd168 Reference module with .c 
Fixes https://github.com/owncloud/core/issues/13657
 2015-01-28 13:15:32 +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