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

30394 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arthur Schiwon
b6e03fe261 versions provide more information when throwing hooks 2016-02-08 16:33:49 +01:00
Thomas Müller
ec399e6bbc Merge pull request #22200 from owncloud/node-checksum-resolvefileinfo 
Make sure fileinfo exists when calling getCheckSum in node API
 2016-02-08 16:10:31 +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
Robin Appelman
26a8fb157d better exists check for insert mount cache 2016-02-08 15:18:42 +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
Roeland Jago Douma
1e8e00c541 Add proper throw tags to File 2016-02-08 14:44:26 +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
Vincent Petry
41ba9280f7 Make sure fileinfo exists when calling getCheckSum in node API 2016-02-08 12:24:18 +01:00
Thomas Müller
97b2e19c78 Merge pull request #22168 from owncloud/fix-some-dav-sharing-ux 
Fix some dav sharing ux
 2016-02-08 11:58:09 +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
6d211f96dc Fix intergration tests 2016-02-08 11:30:48 +01:00
Roeland Jago Douma
fad85ad19f Fix unit tests 2016-02-08 11:30:48 +01:00
Roeland Jago Douma
33c3f75dde Force app to be always enabled for now 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
Roeland Jago Douma
ba0bab294e Add federated share provider to core 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
Lukas Reschke
25aad470c1 Add message with reference to forum post 2016-02-08 10:45:46 +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
Thomas Müller
03ca63c224 Merge pull request #22138 from owncloud/comments-collapse 
Collapse long comments
 2016-02-08 10:11:02 +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
62b5948ff5 Merge pull request #22156 from owncloud/share2_unshare_ifexpired 
Delete a link share if it is expired on access
 2016-02-08 09:59:00 +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
Thomas Müller
64ad927f24 Merge pull request #22161 from owncloud/dav-ie9 
Make JS Webdav work again with IE9-IE10
 2016-02-08 09:58:27 +01:00
Morris Jobke
4032cc0166 Don't show "report this to the community" when the upgrade is unsupported 
* fixes #21367
 2016-02-08 09:19:16 +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
Roeland Jago Douma
46faf6d3ca Fix exception on delete 2016-02-06 13:31:54 +01:00
Roeland Jago Douma
8486d61764 getSharesBy should also expire link shares 2016-02-06 13:31:54 +01:00
Roeland Jago Douma
3028ec5440 Delete expired share when fetched by id 2016-02-06 13:31:54 +01:00
Roeland Jago Douma
5ed56d9edb Delete a link share if it is expired on access 
If we access a link share we should check if it has expired already.
If so we should remove it and throw a ShareNotFound exception
 2016-02-06 13:31:54 +01: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
Thomas Müller
a9015d61a7 Merge pull request #22166 from owncloud/remove-local-folder 
remove unused Storage->getLocalFolder
 2016-02-06 13:21:59 +01:00