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

45168 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Calviño Sánchez
857bb45366 Add comment with IDs of internal share types 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez
7292a986a0 Add type for room shares 
This type represents shares with a Nextcloud Talk conversation.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-08-08 14:25:43 +02:00
Roeland Jago Douma
6b1ba9cdaf
Merge pull request #10553 from nextcloud/bugfix/10518/disable-oracle-enforcement-for-now 
Disable Oracle enforcement for now until the following issues are sol…
 2018-08-08 14:10:18 +02:00
Roeland Jago Douma
e7e30ac25f
Merge pull request #10586 from nextcloud/fix/noid/check_if_ua_is_set 
Check if HTTP_USER_AGENT is set before using it
 2018-08-08 13:59:31 +02:00
Roeland Jago Douma
c74a5250e5
Check if HTTP_USER_AGENT is set before using it 
Sentry reported some errors regarding this. Apparently not everybody
sets a user agent. If it is not set we assume this is not IE ;)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-08 13:32:03 +02:00
Roeland Jago Douma
fe286e21ca
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-08 12:58:50 +02:00
John Molakvoæ
3884038765
Merge pull request #10582 from nextcloud/fix/app-password-enter-this-context 
Fix `this` context for enter-key handler on app tokens
 2018-08-08 12:38:50 +02:00
John Molakvoæ
f8e9f860eb
Merge pull request #10320 from nextcloud/feature/10176/Quick-Access-Cleanup 
Cleanup of leftover-sorting-code from quickaccess-feature #9714 #9720
 2018-08-08 12:27:12 +02:00
John Molakvoæ (skjnldsv)
91737b591e
js fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-08 11:24:13 +02:00
Roeland Jago Douma
a3fdec7d4b
Merge pull request #10578 from nextcloud/fix/2fa-provider-registry-population 
Fix 2FA provider registry population on login
 2018-08-08 11:12:00 +02:00
Christoph Wurst
b85e1188e1
Fix this context for enter-key handler on app tokens 
Fixes https://sentry.io/share/issue/e07c5560b6154212832e4cd6598464c7/.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-08 11:07:47 +02:00
fnuesse
7a78e0c641
Cleanup of leftover-sorting-code from quickaccess-feature #9714 #9720 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-08 09:23:54 +02:00
John Molakvoæ
e595cad880
Merge pull request #10561 from nextcloud/fix/10476/applist-layout 
Fixes the apps list layout
 2018-08-08 09:23:14 +02:00
John Molakvoæ
b198e17071
Merge pull request #10568 from nextcloud/apps-menu-fixes 
Fix apps max-height
 2018-08-08 09:22:21 +02:00
Roeland Jago Douma
75de67a98f
Merge pull request #10525 from nextcloud/notifications-fix 
Fixed notifications position
 2018-08-08 09:15:26 +02:00
Roeland Jago Douma
bee65f8053
Merge pull request #10572 from nextcloud/bugfix/10464/security-password-change 
Fix security settings if password change is disabled
 2018-08-08 08:32:54 +02:00
Christoph Wurst
d248a0bd1e
Fix 2FA provider registry population on login 
If the 2FA provider registry has not been populated yet, we have to make
sure all available providers are loaded and queried on login. Otherwise
previously active 2FA providers aren't detected as enabled.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-08-08 06:57:52 +02:00
Nextcloud bot
1cb8fe3cb0
[tx-robot] updated from transifex 2018-08-08 00:13:19 +00:00
Roeland Jago Douma
70dab08dc8
Merge pull request #10569 from nextcloud/custom-avatar-userconfig 
get avatar custom status from user config
 2018-08-07 20:44:40 +02:00
blizzz
5685ed4c7d
Merge pull request #10567 from nextcloud/icons-cacher-fix 
Icons cacher css url fix
 2018-08-07 18:23:36 +02:00
Michael Weimann
978fc50c65
Updates the built files 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-08-07 18:02:14 +02:00
Michael Weimann
d1636147eb
Fixes the apps list layout 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-08-07 18:02:13 +02:00
Julius Härtl
318682dd6d
Fix security settings if password change is disabled 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-07 17:41:01 +02:00
Robin Appelman
ec8ab83ea5
get avatar custom status from user config 
this saves a cache operation because the user config is already cached

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-08-07 14:55:33 +02:00
John Molakvoæ (skjnldsv)
2b15b4cb74
Fix apps max-height 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-07 10:27:39 +02:00
John Molakvoæ (skjnldsv)
7e6fa90fa1
Icons cacher css url fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-07 10:18:46 +02:00
Björn Schießle
f8de12c014
Merge pull request #10558 from nextcloud/fix/noid/failing_sync_job_is_no_error 
A failing federation sync job is not an error
 2018-08-07 10:09:24 +02:00
Nextcloud bot
35342b4b7d
[tx-robot] updated from transifex 2018-08-07 00:12:06 +00:00
Roeland Jago Douma
dd5862e270
A failing federation sync job is not an error 
This is an INFO warning at best. Else it spams the logs continiously.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-06 21:07:15 +02:00
Roeland Jago Douma
aa5956f1eb
Merge pull request #10550 from nextcloud/fix/noid/do_not_log_to_error 
Do not log to error loglevel when converting the error
 2018-08-06 19:59:29 +02:00
Joas Schilling
f5c63d7a6e
Disable Oracle enforcement for now until the following issues are solved: 
* Only apps should be checked which say they support oracle
* Only check newly added items, to allow forward migration from an existing database structure

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-08-06 17:34:40 +02:00
blizzz
db941a3f2e
Merge pull request #10523 from janLo/fix-8825 
Adding test for table schedulingobjects and fixing postgres LOB
 2018-08-06 17:17:47 +02:00
Roeland Jago Douma
01bbd28530
Do not log to error loglevel when converting the error 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-06 16:31:30 +02:00
Joas Schilling
f67d942fad
Merge pull request #10530 from nextcloud/bugfix/10528/public-template 
Fix issues when using the public layout without a PublicTemplateResponse
 2018-08-06 15:41:54 +02:00
Roeland Jago Douma
49662f3def
Merge pull request #10485 from nextcloud/update-triangle 
Fix design of update error page
 2018-08-06 15:38:43 +02:00
Thomas Müller
c05a0b9fa6
Adding test for table schedulingobjects and fixing postgres LOB 
(cherry picked from commit afd4ebf0404e8bcd7cba0bec2dce177e97632f8a)

Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
 2018-08-06 13:53:32 +02:00
Roeland Jago Douma
db4235d587
Update icewind/streams 
Fixes #10430

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-08-06 13:14:08 +02:00
MartB
5109743383 Fix multiSelectMenu for public shares #10536 
Signed-off-by: Martin Böh (MartB) <mart.b@outlook.de>
 2018-08-06 12:42:13 +02:00
John Molakvoæ (skjnldsv)
4ba40385a4
POpovermenu fix and token settings design fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-06 10:48:07 +02:00
Nextcloud bot
ca54166e35
[tx-robot] updated from transifex 2018-08-06 00:12:21 +00:00
Nextcloud bot
a625a4d704
[tx-robot] updated from transifex 2018-08-05 00:12:29 +00:00
Nextcloud bot
752ee28b1b
[tx-robot] updated from transifex 2018-08-04 00:12:38 +00:00
Julius Härtl
4f2013bd40
Make public layout also usable without a PublicTemplateResponse 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-03 20:41:56 +02:00
Julius Härtl
b4ea19c981
Fix base layout content padding 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-03 19:21:10 +02:00
Julius Härtl
2d3e5c817c
Remove header-classes since it is never used 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-03 18:25:06 +02:00
Roeland Jago Douma
c623345027
Merge pull request #10509 from nextcloud/bugfix/10398/acceptance-files-changedir 
Always replace the app sidebar view when switching from a different file list
 2018-08-03 15:10:53 +02:00
John Molakvoæ (skjnldsv)
05b53aaf8c
Fixed notifications position 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-08-03 15:07:55 +02:00
Julius Härtl
1b4d502bfd
Adjust acceptance test to check if the correct sidebar view is shown 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-03 14:06:04 +02:00
Roeland Jago Douma
755f13ee9f
Merge pull request #10519 from nextcloud/min-height-wrapper 
Min height 100% on content-wrapper
 2018-08-03 14:05:28 +02:00
Jan-Christoph Borchardt
6d7bf81421
Fix HTML on update error page 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2018-08-03 13:30:49 +02:00