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

30265 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Thomas Müller
d11179a0f5 Merge pull request #22227 from owncloud/appmanager-hooks 
Send events when enabling and disabling of apps
 2016-02-09 11:23:19 +01:00
Thomas Müller
b93fc4fc5f Merge pull request #22232 from owncloud/fix-user-settings-navigation 
Fix scroll area in navigation of users management
 2016-02-09 11:22:41 +01:00
Thomas Müller
254e0fa71a Merge pull request #22220 from owncloud/enc-fixfilesizelogicwithpartfile 
Fix part file partial cache logic in encryption code
 2016-02-09 11:06:22 +01:00
Thomas Müller
7e0ddfe0d0 Merge pull request #22223 from owncloud/git-ignore-ackrc 
gitignore ack config file
 2016-02-09 10:24:48 +01:00
Thomas Müller
cf38b9b368 Merge pull request #22231 from owncloud/remove_modify_ajax_share.php 
Remove modifying calls in ajax/share.php
 2016-02-09 10:22:56 +01:00
Thomas Müller
616a62a98d fixes #22221 2016-02-09 09:48:13 +01:00
Vincent Petry
19980be116 Fix part file partial cache logic in encryption code 
The encryption code uses partial cache entries for the part file (which
are not stored in the database) but are useful for other parts of the
code to retrieve the file size again.

This means that in the fixed code $info was empty, so getData() could
not be called.

The fix makes sure to support both cases when the cache entry exists and
doesn't.
 2016-02-09 09:47:34 +01:00
Roeland Jago Douma
5f3a91536d Remove modifying calls in ajax/share.php 
Those calls used the old sharing endpoint that created incompatible
shares. Which eventually would lead to some weird bugs.
 2016-02-09 09:42:06 +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
cd00751de5 Send events when enabling and disabling of apps 2016-02-09 02:51:12 +01:00
blizzz
a5cbd00447 ignore ack config file 2016-02-08 23:36:18 +01:00
Thomas Müller
850ac0cf84 Merge pull request #22170 from owncloud/occ-check-signature 
CLI commands to check app and core signatures
 2016-02-08 21:42:34 +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
Victor Dubiniuk
5910b82de1 Cut authors list. Declare a member variable 2016-02-08 20:37:05 +03: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
a03279a3a8 Merge pull request #22207 from owncloud/mountcache-exists-check 
better exists check for insert mount cache
 2016-02-08 17:57:59 +01:00
Thomas Müller
a35d5625e0 Merge pull request #22186 from owncloud/show-different-unsupported-failure-message 
Don't show "report this to the community" when the upgrade is unsuppo…
 2016-02-08 16:45:32 +01:00
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
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
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