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

30757 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
9c1248521a Merge pull request #22340 from owncloud/allow-licensephp-for-app-repos-aswell 
Allow license.php for app repos aswell
 2016-02-17 15:09:30 +01:00
Thomas Müller
7af7d18cfa Merge pull request #16783 from owncloud/handle-redirects-global 
Adding global error handler for ajax calls which run into redirection…
 2016-02-17 14:49:04 +01:00
Thomas Müller
add696b057 Merge pull request #22468 from owncloud/files_external-global 
remove global credentials
 2016-02-17 14:41:30 +01:00
Thomas Müller
904db15f47 Merge pull request #22470 from owncloud/minimum-phpunit-4.4 
Minimum phpunit 4.4
 2016-02-17 14:20:37 +01:00
Thomas Müller
9afa4bf696 Kill no longer used autotest.cmd 2016-02-17 14:02:24 +01:00
Thomas Müller
3c65b898b2 We require minimum PHPUnit 4.4 2016-02-17 14:01:57 +01:00
Roeland Jago Douma
670557ffbb Add unit tests for formatShare 2016-02-17 13:55:39 +01:00
Roeland Jago Douma
2aa0b885f6 OCS Share API should not return invalid shares 
Since we have lazy shares it can happen that a share is actually
invalid. See https://github.com/owncloud/core/issues/20908

This add checks for the get methods to handle the NotFound exception.
 2016-02-17 13:55:39 +01:00
Robin Appelman
c2c6caee93 remove global credentials 2016-02-17 13:55:27 +01:00
Lukas Reschke
a5a4e6f89f Add new patchwork references 
CI for https://github.com/owncloud/3rdparty/pull/249
 2016-02-17 13:28:30 +01:00
Vincent Petry
8f96ef147f Don't apply quota in stream wrapper for part files 
When overwriting shared files as recipient, the part file is written on
the uploader's storage before overwriting the target file.

If the uploader has no quota left, they should still be able to
overwrite that file with Webdav. To make this work, they need to be able
to write the part file to their own storage first.
 2016-02-17 11:52:49 +01:00
Vincent Petry
53eff9792f Check the quota on the actual file's storage in dav quota plugin 
Fix quota plugin to use the correct file name when chunking

When chunking, the file name is the compound name, so need to convert it
to the correct final file name before doing the free space check.
This ensures that in the case of shared files, the correct storage is
used for the quota check.
 2016-02-17 11:52:49 +01:00
Thomas Müller
7b0f83b616 Merge pull request #22445 from owncloud/files-client-sendpropfindheaders 
Files DAV client send propfind headers
 2016-02-17 11:32:16 +01:00
Thomas Müller
92e5160003 Merge pull request #22452 from owncloud/fix_22441 
Unlock sharee input field when sharing fails
 2016-02-17 10:59:03 +01:00
Thomas Müller
9e415a956a Merge pull request #22451 from owncloud/use-proper-user-folder 
Handles null as return code and uses proper UserFolder in trashbin
 2016-02-17 10:58:31 +01:00
Thomas Müller
774109b762 Merge pull request #22437 from owncloud/fix_14095 
Allow searching for single character users to share with
 2016-02-17 10:58:14 +01:00
Thomas Müller
ff4e040971 Merge pull request #22435 from owncloud/trashbin-hook-nouser 
Don't resize trash when no user
 2016-02-17 10:57:50 +01:00
Thomas Müller
f6dcc9d615 Merge pull request #22419 from owncloud/issue-20663-console-add-user-group-with-shares 
Make sure to init the users Filesystem so we can add group shares
 2016-02-17 10:57:23 +01:00
Thomas Müller
85f02c8d2b Merge pull request #22299 from owncloud/erikpel-css-fix 
App navigation scrolling (Possible fix for #22158)
 2016-02-17 10:52:58 +01:00
Roeland Jago Douma
a9a3947e61 Do not clear sharee input on failed share 2016-02-17 09:21:17 +01:00
Roeland Jago Douma
e1fd86ccb6 Unlock sharee input field when sharing fails 
Fixes #22441

When addShares fails (for whatever reason) we should unlock the sharee
input field so the user does not have to reload the page.
 2016-02-17 09:21:12 +01:00
Joas Schilling
100b357c68 Check the mailmap file of core as well 2016-02-17 08:47:25 +01:00
Joas Schilling
049e3473b2 Allow the script to run for different git roots 2016-02-17 08:47:25 +01:00
Jenkins for ownCloud
fe29feae9a [tx-robot] updated from transifex 2016-02-17 01:56:11 -05:00
Morris Jobke
de58364eb8 Handles null as return code and uses proper UserFolder in trashbin 2016-02-16 18:45:25 +01:00
Erik Pellikka
296b1b9492 Fixes #22158 
changed 620px to calc(100vh - 100px);
 2016-02-16 12:29:07 -05:00
Vincent Petry
5575443be9 Fix redundant headers in files dav client 
The defaultHeaders are already injected with the xhrProvider, so no need
to pass them again a second time.
 2016-02-16 17:37:12 +01:00
Vincent Petry
273fb75824 Update davclient library for propfind headers 2016-02-16 17:37:12 +01:00
Vincent Petry
7bed529951 Don't resize trash when no user 
Happens when overwriting files on federated shares.
 2016-02-16 16:29:07 +01:00
Roeland Jago Douma
d8f91b0e82 Allow searching for single user 2016-02-16 16:23:09 +01:00
Thomas Müller
c6b2457306 Merge pull request #22432 from owncloud/files_external-backends 
remove login credentails and user provided backends
 2016-02-16 16:08:21 +01:00
Thomas Müller
6c0e9211e9 Merge pull request #22429 from owncloud/fix-coverage-reporting 
Fix coverage reporting
 2016-02-16 15:35:55 +01:00
Robin Appelman
176fb191b7 remove login credentails and user provided backends 2016-02-16 15:27:55 +01:00
Thomas Müller
6aa1965db7 Merge pull request #22430 from owncloud/add-new-apps-to-transifex 
Adding transifex to new core apps
 2016-02-16 15:10:34 +01:00
Jenkins for ownCloud
7942f3d7ec [tx-robot] updated from transifex 2016-02-16 08:49:12 -05:00
Thomas Müller
3503eb69f2 Adding transifex to new core apps 2016-02-16 14:40:10 +01:00
Thomas Müller
4b376305e9 Fix coverage reporting 2016-02-16 14:21:28 +01:00
Thomas Müller
6edd6e640b Merge pull request #22413 from owncloud/kill-coverage-on-scrutinizer 
No more code coverage on scrutinizer
 2016-02-16 14:05:32 +01:00
Thomas Müller
c6fef52939 Merge pull request #22416 from owncloud/fix_22402 
Return proper error string if sharing for this user is disabled
 2016-02-16 13:37:22 +01:00
Thomas Müller
d5226c88ac Merge pull request #22338 from owncloud/fix_22247 
Allow more characters in filenames
 2016-02-16 13:37:07 +01:00
Morris Jobke
3e8b025f2f Merge pull request #22417 from owncloud/issue-22389-duplicate-output-message 
Remove inaccurate "is already enabled" message
 2016-02-16 13:21:38 +01:00
Joas Schilling
560085e1a4 Make sure to init the users Filesystem so we can add group shares 2016-02-16 11:46:35 +01:00
Joas Schilling
077a407285 Show the comments and tags on the share filters 2016-02-16 11:24:44 +01:00
Joas Schilling
4eef8afe9b Remove inaccurate "is already enabled" message 2016-02-16 10:59:06 +01:00
Roeland Jago Douma
ed6843e87b Return proper error string if sharing for this user is disabled 
Fixes #22402
 2016-02-16 10:22:49 +01:00
Thomas Müller
1cb3583a9a Merge pull request #22398 from owncloud/fix-card-properties 
Queries on the cards table by uri require the addressbook as well
 2016-02-16 10:19:51 +01:00
Thomas Müller
8c90fea7ba Add script to generate coverage badges 2016-02-16 10:07:00 +01:00
Lukas Reschke
b99c6f1f67 Send 401 header for OC_JSON::checkLoggedIn() 2016-02-16 09:48:40 +01:00
Joas Schilling
b14e8fa427 Make sure our index names fit in oracle 2016-02-16 09:28:29 +01:00
Thomas Müller
18b64e0074 Merge pull request #22390 from owncloud/update-tarstreamer 
Update TarStreamer to v0.1.0
 2016-02-16 09:20:23 +01:00