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

46155 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
b3a92a4e39
Expired PK tokens should not fall back to legacy tokens 
Fixes #11919

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-21 14:34:29 +02:00
Roeland Jago Douma
f544c9fec9
Merge pull request #11927 from stweil/clean 
Remove duplicate condition
 2018-10-19 21:15:04 +02:00
Roeland Jago Douma
93007b6bdb
Merge pull request #11926 from stweil/declarations 
Add missing variable declarations
 2018-10-19 21:14:21 +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
0b27487f83
Merge pull request #11937 from nextcloud/fix/files_external_js_tests 
Fix js unit tests
 2018-10-19 19:30:57 +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
Roeland Jago Douma
9d36cc7256
Fix js unit tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-19 15:54:22 +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
efee380e95
Merge pull request #11885 from dpeukert/master 
Check if the X-XSS-Protection header contains the required fields
 2018-10-19 15:32: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
Morris Jobke
ce9377a464
Merge pull request #11920 from nextcloud/admin/noid/properly-ignore-compiled-files-l10n 
Add .l10nignore files for compiled assets
 2018-10-19 11:39:39 +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
Christoph Wurst
a1ea504edf
Merge pull request #11711 from nextcloud/feature/backgroundjobs_ocp 
Add proper backgroundjobs to OCP
 2018-10-19 07:40:35 +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
fef361a0a0
Merge pull request #11894 from nextcloud/npm/settings 
Bump npm deps in /settings
 2018-10-18 16:26:22 +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
302a5d8171
Merge pull request #11785 from nextcloud/3rdparty/azure/1.2.0 
[3rdparty] Bump azure-storage-blog 1.2.0
 2018-10-18 11:49:08 +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
Morris Jobke
b25307d949
Merge pull request #11896 from nextcloud/fix/personal-2fa-settings-unreliable-state 
Remove unreliable 2FA state message on personal 2FA settings page
 2018-10-18 11:22:49 +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
Christoph Wurst
4f75173f11
Remove unreliable 2FA state message on personal 2FA settings page 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-18 09:51:08 +02:00
Roeland Jago Douma
0e0db13bb9
[3rdparty] Bump azure-storage-blog 1.2.0 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-18 08:20:05 +02:00
Roeland Jago Douma
053ddbaa6f
Bump npm deps in /settings 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-10-17 22:20:15 +02:00
Daniel Peukert
7a5d6ac15c Fix failing tests and add some more 
Signed-off-by: Daniel Peukert <dan.peukert@gmail.com>
 2018-10-17 18:51:01 +02:00
Daniel Peukert
2da4f96bd6 Remove arrow function 
Signed-off-by: Daniel Peukert <dan.peukert@gmail.com>
 2018-10-17 18:10:37 +02:00
Daniel Peukert
b2dfcb5a18 Check if the X-XSS-Protection header contains the required fields 
Signed-off-by: Daniel Peukert <dan.peukert@gmail.com>
 2018-10-17 14:28:51 +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
Morris Jobke
7c8b3c1056
Merge pull request #11842 from nextcloud/fix/settings-strict-csp 
Fix settings' strict CSP
 2018-10-17 12:20:04 +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
Morris Jobke
262ff13136
Merge pull request #11835 from nextcloud/csp/jquery_contactsmenu 
Move jquery.contactsmenu.js to compiled handlebars
 2018-10-16 12:20:57 +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
Christoph Wurst
8222e9dd12
Remove Vue compiler because templates have to be precompiled anyway 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-16 11:49:42 +02:00
Christoph Wurst
f8579a87f5
Fix unsafe-eval used in 2FA admin settings 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-10-16 11:49:07 +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
Julius Härtl
0b4ea70995
Tests: Remove spacing from html before comparing the template 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-10-16 10:49:34 +02:00