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

45816 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Molakvoæ (skjnldsv)
e744b029ff
Fix invalid inline input confirm border 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-28 09:29:08 +02:00
John Molakvoæ
ecf33a679e
Merge pull request #11417 from nextcloud/hover-quota-used-space-regression 
Add back the total used space per user
 2018-09-28 08:59:24 +02:00
John Molakvoæ (skjnldsv)
8a2ac44250
State default unknown quota to 0 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-28 08:22:37 +02:00
John Molakvoæ (skjnldsv)
f5f31e221c
Fix class selector for acceptance tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-28 08:20:10 +02:00
Christoph Wurst
9eb4259af9
Merge pull request #11412 from nextcloud/csp/11032/authtoekn_compiled_handlebars 
Compile handlebars template for AuthTokenView
 2018-09-28 07:36:45 +02:00
Roeland Jago Douma
d72d267035
Merge pull request #11410 from nextcloud/csp/11030/filesummary_compiled_handlebars 
Compile filesummary handlebars
 2018-09-27 21:04:33 +02:00
Roeland Jago Douma
c9e93b8084
Compile contactmenu handlebars templates 
Fixes #11029
For https://github.com/orgs/nextcloud/projects/18

Ship the compiled handlebars templates. This makes it possible to have a
scricter CSP.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-27 20:33:58 +02:00
Roeland Jago Douma
ae1250f422
Compile filesummary handlebars 
Fixes #11030
For https://github.com/orgs/nextcloud/projects/18

This template is now compiled so this no longer has to happen in the
browser. Another step towards a stricter CSP.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-27 20:16:08 +02:00
blizzz
d984231458
Merge pull request #11416 from nextcloud/bugfix/11218/show-email-authtype-none 
Show auth type "None" in email settings
 2018-09-27 18:07:49 +02:00
Morris Jobke
c367f95afa
Merge pull request #10833 from nextcloud/fix_8623 
Re-enable upload button after updating Avatar fixes #8623
 2018-09-27 17:27:12 +02:00
John Molakvoæ (skjnldsv)
7c15d9e080
Fix string formatting 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-27 17:16:12 +02:00
John Molakvoæ (skjnldsv)
1aa0990ccd
Add back the total used space per user 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-27 17:13:26 +02:00
Morris Jobke
d6522c41fe
Show auth type "None" in email settings 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-09-27 16:59:43 +02:00
Morris Jobke
02de67773c
Merge pull request #11411 from nextcloud/fix-checkWellKnownUrl-not-being-executed 
Fix "checkWellKnownUrl" not being run
 2018-09-27 16:14:25 +02:00
Roeland Jago Douma
fbe270dec6
Merge pull request #11384 from nextcloud/11372/fix/logo-height 
Fixes the logo height
 2018-09-27 15:41:13 +02:00
Daniel Calviño Sánchez
fe30653194
Fix "checkWellKnownUrl" not being run 
The check is run only if its last parameter is true; data() tries to
convert the HTML attribute string to an actual JavaScript value, so
"true" is returned as an actual boolean instead of an string; as a
strict comparison against "true" was used the result was false and thus
the checks were not run.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-09-27 15:39:26 +02:00
Roeland Jago Douma
d66e662492
Compile handlebars template for AuthTokenView 
Fixes #11032
For https://github.com/orgs/nextcloud/projects/18

Compile the default authtoken handlebars view.
This avoids runtime compilations (speed) and avoids unsafe eval calls
thus allowing a stricter CSP.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-27 14:07:48 +02:00
Michael Weimann
c7714b43c7
Fixes the logo height 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-09-27 12:47:13 +02:00
Christoph Wurst
c759a78926
Merge pull request #11398 from nextcloud/refactor/settings-manager-complexity 
Reduce settings manager complexity by loading sections via DI
 2018-09-27 10:33:32 +02:00
Christoph Wurst
f71ffc73db
Remove unused constructor argument 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-09-27 09:44:21 +02:00
Christoph Wurst
0259792614
Reduce settings manager complexity by loading sections via DI 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-09-27 09:44:21 +02:00
Christoph Wurst
0ca78e15bc
Merge pull request #11163 from nextcloud/refactor/vue-backup-codes 
Migrate backup codes settings to Vue
 2018-09-27 09:41:48 +02:00
Christoph Wurst
cd05670517
Fix generate button event and show regenerate button only when enabled 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-09-27 09:07:06 +02:00
Roeland Jago Douma
13d9b5f5e0
Bump npm packages 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-27 09:07:06 +02:00
Roeland Jago Douma
735d5e5cba
Add drone support 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-27 09:07:06 +02:00
Roeland Jago Douma
edc861b041
Move to standard format 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-27 09:07:05 +02:00
Christoph Wurst
7882be160a
Migrate backup codes settings to Vue 
Fixes https://github.com/nextcloud/server/issues/11034.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-09-27 09:07:05 +02:00
Christoph Wurst
522d6804f7
Merge pull request #11402 from nextcloud/fix_acceptance 
Also test enabling of the Antivirus App for files
 2018-09-27 06:55:50 +02:00
Nextcloud bot
2ace0df82a
[tx-robot] updated from transifex 2018-09-27 00:12:26 +00:00
Roeland Jago Douma
1fecea6c08
Also test enabling of the Antivirus App for files 
Since there is no calendar release for 15 yet we should use an app that
we can quickly release for 15 as well.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-09-26 22:05:42 +02:00
Roeland Jago Douma
bf57c53ca5
Merge pull request #11135 from nextcloud/babel-npm-webpack-fixes 
Update config and babel for ie11
 2018-09-26 21:34:49 +02:00
Robin Appelman
c5f77de3e2
fix trashbin js tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-09-26 19:20:53 +02:00
blizzz
ff55bcdad5
Merge pull request #11150 from nextcloud/feature/noid/unit-test-find-webroot 
Extract logic for webroot into method and add test
 2018-09-26 15:22:30 +02:00
Morris Jobke
fb17f1a26b
Merge pull request #11112 from nextcloud/do-not-hide-the-progress-bar-while-the-chunked-upload-is-being-assembled 
Do not hide the progress bar while the chunked upload is being assembled
 2018-09-26 12:23:34 +02:00
Morris Jobke
89fdd088c7
Merge pull request #11383 from nextcloud/fix/noid/files-unavailable-deleted-user 
do not explode when getting permissions from a FailedStorage
 2018-09-26 12:18:07 +02:00
Arthur Schiwon
c526cdf8ab
do not explode when getting permissions from a FailedStorage 
for instance if a user of an external user backend is not available
currently, the whole Files UI would be frozen.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-09-26 10:48:37 +02:00
John Molakvoæ (skjnldsv)
8f05df2b14
Rebase and bump 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-26 09:44:49 +02:00
John Molakvoæ (skjnldsv)
be0f625555
Merge branch 'master' into babel-npm-webpack-fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-26 09:44:41 +02:00
Nextcloud bot
2f45045c96
[tx-robot] updated from transifex 2018-09-26 00:12:23 +00:00
Morris Jobke
ee73f6c416
Merge pull request #11240 from nextcloud/feature/noid/consider-openssl-settings-from-config.php 
Consider openssl settings from config.php
 2018-09-25 18:04:20 +02:00
Roeland Jago Douma
b8418b502d
Merge pull request #11316 from nextcloud/container-queryexception-only 
only catch QueryException when trying to build class
 2018-09-25 16:21:55 +02:00
Roeland Jago Douma
4a59725b15
Merge pull request #11123 from CrazyEasy/patch-1 
Bugfix 2FA theme: buttons white
 2018-09-25 16:20:27 +02:00
Roeland Jago Douma
548f4e9a27
Merge pull request #11143 from nextcloud/feature/2fa-occ-revamp 
[Mandatory 2FA] occ commands revamp
 2018-09-25 16:06:30 +02:00
Roeland Jago Douma
34c17ba142
Merge pull request #11309 from nextcloud/bugfix/noid/dont-ignore-cloud-federation-api 
Do not ignore cloud_federation_api
 2018-09-25 16:04:21 +02:00
Roeland Jago Douma
77aaa493d7
Merge pull request #11363 from nextcloud/update/npm/updatenotifications 
[npm] Bump updatenotifications
 2018-09-25 16:01:57 +02:00
Roeland Jago Douma
768047615f
Merge pull request #11368 from nextcloud/content-list-flex-fixes 
Fix default flex shrink on list
 2018-09-25 14:28:58 +02:00
Morris Jobke
c62f29b9fe
Merge pull request #11364 from nextcloud/update/npm/accessibility 
[npm] Bump accessibility
 2018-09-25 14:25:24 +02:00
Morris Jobke
f589641870
Merge pull request #11365 from nextcloud/update/npm/settings 
[npm] Bump settings
 2018-09-25 14:24:49 +02:00
Morris Jobke
00eae64b7d
Merge pull request #11362 from nextcloud/update/npm/oauth2 
[npm] Bump oauth2
 2018-09-25 14:15:03 +02:00
John Molakvoæ (skjnldsv)
7a8b260c27
Fix default flex shrink on list 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-09-25 10:36:46 +02:00