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

12691 commits

Author SHA1 Message Date
Lukas Reschke
59ebad0b53 Use an actual 16 byte long IV 
The previous IV was actually 12 byte extended to 16 byte using base64. As the encrypted file should be fine with containing binary data as well we can simply remove the encoding like that here.
 2016-02-09 23:43:24 +01:00
Lukas Reschke
d25b8dacb3 Use AES-256-CTR as default 
CTR is recommended over CFB mode.
 2016-02-09 23:43:24 +01:00
Thomas Müller
4cfb7ca7dd Merge pull request #22255 from owncloud/add-sso-for-updatechecker 
Add SSO for updater application
 2016-02-09 23:37:32 +01:00
Thomas Müller
57ef23dadf Merge pull request #22251 from owncloud/smb-105 
update icewind/smb to 1.0.5
 2016-02-09 23:37:09 +01:00
C. Montero Luque
f64dbc67c6 Merge pull request #20928 from owncloud/publicdav-check-permissions 
Check that the owner of a link share still has share permissions on access
 2016-02-09 22:01:08 +01:00
C. Montero Luque
962d0c3290 Merge pull request #22252 from owncloud/consolidate-user-set-quota 
Consolidate getQuota and setQuota methods in User instance
 2016-02-09 22:00:24 +01:00
Lukas Reschke
b9e3ed1468 Add SSO for updater application 
Allows logging-in into the updater application by visiting the admin panel and pressing "Open updater".
 2016-02-09 20:28:30 +01:00
Arthur Schiwon
d19c47a381 More fixed tests :) 2016-02-09 18:11:30 +01:00
Lukas Reschke
abc675d87e Move update notification code into app 
Moves the update notification code in a single app. This is required since we want to use SSO for the new updater and for this have some code running in ownCloud as well (and we don't want that in core neccessarily). This app can provide that in the future, right now it's only the update notification itself. Will continue working on the SSO right away but wanted to keep the PR small.

Furthermore also makes some more code unit-testable...
 2016-02-09 18:05:51 +01:00
Arthur Schiwon
3a796d1e15 Consolidate getQuota and setQuota methods in User instance 2016-02-09 17:16:43 +01:00
Robin Appelman
3982c8f87a update icewind/smb to 1.0.5 2016-02-09 17:09:30 +01:00
Thomas Müller
2982017682 Merge pull request #22228 from owncloud/comments-limit-message 
Limit comment message to 1k chars
 2016-02-09 16:35:23 +01:00
Thomas Müller
d89ddba3a2 Merge pull request #22241 from owncloud/more-info-in-case-of-trusted-server-add 
Forward exception message to the admin in case of errors and in case …
 2016-02-09 16:11:18 +01:00
Thomas Müller
81d4042af4 Adjust command description 2016-02-09 15:42:41 +01:00
Thomas Müller
10b9bf15f4 Set share owner and share initiator on upate as well 2016-02-09 15:41:06 +01:00
Thomas Müller
cbb7934fb3 Introduce console command to transfer ownerships of files - refs #19154 2016-02-09 15:41:06 +01:00
Thomas Müller
4659bf9b4a Merge pull request #22234 from owncloud/systemtags-filter-intersect-empty 
Fix system tag filter AND condition
 2016-02-09 15:34:06 +01:00
Thomas Müller
1199b539f2 Merge pull request #21773 from owncloud/files_external-list-authtype 
Show the proper auth identifier when listing mounts as json
 2016-02-09 15:33:47 +01:00
Thomas Müller
232bb75329 Merge pull request #21893 from owncloud/migrate-calendars 
Migrate calendars
 2016-02-09 15:14:33 +01:00
Robin Appelman
acd8c72d3d add tests 2016-02-09 15:03:00 +01:00
Roeland Jago Douma
359c62d90e Fix unit tests 2016-02-09 15:03:00 +01:00
Robin Appelman
f9f2800016 check share permissions in share controller 2016-02-09 15:03:00 +01:00
Robin Appelman
fd9166488b Check that the owner of a link share still has share permissions on access 2016-02-09 15:02:34 +01:00
Thomas Müller
bc8632856a Forward exception message to the admin in case of errors and in case the remote server version is to low and appropriate message is displayed as well 2016-02-09 14:41:26 +01:00
Arthur Schiwon
bbc86e0756 on DAV throw Bad Request if provided message is too long 2016-02-09 13:59:13 +01:00
Thomas Müller
a6ade67dfb Merge pull request #22197 from owncloud/files-filterbysystemtags 
Add file list filter to filter by system tags
 2016-02-09 13:31:00 +01:00
Thomas Müller
9639981041 Merge pull request #22202 from owncloud/global-auth-no-user 
handle no user set for personal global auth
 2016-02-09 13:30:41 +01:00
Thomas Müller
6474866aff Merge pull request #22225 from owncloud/sharing-moar-hooks 
More sharing hooks for extended auditing
 2016-02-09 13:30:22 +01:00
Joas Schilling
e8d9c288bc Stop when a mid result is empty 2016-02-09 12:07:30 +01:00
Joas Schilling
178914104c Add a test for empty mid-result 2016-02-09 12:07:17 +01:00
Vincent Petry
3028684d89 Fix system tag filter AND condition 
If one of the results is empty, no need to do array_intersect and return
an empty result directly.
 2016-02-09 11:39:22 +01:00
Vincent Petry
847a2426b8 Fix unit tests for system tag filter section 2016-02-09 11:22:05 +01:00
Thomas Müller
bf3a843e89 Migration of calendars 2016-02-09 11:20:31 +01:00
Vincent Petry
e378a757ff Add system tags filter section for files app 2016-02-09 10:59:29 +01:00
Roeland Jago Douma
623a0e4637 Example hook check 2016-02-09 10:36:44 +01:00
Roeland Jago Douma
38cbfed476 Fix unit test 2016-02-09 10:20:25 +01:00
Thomas Müller
98497aa423 Merge pull request #22199 from owncloud/multiple_checksums 
Make checksum propfind future proof
 2016-02-09 09:10:32 +01:00
Thomas Müller
bfa404b441 Merge pull request #22217 from owncloud/fix_22215 
Federates shares have to set a file_target
 2016-02-09 09:10:17 +01:00
Jenkins for ownCloud
e749a02e6b [tx-robot] updated from transifex 2016-02-09 01:55:36 -05:00
Arthur Schiwon
cd68500731 throw hooks when accessing a link share 2016-02-09 00:34:10 +01:00
Vincent Petry
ae367c7e97 Fix elementToFile to also return path when defined 
Fixes issue when opening the share dialog for a file inside the favorite
list, and the file is from a subfolder
 2016-02-08 22:33:39 +01:00
Thomas Müller
b77a4b0c6a Merge pull request #22112 from owncloud/dav-filesreport 
Provide REPORT method on files DAV to filter/search files
 2016-02-08 21:41:40 +01:00
Thomas Müller
75bbd4f8b6 Merge pull request #22211 from owncloud/versions-hook-info 
versions provide more information when throwing hooks
 2016-02-08 21:06:03 +01:00
Vincent Petry
2f1a60a64d Add REPORT on files endpoint for filtering 
For now only supports filtering by system tags
 2016-02-08 21:04:53 +01:00
Roeland Jago Douma
7f2cb6ab60 Federates shares have to set a file_target 
The old code path is still used to get the sharing info in the webui.
This requires the file_target to be set. This does not mean anything
for federated shares.

Fixes #22215
 2016-02-08 18:30:51 +01:00
Arthur Schiwon
d2d6644702 use int values and constants instead of strings 2016-02-08 18:16:27 +01:00
Thomas Müller
698a6b07a8 Merge pull request #22206 from owncloud/share2_migration_with_federated 
Update the migration step to include federated shares
 2016-02-08 17:58:26 +01:00
Thomas Müller
703f3551dc Only set the header if the node exists and in case the request is a GET 2016-02-08 17:49:25 +01:00
Lukas Reschke
2cad9d2b8c Serve files with an attachment disposition for new DAV endpoint 
This adds a `Content-Disposition: attachment` header to all files served via the DAV endpoint.
 2016-02-08 17:08:34 +01:00
Arthur Schiwon
b6e03fe261 versions provide more information when throwing hooks 2016-02-08 16:33:49 +01:00
Robin Appelman
87179eaae2 Add tests 2016-02-08 15:53:46 +01:00
Thomas Müller
33eed35ae4 Merge pull request #21817 from owncloud/support-old-carddav-endpoint 
Adding pre oc 9.0 CardDAV endpoint for migration of old clients
 2016-02-08 15:46:38 +01:00
Thomas Müller
acc7d63a69 Merge pull request #22164 from owncloud/files_external-verify 
Add occ command to verify storage configurations
 2016-02-08 15:21:07 +01:00
Roeland Jago Douma
3c4e511792 Update the migration step to include federated shares 
Now federated shares will also be updated to the flat
reshare model.
 2016-02-08 15:11:48 +01:00
Thomas Müller
cf1f92cc12 Merge pull request #22080 from owncloud/fed_share_provider 
implementation of the federated share provider
 2016-02-08 14:12:20 +01:00
Robin Appelman
b95e388526 Add occ command to verify storage configurations 2016-02-08 14:07:58 +01:00
Robin Appelman
678a3abf6d handle no user set for personal global auth 2016-02-08 13:45:52 +01:00
Roeland Jago Douma
5486a2b149 For possible future usage allow multiple checksums 
Instead of returning

<oc:checksum>TYPE:CHECKSUM</oc:checksum>

Return

<oc:checksums>
  <oc:checksum>TYPE:CHECKSUM</oc:checksum>
</oc:checksums>

This will allow us to expand in the future to multiple checksums.
Without doing just string concatenation.

And even for a single checksum it is now correct.
 2016-02-08 11:55:07 +01:00
Lukas Reschke
7199ea2f5e Fix PHPDoc 2016-02-08 11:36:58 +01:00
Thomas Müller
c1ae8b0d81 Adding common name to sharee 2016-02-08 11:36:57 +01:00
Thomas Müller
5b86148d3a Original resources should not be overwritten by shared resources 2016-02-08 11:36:57 +01:00
Roeland Jago Douma
2f6ffdbce5 Added tests for used parts 2016-02-08 11:30:48 +01:00
Roeland Jago Douma
a506f9ca3f Respect not allowing outgoing shares 2016-02-08 11:30:48 +01:00
Roeland Jago Douma
bec1de8a38 Update OCS Share API to use federated share provider 2016-02-08 11:30:48 +01:00
Bjoern Schiessle
9079388e02 implementation of the federated share provider 2016-02-08 11:30:48 +01:00
Thomas Müller
6a550d44e9 Fix path 2016-02-08 10:52:30 +01:00
Thomas Müller
0c9a469f74 Adding pre oc 9.0 CalDAV endpoint for migration of old clients 2016-02-08 10:52:30 +01:00
Thomas Müller
a67f7ad1f3 Remove calendar-proxy support - did this ever work? 2016-02-08 10:52:30 +01:00
Thomas Müller
cca2ade199 Adding pre oc 9.0 CardDAV endpoint for migration of old clients 2016-02-08 10:52:30 +01:00
Thomas Müller
9eef38c593 Merge pull request #22190 from owncloud/fix_22189 
Even single shares are returned as array
 2016-02-08 10:47:55 +01:00
Roeland Jago Douma
ca32778975 Even single shares are returned as array 
When fetching a single share using ../shares/<ID> we should still return
an array of shares.

Fixes #22189
 2016-02-08 10:11:22 +01:00
Vincent Petry
78864dc6fa Collapse long comments 
Very crude a naive implementation that relies on length and number of
newlines. Should be good enough for most cases.

Clicking on such comments will expand them.
 2016-02-08 10:05:03 +01:00
Thomas Müller
83b4e2c8d1 Merge pull request #22160 from owncloud/files_external-create 
Add occ files_external:create command to add new mounts
 2016-02-08 09:58:43 +01:00
Jenkins for ownCloud
4130639a7e [tx-robot] updated from transifex 2016-02-08 01:54:46 -05:00
Jenkins for ownCloud
feb0522cd0 [tx-robot] updated from transifex 2016-02-07 01:55:33 -05:00
Thomas Müller
69a4cd2898 Merge pull request #22102 from owncloud/ldap_2nddispname-master 
[LDAP] add second field for additional/optional display name attribute
 2016-02-06 13:27:01 +01:00
Thomas Müller
5832178f59 Merge pull request #22139 from owncloud/comments-files-cleanup 
cleanup jobs for comments and comment read marks
 2016-02-06 13:26:00 +01:00
Thomas Müller
7297408150 Merge pull request #22163 from owncloud/comments-sizelimit 
Limit comment size to 1000 in UI
 2016-02-06 13:25:38 +01:00
Thomas Müller
7141c70cd0 Merge pull request #20618 from owncloud/action-icon-size 
Fix image sizing for action icons in Edge
 2016-02-06 13:25:10 +01:00
Thomas Müller
079ebe2be6 Merge pull request #22165 from owncloud/comments-markowncommentasread 
Mark own comments as read after posting
 2016-02-06 13:22:20 +01:00
Jenkins for ownCloud
9fa09b67e6 [tx-robot] updated from transifex 2016-02-06 01:55:36 -05:00
Joas Schilling
065141f6f4 Move casting to IExpressionBuilder 2016-02-05 21:26:30 +01:00
Thomas Müller
7568c40275 Merge pull request #22159 from owncloud/fix_21678 
Gracefull handle link shares rename hook
 2016-02-05 16:36:04 +01:00
Vincent Petry
d2a495f190 Mark own comments as read after posting 2016-02-05 16:30:37 +01:00
Robin Appelman
96b592b45b output mount id on create 2016-02-05 15:54:19 +01:00
Robin Appelman
16ad612c83 verify that the auth backend is valid for the storage backend 2016-02-05 15:51:38 +01:00
Robin Appelman
239cdd099a list supported auth backends for storage backends 2016-02-05 15:48:10 +01:00
Vincent Petry
142a2dd2eb Limit comment size to 1000 in UI 
Whenever the limit is almost reached (90% of the length), a tooltip will
appear.

Once the limit is exceeded, the "Post" button will be disabled and the
field will become red.
 2016-02-05 15:45:30 +01:00
Arthur Schiwon
9d2c433b24 fix pgsql 2016-02-05 15:36:21 +01:00
Arthur Schiwon
d537cae063 cleanup jobs for comments and comment read marks 2016-02-05 15:36:21 +01:00
Thomas Müller
0196f0e546 Merge pull request #22157 from owncloud/use-https-instead-of-http 
Use HTTPS instead of HTTP
 2016-02-05 14:31:40 +01:00
Robin Appelman
54d2175bf5 Add occ files_external:create command to add new mounts 2016-02-05 14:20:22 +01:00
Roeland Jago Douma
f4edfb6dfb Gracefull handle link shares rename hook 
Fixes #21678

The hook is called on all renames. However when we use a link share
the getUserFolder fails. We now just opt out.
 2016-02-05 13:57:57 +01:00
Thomas Müller
e15a120f83 Merge pull request #22152 from owncloud/activities-for-comments 
Activities for comments
 2016-02-05 13:50:38 +01:00
Lukas Reschke
35e4acbc1f Use HTTPS instead of HTTP 
This is now supported by github.io
 2016-02-05 13:05:04 +01:00
Joas Schilling
733db5c14a Add a filter for comment activities 2016-02-05 11:30:53 +01:00
Joas Schilling
070ff71a2d Add activities for comments 2016-02-05 11:30:53 +01:00
Thomas Müller
342c2aac98 Merge pull request #20920 from owncloud/issue_20888 
Add dialog to enter credentials on errored mount point
 2016-02-05 10:05:23 +01:00
Thomas Müller
96ccbca2e3 Merge pull request #22135 from owncloud/global-auth-warning 
fix warning caused by global auth
 2016-02-05 10:04:22 +01:00
Jenkins for ownCloud
0ed2108b7f [tx-robot] updated from transifex 2016-02-05 01:56:20 -05:00
Vincent Petry
d4da2f0ac7 Improve credentials dialog usability a bit 
Automatically focus on the first field.
Pressing enter submits the form.
 2016-02-04 17:18:21 +01:00
Robin Appelman
b7d27ab141 fix warning caused by global auth 2016-02-04 16:53:13 +01:00
Robin Appelman
d83b1f3b8b fix error code for unconfigured user provided auth 2016-02-04 16:47:41 +01:00
Robin Appelman
b12d449ec7 set read permissions on failed mount root 2016-02-04 16:41:27 +01:00
Robin Appelman
e420ae068c handle exception in availibilty check 2016-02-04 16:33:08 +01:00
Robin Appelman
53fbaf70c0 fix input type 2016-02-04 16:33:08 +01:00
Robin Appelman
2e3a5ccaaa show failed external storages properly 2016-02-04 16:33:08 +01:00
Robin Appelman
4b4bf87f95 Use handlebars template 2016-02-04 16:33:08 +01:00
Jesús Macias
7162d66373 Fix PR from comments 2016-02-04 16:33:08 +01:00
Jesús Macias
8fa96435b0 Add credentials dialog for user provided auth 2016-02-04 16:33:08 +01:00
Thomas Müller
089b60cd25 Merge pull request #22107 from owncloud/external-auth-global 
Add global auth backend for files external
 2016-02-04 16:18:23 +01:00
Robin Appelman
76d9586339 add tests 2016-02-04 16:14:17 +01:00
Robin Appelman
71992f9d29 update import logic for the new export logic 2016-02-04 15:31:05 +01:00
Robin Appelman
e3eda917ef Show the proper auth identifier when listing mounts as json 2016-02-04 15:31:05 +01:00
Thomas Müller
52ce83993d Merge pull request #22124 from owncloud/comments-author-check 
Check for authorship on edit attempt
 2016-02-04 15:16:33 +01:00
Robin Appelman
9dfe9f77f2 Add global auth backend for files external 2016-02-04 14:57:17 +01:00
Thomas Müller
899444103a Merge pull request #22121 from owncloud/comments-deleteduser 
Special label for deleted users in comments list
 2016-02-04 13:03:18 +01:00
Arthur Schiwon
a480b2261b Check for authorship on edit and delete attempts 2016-02-04 12:57:48 +01:00
Thomas Müller
cd16ba5cb3 Merge pull request #22025 from owncloud/21838-jenkins 
[jenkins] + rebased, of #21838
 2016-02-04 11:58:45 +01:00
Vincent Petry
2e46576e83 Special label for deleted users in comments list 2016-02-04 11:26:11 +01:00
Thomas Müller
e64044d43e Merge pull request #21964 from owncloud/calendar-sharing-3 
Add calendar sharing
 2016-02-04 10:48:36 +01:00
Thomas Müller
6a5b0eafa5 Merge pull request #22108 from owncloud/comments-edit 
Comment owner can now edit or delete
 2016-02-04 10:47:49 +01:00
Jenkins for ownCloud
a022584e4a [tx-robot] updated from transifex 2016-02-04 01:55:08 -05:00
Arthur Schiwon
e370b601db fix unit tests 2016-02-03 22:45:33 +01:00
alexweirig
cd19b648c6 change error logging 
replaced variable with print_r call
 2016-02-03 21:50:27 +01:00
alexweirig
f4d4bed10b Fixed undefined variable $dnGroup and variable name 
I renamed $memberURL into $dynamicGroup and print that variable in the writeLog.

I think this makes more sense.
 2016-02-03 21:50:27 +01:00
alexweirig
39aac2c66b Refactored code to avoid performance problem 
Moved the dynamic group processing to the top and removed condition in memberOf processing.

Also, changed variable name $value to $memberUrl
 2016-02-03 21:50:27 +01:00
Alex Weirig
0d797637f3 code changes for user_ldap Dynamic Group Membership 
Added new setting of “Dynamic Group Member URL”
(ldapDynamicGroupMemberURL) - see LDAP settings advanced tab.

Added public function getDynamicGroupMembers.

Updated function _groupMembers.

Updated function getUserGroups.
 2016-02-03 21:50:27 +01:00
Vincent Petry
805ba20bae Added unit tests for edit/delete comments 2016-02-03 21:06:55 +01:00
Vincent Petry
1caee3ac2e Move comment delete action into edit mode 2016-02-03 21:06:55 +01:00
Vincent Petry
bbefe1ed64 Comment owner can now edit or delete 2016-02-03 21:06:55 +01:00
Thomas Müller
da04620155 Merge pull request #22101 from owncloud/comments-filerow 
Add file row indicator for unread comments
 2016-02-03 20:53:40 +01:00
Thomas Müller
81b9721700 Remove entries in dav_shares on deletion of a calendar 2016-02-03 20:18:56 +01:00
Roeland Jago Douma
453ea6698d [Share 2.0] Fix public link sharing 2016-02-03 19:25:29 +01:00
Roeland Jago Douma
c1841892d0 [Share 2.0] Fix OCS endpoint 2016-02-03 19:25:29 +01:00
Thomas Müller
a3cc448c9d Adding propfind property to retrieve sharee information from a dav resource 2016-02-03 17:18:23 +01:00
Thomas Müller
8c14ce01ba Deleting a shared address book results in unshare 2016-02-03 17:18:22 +01:00
Thomas Müller
ef06d6bdaa Deleting a shared calendar results in unshare 2016-02-03 17:18:22 +01:00
Thomas Müller
6f933fde60 Disallow to share with the owner of the resource 2016-02-03 17:18:22 +01:00
Thomas Müller
4b14ca672f Fix ACLs on shared calendars 2016-02-03 17:18:22 +01:00
Thomas Müller
0753067bcd No duplicate address book if shared with user and group and the user is part of the group 2016-02-03 17:18:22 +01:00
Thomas Müller
18c35bf812 No duplicate calendars if shared with user and group and the user is part of the group 2016-02-03 17:18:22 +01:00
Thomas Müller
9106595608 Add calendar sharing 2016-02-03 17:18:22 +01:00
Vincent Petry
85bec3ffcb Reset comments read marker after loading comments 2016-02-03 16:18:14 +01:00
Thomas Müller
e34ec0a138 Merge pull request #22095 from owncloud/public_link_with_port 
Public link downloads should work on instance on non default port
 2016-02-03 16:06:54 +01:00
Thomas Müller
74abbbc0d6 Merge pull request #22098 from owncloud/cleanup-core-apps 
Cleanup core apps
 2016-02-03 14:17:10 +01:00
Arthur Schiwon
c1871f5787 Port of test_ldap_2nddispname to master 2016-02-03 13:55:39 +01:00
Thomas Müller
aaf7299d28 Merge pull request #22070 from owncloud/share2_exceptions 
Add sharing exceptions to OCP
 2016-02-03 13:36:14 +01:00
Vincent Petry
8bb1437e24 Add file row indicator for unread comments 2016-02-03 13:00:55 +01:00
Joas Schilling
78d5c89e86 Make sure encryption has a valid licence tag 2016-02-03 12:57:03 +01:00