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

28141 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
dc96aa3849 Merge pull request #20340 from owncloud/fix-ocs-error-code 
Revert OCS error code change from #20135
 2015-11-06 11:56:34 +01:00
Thomas Müller
cc4f4f222d Merge pull request #20348 from owncloud/issue-20303-integer-group-names 
Make sure that group names are strings not integers
 2015-11-06 11:48:40 +01:00
Thomas Müller
8047597a81 Merge pull request #20288 from owncloud/fix_20234 
make sure that we update the unencrypted size for the versions
 2015-11-06 11:17:17 +01:00
Joas Schilling
292dc553c3 Make sure that group names are strings not integers 2015-11-06 10:40:09 +01:00
Thomas Müller
bf941032a3 Merge pull request #20271 from owncloud/fix-18701 
LDAP: attempt to connect to backup server again, if main server is no…
 2015-11-06 10:01:06 +01:00
Jenkins for ownCloud
f2b19333b9 [tx-robot] updated from transifex 2015-11-06 01:55:09 -05:00
Thomas Müller
3ae5a987a7 Merge pull request #19872 from owncloud/share2.0_sharemanager 
Share2.0 sharemanager
 2015-11-05 22:34:18 +01:00
Lukas Reschke
f8d572f55d Merge pull request #20339 from owncloud/header-not-bold 
do not bold heading of update screen
 2015-11-05 17:33:09 +01:00
Joas Schilling
960c9f386d Revert OCS error code change from #20135 2015-11-05 17:01:47 +01:00
Jan-Christoph Borchardt
93f9577258 do not bold header of update screen 2015-11-05 16:36:37 +01:00
Roeland Jago Douma
532b8a1ad0 Fix oracle 2015-11-05 15:59:09 +01:00
Roeland Jago Douma
0be05fdddd Add unshare hooks 2015-11-05 15:59:09 +01:00
Roeland Jago Douma
0c566698a1 Use the old code for remote shares for now 2015-11-05 15:59:09 +01:00
Roeland Jago Douma
6624fa212a The new sharing code now handles deletion 
OCS -> ShareManager -> DefaultShareProvider
 2015-11-05 15:59:09 +01:00
Roeland Jago Douma
8b5179459a Prepare OCS Share endpoint 2015-11-05 15:59:09 +01:00
Roeland Jago Douma
9567fa1194 Initial setup of shareing 2.0 sharemanager and share 
* Added sharemanager class

This is the central class where all API calls talk to (OCS/Activity).
This in turn talks to the share providers to get the actual sharing
done.

It uses all ShareObjects

* Added share class

Simple class to hold all the share properties that is passed around

* Added IShareProvider interface

Interface that providers os a share have to implement.
 2015-11-05 15:59:08 +01:00
Thomas Müller
e28daf2b37 Merge pull request #20273 from owncloud/sharing-api-adding-tests 
Adding more tests to the sharing API.
 2015-11-05 15:58:09 +01:00
Thomas Müller
7969f79a78 Merge pull request #20325 from owncloud/subadmin-handle-null 
subadmin methods should not return any null user or group
 2015-11-05 14:30:42 +01:00
Sergio Bertolín
eec7d2764c Merge branch 'master' into sharing-api-adding-tests 2015-11-05 12:43:22 +01:00
Arthur Schiwon
51ead4e59b subadmin methods should not return any null user or group 2015-11-05 11:50:57 +01:00
Thomas Müller
8bffc84766 Merge pull request #20301 from owncloud/fix-files_external-empty-user-mounting 
[files_external] fix empty user mounts setting
 2015-11-05 11:36:36 +01:00
Sergio Bertolin
1a51d4c4c7 Added changes in the verification of sharing get responses 2015-11-05 09:10:46 +00:00
Thomas Müller
6e7461f64c Merge pull request #20320 from owncloud/drop-file_map 
Drop unused table file_map
 2015-11-05 10:03:41 +01:00
Thomas Müller
5eec9f4068 Merge pull request #20321 from owncloud/drop-principal-tables 
Drop unused tables principalgroups and principals
 2015-11-05 10:02:39 +01:00
Morris Jobke
3778680f3f Drop unused tables principalgroups and principals 
* was removed in 3e84f170e7
 2015-11-05 08:40:21 +01:00
Morris Jobke
6b6f19bb94 Drop unused table file_map 
* used only for windows support
* windows support was dropped in 8.2.0 - see #17379
* was introduced in fd8cb9974b
* ref #18935
 2015-11-05 08:21:53 +01:00
Jenkins for ownCloud
2f4fa5b49c [tx-robot] updated from transifex 2015-11-05 01:55:14 -05:00
Thomas Müller
b23159fa5e Merge pull request #20315 from owncloud/add-coverity 
Add coverity badge
 2015-11-04 23:28:28 +01:00
Thomas Müller
ba02a3771b Merge pull request #20053 from owncloud/getfileinfo-locking 
Don't lock if we're only reading cache metadata
 2015-11-04 22:40:17 +01:00
Lukas Reschke
5a9f5ef902 Add coverity badge 
Coverity now scans our JS code…
 2015-11-04 22:36:35 +01:00
Robin Appelman
a2cfbd975a mark path as checked 2015-11-04 16:34:39 +01:00
Morris Jobke
05359e384e Merge pull request #20300 from owncloud/fix_comment 
adjust comment, this parameter was added for 9.0
 2015-11-04 16:17:17 +01:00
Morris Jobke
2a35ecb9ba [files_external] fix empty user mounts setting 
* fixes #19858
* if no backend is allowed to be mounted also the user mount setting should be disabled
 2015-11-04 15:47:03 +01:00
Björn Schießle
d1a090e3e2 adjust comment, this parameter was added for 9.0 2015-11-04 15:12:22 +01:00
Robin Appelman
c487f0f138 when a file is locked use old cache data 2015-11-04 14:45:10 +01:00
Thomas Müller
bb216feeb2 Merge pull request #18361 from owncloud/sharing_performance_improvements 
improve calculation of share recipients
 2015-11-04 14:44:31 +01:00
Sergio Bertolin
3b7690f842 added test for deleting a share 2015-11-04 13:42:14 +00:00
Robin Appelman
0a56313ca4 fix whitespace 2015-11-04 14:41:03 +01:00
Morris Jobke
09436e95c4 Merge pull request #20155 from owncloud/fix-20020 
add port to host only, if an URL is used instead of a plain hostname
 2015-11-04 14:02:43 +01:00
Sergio Bertolin
0593381522 Added general function to create shares in preconditions. 2015-11-04 12:16:00 +00:00
Arthur Schiwon
8eeaf11d41 add port to host only, if an URL is used instead of a plain hostname 2015-11-04 12:34:30 +01:00
Arthur Schiwon
253e4bcf63 integration tests 2015-11-04 12:26:21 +01:00
Thomas Müller
475b52c93b Merge pull request #20283 from owncloud/fix-varaible-type 
Fix typo in variable name
 2015-11-04 11:10:48 +01:00
Björn Schießle
6d0a324144 make sure that we update the unencrypted size for the versions 2015-11-04 10:59:05 +01:00
Thomas Müller
c59ca9203d Merge pull request #18821 from owncloud/global-classes 
Global classes in core CSS
 2015-11-04 10:30:10 +01:00
Thomas Müller
b162761124 Merge pull request #20157 from owncloud/users-fixeveryonecount 
Fix everyone count for subadmins
 2015-11-04 10:28:56 +01:00
Thomas Müller
ed0da94d3b Merge pull request #20272 from owncloud/phil-davis-setEncryptHomeStorage 
Correct the description of function setEncryptHomeStorage
 2015-11-04 10:27:54 +01:00
Morris Jobke
cc9695ea41 Fix typo in variable name 
* introduced with #20135 - c6f6a8758b

Fixes following error meessage:

{"reqId":"GliKwPFSIVn8GC2KNIHY","remoteAddr":"::1","app":"PHP","message":"Undefined variable: subAdmins at master\/settings\/users.php#76","level":0,"time":"2015-11-04T08:38:53+00:00","method":"GET","url":"\/master\/index.php\/settings\/users"}
{"reqId":"GliKwPFSIVn8GC2KNIHY","remoteAddr":"::1","app":"PHP","message":"Invalid argument supplied for foreach() at master\/settings\/users.php#76","level":0,"time":"2015-11-04T08:38:53+00:00","method":"GET","url":"\/master\/index.php\/settings\/users"}
 2015-11-04 09:44:19 +01:00
Morris Jobke
18f0bafd88 fix subadmin user count for empty groups 2015-11-04 09:39:51 +01:00
Bjoern Schiessle
4719305e3b cache result from parent folders 2015-11-04 09:27:29 +01:00