Commit graph

30024 commits

Author SHA1 Message Date
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
Roeland Jago Douma
2831884e74 Fix OCS unit tests after two share merges
* Use getNode
* Return IShare object so typechecking is happy
2016-01-28 13:17:16 +01:00
Thomas Müller
de8852a760 Merge pull request #21958 from owncloud/systemtags-style
Use boxes for system tags, shorten permission text
2016-01-28 12:54:52 +01:00
Thomas Müller
295de6aad7 Merge pull request #21960 from owncloud/share2_ocs_fix_passing_empty_strings
Share2 ocs fix passing empty strings
2016-01-28 11:58:35 +01:00
Thomas Müller
d425b4ffc2 Merge pull request #21952 from owncloud/systemtags-fix-conflicts
Fix system tags conflict situations
2016-01-28 11:57:37 +01:00
Thomas Müller
c11337eb22 Merge pull request #21851 from owncloud/shared-unreadable
Base shared cache on CacheJail
2016-01-28 11:57:18 +01:00
Robin Appelman
d7a777af3a fix cachejail->update 2016-01-28 11:46:44 +01:00
Robin Appelman
1369f2c684 cleanup shared cache 2016-01-28 11:46:43 +01:00
Vincent Petry
1473e156f4 Use boxes for system tags, shorten permission text
Permission text now doesn't appear when all permissions are there, or
shows as "invisible" or "not assignable", which should better cover all
use cases.

Changed select2 style to use boxes in the input field.
2016-01-28 11:24:13 +01:00
Thomas Müller
b7710ab6d7 Merge pull request #21858 from owncloud/getMountsForFileId
add IUserMountCache->getMountsForFileId
2016-01-28 11:20:42 +01:00
Thomas Müller
dda9f31455 Merge pull request #21970 from zander/mentionbot
Stop spamming me.
2016-01-28 11:20:25 +01:00
Thomas Müller
928a1e1d40 Merge pull request #21971 from owncloud/notify-me
Notify me on activity and notifications for sure
2016-01-28 11:19:25 +01:00
Joas Schilling
d9365f1051 More more more, kidding, just to be sure 2016-01-28 11:15:18 +01:00
Morris Jobke
0e95aeab75 Merge pull request #21957 from owncloud/share2_to_ocp
[Share 2.0] Move interfaces to OCP
2016-01-28 10:41:39 +01:00
Tom
27e1cf8770 Stop spamming me.
Honestly, the bot should be improved, if a person hasn't contributed for
a long time it really doens't make sense to email him.
I would also argue that altering the .gitignore doesn't make me an
expert on that file. So classes of files really should not cause
the mention bot spamming me.
2016-01-28 09:26:21 +00:00
Roeland Jago Douma
8d44e537ac [Share 2.0] Remove setId and setProviderId from the interface
Those should only ever be set by the providers
2016-01-28 07:54:16 +01:00
Roeland Jago Douma
34e912ab6b [Share 2.0] Fix interfaces and comments
* Made comments more clear
* Removed unneeded methods
* IShares shareTime is now a proper DateTime object
* IShares getPath -> getNode & setPath -> setNode
* Fix unit tests
2016-01-28 07:54:09 +01:00
Roeland Jago Douma
f2e70441e4 [Share 2.0] Add getShareManager to OCP\IServerContainer 2016-01-27 22:04:37 +01:00
Roeland Jago Douma
357b271cb4 [Share 2.0] Create IManger interface for share manager 2016-01-27 22:04:37 +01:00
Roeland Jago Douma
185b9c6edd [Share 2.0] Move IShare to OCP 2016-01-27 22:04:37 +01:00
Roeland Jago Douma
0832cca54e [Share 2.0] Fix IShare 2016-01-27 22:04:09 +01:00
Roeland Jago Douma
6957917b20 [Share 2.0] Allow using permissions to update link share 2016-01-27 20:36:36 +01:00
Roeland Jago Douma
f5c45dfe7b [Share 2.0] Still allow isolated updates
Still allow isolated updates of parameters
2016-01-27 20:36:31 +01:00
Roeland Jago Douma
b321ceef60 [Share 2.0] Also handle empty parameter in updateShare
* More sanity checks
* More unit tests
2016-01-27 20:34:06 +01:00
Roeland Jago Douma
35a3432793 [Share 2.0] When passing empty strings don't fail
The password and expiration date can be set to empty strings when
created. This is now handled gracefully.
2016-01-27 20:34:06 +01:00
Thomas Müller
90f2a2352d Merge pull request #21963 from owncloud/fix-installer
Check whether ownCloud is installed
2016-01-27 20:25:51 +01:00
Thomas Müller
40a8686fe7 Merge pull request #21959 from owncloud/cache-interface-clean
clean cache interface
2016-01-27 19:33:35 +01:00