Commit Graph

19007 Commits

Author SHA1 Message Date
Roeland Jago Douma f544c9fec9
Merge pull request #11927 from stweil/clean
Remove duplicate condition
2018-10-19 21:15:04 +02:00
Stefan Weil 81c0f2a9a7
Remove duplicate condition
This fixes a warning from LGTM:

    Operands additionnalShares and additionnalShares are identical.

Fix also the typo in the parameter name.
2018-10-19 20:19:08 +02:00
Stefan Weil c5d3febf37
Add missing variable declarations
This fixes errors from LGTM like the following one:

    Variable i is used like a local variable,
    but is missing a declaration.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-10-19 20:17:55 +02:00
Roeland Jago Douma 543c863434
Merge pull request #11931 from nextcloud/bug/do_not_emit_pre_hooks_twice_objectstore
Do not emit preHooks twice on non-part-storage
2018-10-19 19:56:42 +02:00
Roeland Jago Douma 97717ae3a7
Merge pull request #11905 from nextcloud/design/noid/tab-icons
Add icon to file sidebar tabs
2018-10-19 16:53:56 +02:00
Morris Jobke 851f525889
Merge pull request #11668 from nextcloud/bugfix/7726/convert_caldav_subscription_source_to_long_text
convert source column in calendarsubscription table to (long) text
2018-10-19 15:49:17 +02:00
Morris Jobke 6a979a0ba0
Merge pull request #11823 from lex111/fix-illegible-text-color-in-size-and-modified-columns
Fix illegible text color in columns Size and Modified on dark theme
2018-10-19 15:31:51 +02:00
Roeland Jago Douma b51e503aea
Do not emit preHooks twice on non-part-storage
The old code would emit the hooks twice. Thus having the version written
twice. Which is not very performant as it is first read twice as well.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-19 12:19:53 +02:00
Morris Jobke d35b6513cd
Merge pull request #11922 from stweil/semicolons
Add missing semicolons
2018-10-19 12:07:59 +02:00
Morris Jobke 08476297c3
Merge pull request #11917 from nextcloud/csp/files_external
Move files_external to compiled handlebars
2018-10-19 12:06:42 +02:00
Stefan Weil 2ad38200fb Add missing semicolons
This fixes some recommendations from LGTM:

    Avoid automated semicolon insertion (90% of all statements
    in the enclosing function have an explicit semicolon).

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2018-10-19 11:24:24 +02:00
Morris Jobke 1226c13201
Add .l10nignore
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-19 10:41:37 +02:00
Morris Jobke 1b44bdfb58
Add .l10nignore files for compiled assets
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-19 10:29:36 +02:00
Roeland Jago Douma c43e0d6e28
Move files_external to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-19 08:41:01 +02:00
Alexey Pyltsyn 30cbd137e8 Fix illegible text color in columns Size and Modified on dark theme: rework after review
Signed-off-by: Alexey Pyltsyn <lex61rus@gmail.com>
2018-10-18 20:49:46 +03:00
blizzz 5daa4f27e1
Merge pull request #11882 from nextcloud/feature/noid/consider-net-connection
Do not try to contact lookup server without internet connection or URL
2018-10-18 18:24:41 +02:00
Arthur Schiwon 8e4ae23c48
Do not try to contact lookup server without internet connection or URL
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-10-18 17:49:28 +02:00
Julius Härtl 45804b5bef
Add icon to file sidebar tabs
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-18 15:54:17 +02:00
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
Alexey Pyltsyn 5911367a18 Fix illegible text color in columns Size and Modified on dark theme
Signed-off-by: Alexey Pyltsyn <lex61rus@gmail.com>
2018-10-16 21:06:01 +03: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
Georg Ehrke b83918ed6d
convert source column in calendarsubscription table to (long) text
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-10-15 13:16:31 +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