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

30252 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
eb29bc64de set auth mechanism in tests 2016-01-29 14:51:30 +01:00
Robin Appelman
03c79ac24f remove custom controler for user provided password auth 2016-01-29 14:51:30 +01:00
Robin Appelman
5bdcd534b1 dont show user provided auth as option for personal mounts 2016-01-29 14:51:30 +01:00
Robin Appelman
860d51487b Allow setting user provided credentials from the personal settings page 2016-01-29 14:51:30 +01:00
Robin Appelman
f3e9729a5f expose user provided credentials for admin mounts 2016-01-29 14:50:52 +01:00
Robin Appelman
419507c118 Add user provided credentials mechanism 2016-01-29 14:50:52 +01:00
Robin Appelman
adbc5a0b41 Fix invalid storages not showing in directory listing 2016-01-29 14:50:52 +01:00
Thomas Müller
8ad45dad38 Merge pull request #21660 from owncloud/sharing2_update_reshares 
upgrade to sharing 2.0, remove hierarchical re-shares
 2016-01-29 14:43:16 +01:00
Thomas Müller
45609d95d4 Merge pull request #21992 from owncloud/share-dialog-error-handling 
Properly forward error messages in share dialog
 2016-01-29 14:42:57 +01:00
Thomas Müller
e78be6f21e Merge pull request #21928 from owncloud/files-external-js-checkbox-fix 
Fix validation of inputs that aren't text
 2016-01-29 14:18:13 +01:00
Thomas Müller
e8c449612d Merge pull request #21990 from owncloud/systemtags-cleanup-orphans 
Background cleanup job for system and user tag orphaned when file was deleted
 2016-01-29 14:16:50 +01:00
Robin Appelman
b9b74d935f Add delete command for external storages 2016-01-29 14:10:43 +01:00
Arthur Schiwon
6dc793338a url encode id 2016-01-29 13:28:17 +01:00
Robin Appelman
279a54bc87 adjust js unit test 2016-01-29 13:14:26 +01:00
Robin Appelman
3c8aac3867 Add mount option to disable sharing 2016-01-29 13:14:26 +01:00
Arthur Schiwon
01cdc70f9c introduce comments read marke tables, comes with user cleanup after deletion 2016-01-29 13:08:02 +01:00
Arthur Schiwon
24025f32f4 standardize datetime output 2016-01-29 13:08:02 +01:00
Arthur Schiwon
d2882b9021 Comments WebDAV adjustements 2016-01-29 13:08:02 +01:00
Robin Appelman
ec3f6549f6 Add fallback moveFromCache implementation 2016-01-29 13:06:59 +01:00
Robin Appelman
e3b5639fc1 Block shares that dont have the correct source permissions 2016-01-29 13:05:53 +01:00
Robin McCorkell
2abb173599 Default to STATUS_ERROR in StorageNotAvailableException 2016-01-29 11:57:25 +00:00
Robin McCorkell
241ed17dc0 Add storage validation JS unit tests 2016-01-29 11:47:23 +00:00
Vincent Petry
f0caf41232 Cleanup job for system and user tag orphaned when file was deleted 
Whenever a file was deleted (also from trash), the tag mapping is
pointing at a fileid that doesn't exist any more.

This cleanup job will delete such orphaned mapping entries.
 2016-01-29 11:51:47 +01:00
Thomas Müller
b65a23ca4b Merge pull request #21701 from owncloud/scan_files_more_details_II 
occ scan:files Adding more details in the base print out (II)
 2016-01-29 11:41:36 +01:00
Thomas Müller
62b9e81919 Merge pull request #21995 from owncloud/share2_delete_user_defined_group_shares 
[Share 2.0] When deleting a group share delete children
 2016-01-29 11:34:38 +01:00
Pookay
9bfc31e666 Fix the result at the bottom on IE 
view issue #21898
 2016-01-29 10:07:15 +01:00
Thomas Müller
ede1cbf612 Merge pull request #21932 from owncloud/comments-dav-refinements 
provide info about plugin, and do not run commit ourselves on proppatch
 2016-01-29 10:03:20 +01:00
Thomas Müller
24908a439a Merge pull request #21987 from owncloud/issue-21980-too-many-job-send-mysql-away 
Do not create a loop that generates thousands of jobs
 2016-01-29 10:02:52 +01:00
Thomas Müller
4070657875 Merge pull request #21981 from owncloud/systemtags-trim-name 
Trim tag names to avoid problems
 2016-01-29 10:02:23 +01:00
Thomas Müller
2b185b73e2 Merge pull request #21993 from owncloud/updater-htacces 
Do not rewrite requests to updater
 2016-01-29 10:02:04 +01:00
Joas Schilling
c83b3d6a26 Remove other broken usages in deprecated methods 2016-01-29 08:50:29 +01:00
martin.mattel@diemattels.at
e05592d797 occ scan:files Adding more details in the base print out (II) 
Use proper method name

Fixed the interruption logic

Checks the availability of the pcntl_signal function

Fixed typo crtl-c --> ctrl-c

one overseen crtl-c typo
 2016-01-29 08:42:03 +01:00
Jenkins for ownCloud
1765e11f75 [tx-robot] updated from transifex 2016-01-29 01:55:53 -05:00
Morris Jobke
e4ad4c7e98 [user_ldap] properly decode cached objects 
* fixes #21896
 2016-01-29 07:51:16 +01:00
Joas Schilling
c925bfdcd6 Trim tag names to avoid problems 2016-01-28 20:41:47 +01:00
Roeland Jago Douma
1ff4ec1cd3 [Share 2.0] When deleting a group share delete children 
For group shares we can have children. Those are custom shares when a
user has moved or deleted a group share. Those also have to be deleted
if the group share is removed.
 2016-01-28 20:35:46 +01:00
Thomas Müller
6fc3269670 Merge pull request #21333 from owncloud/migrate-contacts 
Migrate contacts
 2016-01-28 19:47:48 +01:00
Lukas Reschke
128d9d7aa6 Add copyright header 2016-01-28 19:27:04 +01:00
Roeland Jago Douma
6151a0540b Update the initiator of the share as well in migration 2016-01-28 19:24:23 +01:00
Roeland Jago Douma
b85770d636 Update reshares in batches as not to run out of memory 2016-01-28 19:24:23 +01:00
Björn Schießle
dc8d43575f upgrade to sharing 2.0, remove hierarchical re-shares 2016-01-28 19:24:23 +01:00
Lukas Reschke
809ff5ac95 Add public API to give developers the possibility to adjust the global CSP defaults 
Allows to inject something into the default content policy. This is for
example useful when you're injecting Javascript code into a view belonging
to another controller and cannot modify its Content-Security-Policy itself.
Note that the adjustment is only applied to applications that use AppFramework
controllers.

To use this from your `app.php` use `\OC::$server->getContentSecurityPolicyManager()->addDefaultPolicy($policy)`,
$policy has to be of type `\OCP\AppFramework\Http\ContentSecurityPolicy`.

To test this add something like the following into an `app.php` of any enabled app:
```
$manager = \OC::$server->getContentSecurityPolicyManager();
$policy = new \OCP\AppFramework\Http\ContentSecurityPolicy(false);
$policy->addAllowedFrameDomain('asdf');
$policy->addAllowedScriptDomain('yolo.com');

$policy->allowInlineScript(false);
$manager->addDefaultPolicy($policy);
$policy = new \OCP\AppFramework\Http\ContentSecurityPolicy(false);
$policy->addAllowedFontDomain('yolo.com');
$manager->addDefaultPolicy($policy);

$policy = new \OCP\AppFramework\Http\ContentSecurityPolicy(false);
$policy->addAllowedFrameDomain('banana.com');
$manager->addDefaultPolicy($policy);
```

If you now open the files app the policy should be:

```
Content-Security-Policy:default-src 'none';script-src yolo.com 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src yolo.com 'self';connect-src 'self';media-src 'self';frame-src asdf banana.com 'self'
```
 2016-01-28 18:36:46 +01:00
Victor Dubiniuk
4ced903427 Do not rewrite updater requests 2016-01-28 20:04:56 +03:00
Vincent Petry
df3f6fee10 Properly forward error messages in share dialog 2016-01-28 17:18:33 +01:00
Vincent Petry
8b3d7d09d5 Merge pull request #21860 from owncloud/sharedialog-ocs-adapter 
Share dialog use OCS API
 2016-01-28 16:56:29 +01:00
Joas Schilling
ef73aedd7e Deprecate the method and warn against using it 2016-01-28 15:40:23 +01:00
Joas Schilling
5238fc3f54 Do not create a loop that generates thousands of jobs 2016-01-28 15:40:23 +01:00
Vincent Petry
7e1de0e3c2 Fix share default expiration date calculation 
Now using UTC dates with moment js to accurately add the number of days
 2016-01-28 15:25:34 +01:00
Vincent Petry
b063ddb05b Share dialog use OCS API 2016-01-28 15:25:34 +01:00
Thomas Müller
476720ada9 Merge pull request #21975 from owncloud/fix_ocs_unit_tests 
Fix OCS unit tests after two share merges
 2016-01-28 15:09:31 +01:00