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

18987 commits

Author SHA1 Message Date
Morris Jobke
729b853a30
Merge pull request #11853 from nextcloud/csp/comments 
Move more comments to compiled handlebars
 2018-10-18 11:40:00 +02:00
Morris Jobke
4e53ea6dbd
Merge pull request #11822 from nextcloud/bugfix/noid/forbid_freebusy_but_allow_local_delivery 
allow local delivery of schedule message while prohibiting FreeBusy requests
 2018-10-18 11:35:51 +02:00
blizzz
0c05ed1d3d
Merge pull request #11878 from nextcloud/no-require-same-site-cookie-on-assets 
Don't require Same Site Cookies on assets
 2018-10-18 10:24:56 +02:00
blizzz
2634ceb35b
Merge pull request #11862 from nextcloud/bugfix/ensure_cache_it_init 
Double check for failed cache with a shared storage
 2018-10-17 13:12:57 +02:00
Thomas Citharel
d63de5471b Don't require Same Site Cookies on assets 
Which can be used for public iframe embeeding

See https://github.com/nextcloud/calendar/issues/169

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-10-17 09:24:21 +02:00
Georg Ehrke
f5dc7b7f07
move disableFreeBusy check from User principal backend to Scheduling Outbox collection. This allows to keep local delivery of scheduling messages while prohibiting FreeBusy requests 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-10-16 20:27:33 +02:00
Morris Jobke
b88ab75c3a
Merge pull request #11870 from nextcloud/fix/noid/proper-column-name-escaping 
Properly quote column name in "createFunction" call
 2018-10-16 17:02:26 +02:00
Morris Jobke
b458ed9c82
Properly escape column name in "createFunction" call 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-16 15:24:02 +02:00
Roeland Jago Douma
2849f24154
Merge pull request #11839 from nextcloud/csp/files_drop 
Move files_drop to compiled handlebars
 2018-10-16 12:16:31 +02:00
Roeland Jago Douma
1bc388e507
Double check for failed cache with a shared storage 
When obtaining the SourceRootInfo we can call init. If this fails the
cache is set to a failed cache and the storage to a failed storage.
However we did not check for this. Which means that if the storage was
invalid it would fail later on.

Now we will properly error out.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-16 10:57:37 +02:00
Morris Jobke
afaee648dd
Merge pull request #11358 from Zulan/fix-welcome-l10n 
Fix welcome l10n
 2018-10-16 09:01:59 +02:00
Roeland Jago Douma
bee5bbbf0e
Move files_drop to compiled handlebars 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-16 08:27:06 +02:00
Roeland Jago Douma
353fddfbb9
Merge pull request #11849 from nextcloud/csp/fileactionsmenu 
Move fileactionsmenu to compiled handlebars
 2018-10-15 21:22:07 +02:00
Roeland Jago Douma
e7443ee892
Move more comments to compiled handlebars 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-15 19:52:22 +02:00
Julius Härtl
c316eb6b97
Tests: Properly compare the file action label 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-15 19:18:20 +02:00
zulan
cf266ee004 Get l10n within NewUserMailHelper to ensure it always uses the new user's language. 
Some related tests had to be changed because they relied on internals, see also from the PHPUnit documentation:
"Exercise caution when using [the at] matcher as it can lead to brittle tests which are too closely tied to specific implementation details."

Signed-off-by: Zulan <git@zulan.net>
 2018-10-15 19:01:46 +02:00
Roeland Jago Douma
a1b7449202
Move fileactionsmenu to compiled handlebars 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-15 15:51:40 +02:00
Roeland Jago Douma
8c4c4b700f
Move workflowengine to compiled handlebars 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-15 14:55:25 +02:00
Morris Jobke
24a2107e03
Fix a case where "password_by_talk" was not a boolean (e.g. null or "0") and actively cast it to a boolean 
This was the error message that we have seen:

```
Argument 1 passed to OC\\Share20\\Share::setSendPasswordByTalk() must be of the type boolean, null given, called in apps/sharebymail/lib/ShareByMailProvider.php on line 981
```

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-10-12 17:01:54 +02:00
Joas Schilling
16817f3743
Make activity events strict 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-10-12 12:12:12 +02:00
Morris Jobke
b5753d0efa
Merge pull request #11759 from nextcloud/feature/11504/sharing-favicon 
Use default favicon on sharing pages
 2018-10-12 10:30:21 +02:00
Roeland Jago Douma
dd8350b3b3
Merge pull request #10778 from suntorytimed/patch-1 
check for empty string
 2018-10-11 19:05:38 +02:00
Julius Härtl
2538079876
Use default favicon on sharing pages 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-11 16:29:24 +02:00
Morris Jobke
0acae1d4aa
Merge pull request #11719 from nextcloud/techdebt/noid/allow-to-mock-new-datetime 
Allow to inject/mock `new \DateTime()` similar to time()
 2018-10-10 14:54:15 +02:00
Joas Schilling
78cc4171ee
Fix mock of ITimeFactory 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-10-10 12:42:20 +02:00
Nextcloud bot
7c26bbbd82
[tx-robot] updated from transifex 2018-10-10 00:13:11 +00:00
Morris Jobke
ab3599155f
Merge pull request #11716 from nextcloud/bugfix/noid/use-numeric-placeholders-for-rtl-translations 
Use numeric placeholders if there are multiple, so that RTL languages…
 2018-10-09 16:31:52 +02:00
Morris Jobke
ddfc362779
Revert "in 14 the click action gets lost in the Backbone view." 2018-10-09 15:33:01 +02:00
Morris Jobke
877823eb9d
Merge pull request #11709 from nextcloud/refactor/jquery-beforeunload 
Fix depracted jQuery.bind call
 2018-10-09 14:48:42 +02:00
Joas Schilling
ea21aa3f7a
Use numeric placeholders if there are multiple, so that RTL languages can operate better 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-10-09 14:32:14 +02:00
Christoph Wurst
9af69ca2a5
Fix usage of deprecated OC.webroot 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-09 13:53:59 +02:00
Christoph Wurst
912729c427
Fix depracted jQuery.bind call 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-09 12:00:48 +02:00
Nextcloud bot
d07c5db947
[tx-robot] updated from transifex 2018-10-09 00:12:27 +00:00
Roeland Jago Douma
1178e85206
Merge pull request #11664 from nextcloud/feature/noid/has-been-interrupted-throw-exception 
Syntactic sugar for hasBeenInterrupted
 2018-10-08 21:31:29 +02:00
Morris Jobke
6994a2a87d
Merge pull request #11679 from nextcloud/refactor/remove-ie8-apis 
Remove IE8 APIs
 2018-10-08 18:36:07 +02:00
Morris Jobke
2a9e006355
Merge pull request #11518 from nextcloud/feature/noid/save-s3-requests 
S3 reuse information from listObject and skip headObject
 2018-10-08 18:28:38 +02:00
Morris Jobke
3330600dc5
Merge pull request #11682 from nextcloud/refactor/remove-deprecated-unused-fileDownloadPath 
Remove deprecated and unused fileDownloadPath
 2018-10-08 18:04:08 +02:00
Morris Jobke
5d83645a00
Merge pull request #11680 from nextcloud/refactor/remove-deprecated-svg-apis 
Remove deprecated SVG helpers for old IEs
 2018-10-08 17:30:14 +02:00
Morris Jobke
c4ac9bcea2
Merge pull request #10782 from nextcloud/fix/10774/deadtagaction 
in 14 the click action gets lost in the Backbone view.
 2018-10-08 17:14:00 +02:00
Morris Jobke
fe2a600823
Merge pull request #10839 from nextcloud/bugfix/10212/use_class_implementation 
adjust Calendar resource / room interfaces to use class implementation
 2018-10-08 17:00:50 +02:00
Christoph Wurst
576e44f890
Remove deprecated and unused fileDownloadPath 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-08 16:46:36 +02:00
Daniel Kesselberg
4cbea5f7e1
Remove value from cache on delete/clear 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-10-08 16:40:39 +02:00
Christoph Wurst
dccb3ab5b2
Remove deprecated SVG helpers for old IEs 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-08 16:33:41 +02:00
Christoph Wurst
dd459bbb7a
Remove OC.scaleFixForIE8 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-08 16:17:16 +02:00
Morris Jobke
8110a3be69
Merge pull request #11599 from nextcloud/feature/7136/workflow-engine-filename 
Add FileName to Workflow engine
 2018-10-08 13:57:57 +02:00
Daniel Kesselberg
311de17730
Rename method to abortIfInterrupted 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-10-08 13:05:00 +02:00
Daniel Kesselberg
be5e992021
Fix typo 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-10-08 13:02:12 +02:00
Morris Jobke
7971ba5cc6
Merge pull request #10898 from nextcloud/feature/10684/default-logo-color-theme-colors 
Switches the default logo color depending on the primary color
 2018-10-08 10:33:22 +02:00
Nextcloud bot
80f7add485
[tx-robot] updated from transifex 2018-10-08 00:12:54 +00:00
Georg Ehrke
1c6f666bbf
adjust Calendar resource / room interfaces to use class implementation 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-10-08 01:25:20 +02:00