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

29493 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
0161928fc3 Add check for .well-known URL in the root of the webservers URL 
* fixes #20012
 2016-01-08 23:27:29 +01:00
Morris Jobke
a259effc7d Merge pull request #19676 from owncloud/fix_15253 
Make sure that permissions stay in sync for share_type 2
 2016-01-08 21:37:12 +01:00
Roeland Jago Douma
17a066c18e Properly close db cursors 2016-01-08 20:27:01 +01:00
Roeland Jago Douma
629bac22fd Make sure to respect deleted group shares by user 2016-01-08 20:27:01 +01:00
Roeland Jago Douma
c882d46e5f Moved to the query builder 
Anything to keep Lukas happy
 2016-01-08 20:27:01 +01:00
Roeland Jago Douma
066e3770bb Make sure that permissions stay in sync for share_type 2 
When a file/folder is shared with a group and one of the group members
moves this file/folder an extra entry is created in the share table.

When the permission of the group share is updated we used to only
sometimes update the shares for individual users.

* Added intergration tests
 2016-01-08 20:27:01 +01:00
Thomas Müller
d7d0cfc775 Merge pull request #21008 from owncloud/UoM-ResPlat-DevOps-swift-acl-shared-containers 
Allowing access to Swift containers shared by ACL
 2016-01-08 20:13:13 +01:00
Thomas Müller
ea227aadf2 Merge pull request #20961 from owncloud/provis-api-group-special-char 
Remove unnecessary group name validation in provisioning_api
 2016-01-08 20:11:20 +01:00
Thomas Müller
1f21f0eb73 Merge pull request #21491 from owncloud/webdav_auth_no_basic_auth 
Also allow 'only cookie' auth to webdav
 2016-01-08 20:09:16 +01:00
Thomas Müller
2659661cb0 Merge pull request #21546 from owncloud/jsunit-stubportinpublicappspec 
Fix public page URL JS test
 2016-01-08 20:08:01 +01:00
Thomas Müller
977e104cd4 Merge pull request #21553 from owncloud/gwdg-master 
Respect user enumeration
 2016-01-08 18:21:15 +01:00
Thomas Müller
dfbb24aa92 Merge pull request #21458 from owncloud/login-gradient 
add back gradient for log in page in Firefox, fix accidental removal
 2016-01-08 18:20:54 +01:00
Thomas Müller
37265fd094 Merge pull request #21467 from owncloud/external-status-check-userglobal 
Fix checking external storage status as non admin user
 2016-01-08 18:19:48 +01:00
Thomas Müller
5618e9a8b1 Merge pull request #21468 from owncloud/getmount-id-filter 
Filter getStorage to make sure the user has access to it
 2016-01-08 18:19:28 +01:00
Thomas Müller
756876b5dc Merge pull request #21548 from owncloud/issue-21511-correctly-display-notify-option-for-shares 
Check the correct config for displaying the "notify by email" option
 2016-01-08 18:19:09 +01:00
Thomas Müller
173c1640c0 Merge pull request #21540 from owncloud/group-principals 
Adding group principals to new dav endpoint
 2016-01-08 18:18:57 +01:00
Thomas Müller
6ab5ad0593 Merge pull request #21447 from owncloud/leave-disabled-apps-off 
Only enable apps that are not intentionally disabled
 2016-01-08 18:17:15 +01:00
Thomas Müller
3de81be692 Merge pull request #21494 from owncloud/underscores-in-class-names 
Remove underscores from class names - part 1
 2016-01-08 18:11:25 +01:00
Thomas Müller
0f281cdd30 Merge pull request #21286 from owncloud/use-owncloud-mail-when-sending-caldav-schedule-mails 
Adding IMip scheduling which uses ownClouds mail delivery
 2016-01-08 17:58:33 +01:00
Thomas Müller
eba46f5d2e Merge pull request #21538 from owncloud/remove-csp-stuff 
Remove CSP stuff from .htaccess
 2016-01-08 17:44:20 +01:00
Thomas Müller
e60dddf57d Merge pull request #21479 from owncloud/fix-broken-state-in-htaccess-test 
Remove unneeded check if htaccess test file already exists
 2016-01-08 15:53:16 +01:00
Ralph Krimmel
26d0f42dac Respect user enumeration 
Respect shareapi_allow_share_dialog_user_enumeration in user_ldap filter
generation function to increase search performance in sharing dialog.
 2016-01-08 15:32:31 +01:00
Thomas Müller
bb01efdcbd Adding unit tests for SystemPrincipalBackend 2016-01-08 15:31:33 +01:00
Robin Appelman
88bfe1477d Filter getStorage to make sure the user has access to it 2016-01-08 15:30:45 +01:00
Joas Schilling
334a6d57a3 Check the correct config for displaying the "notify by email" option 2016-01-08 14:15:06 +01:00
Thomas Müller
427dbdabba Merge pull request #21215 from owncloud/files_external-db-set-mountpoint 
fix setting mountpoint and auth backend of external storages
 2016-01-08 13:36:30 +01:00
Thomas Müller
0f5132552c Merge pull request #21292 from owncloud/checkAppEnabled-not-needed-anymore 
core will handle invalid URLs and redirects properly
 2016-01-08 13:36:11 +01:00
Thomas Müller
5380215dca Merge pull request #21536 from owncloud/avatar_verify_posted_path 
Verify the path is a file on avatar update
 2016-01-08 13:35:46 +01:00
Tom Needham
3327857c1a Update log message when error occurs during addGroup 2016-01-08 13:35:00 +01:00
Roeland Jago Douma
1af3bca720 Fix provisioning API unit test 2016-01-08 13:35:00 +01:00
Tom Needham
673a8a1e4a Remove unnecessary group name validation 2016-01-08 13:35:00 +01:00
Vincent Petry
9b595474af Fix public page URL JS test 
Stub the port so it doesn't use the one configured by karma
 2016-01-08 13:25:38 +01:00
Robin Appelman
a696d6c561 Fix checking external storage status as non admin user 2016-01-08 12:42:22 +01:00
Thomas Müller
074a7fd475 Merge pull request #21027 from owncloud/fix-undefined-behaviour 
Fix PHPDoc + Add handling for error cases
 2016-01-08 12:35:26 +01:00
Thomas Müller
71999ef820 Merge pull request #21139 from owncloud/makeswifturltypeconfigurable 
make url type configurable
 2016-01-08 12:34:58 +01:00
Thomas Müller
70b58cf367 Merge pull request #17924 from owncloud/ldap-fix-appending-port 
ensure an LDAP URL is used, append the port to the host URL when necessary, and just in one place
 2016-01-08 12:34:15 +01:00
Thomas Müller
b3550db02d Adding IMip scheduling which uses ownClouds mail delivery 2016-01-08 12:21:41 +01:00
Thomas Müller
2c76b77c76 Merge pull request #21510 from owncloud/sabre-dav-3.0.6 
[3rdparty] Bump sabre/dav to 3.0.6
 2016-01-08 12:20:43 +01:00
Thomas Müller
f9c08112da Adding group principals to new dav endpoint 2016-01-08 12:11:02 +01:00
Robin Appelman
68bd003e4b correctly set applicables when updating user storage 2016-01-08 11:54:32 +01:00
Robin Appelman
8da3c3f125 update tests 2016-01-08 11:54:32 +01:00
Robin Appelman
3895ab8451 improve setting applicable for personal mounts 2016-01-08 11:54:31 +01:00
Robin Appelman
ab549970ca fix setting mountpoint and auth backend of external storages 2016-01-08 11:54:31 +01:00
Tim Dettrick
8799d5563f Allowing access to Swift containers shared by ACL 
To avoid a confusing extra field, the bucket field is overloaded to
optionally take a URL.
 2016-01-08 11:42:28 +01:00
Lukas Reschke
28165876fc Remove CSP stuff from .htaccess 
😢 Seems like Apache is inconsistent fun between versions. Let's remove it thus for now.
 2016-01-08 11:31:42 +01:00
Roeland Jago Douma
791c7a6dcc Bump vobject version in carddav unittest 2016-01-08 11:30:28 +01:00
Roeland Jago Douma
5969d41890 [3rdparty] Bump sabre/dav to 3.0.6 2016-01-08 11:30:24 +01:00
Lukas Reschke
48ae3997d4 Merge pull request #21220 from owncloud/remove-to-make-apache24-happy 
Use setifempty to please incompatible httpd versions
 2016-01-08 11:19:38 +01:00
Jörn Friedrich Dreyer
047008e9e3 always check if the csp is empty 2016-01-08 11:08:38 +01:00
Lukas Reschke
1ae30d1d9c Use setifempty to please incompatible httpd versions 
Some httpd versions have problem with the old logic leading to resourced served with multiple headers.
 2016-01-08 11:08:37 +01:00