burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v2.2'

Browse Source
This commit is contained in:
Adolfo Gómez García 2018-09-06 13:48:16 +02:00
commit 89f77dbbc6
6 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server/src/uds/static/modern/3rdpartylicenses.txt
View File

@ -1,3 +1,27 @@
@angular/material@6.4.7
MIT
The MIT License
Copyright (c) 2018 Google LLC.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
core-js@2.5.7
MIT
Copyright (c) 2014-2018 Denis Pushkarev

15
server/src/uds/static/modern/translations-fakejs.js
View File

@ -3,15 +3,18 @@
gettext("We use cookies to track usage and preferences");
gettext("I Understand");
gettext("Learn more");
gettext("Launching service");
gettext("Warning");
gettext("Service is in maintenance and cannot be executed");
// HTML
gettext("About");
gettext("Preferences");
gettext("Dashboard");
gettext("Downloads");
gettext("Logout");
gettext("UDS Plugin");
gettext("Download UDS client plugin for your platform");
gettext("Download");
gettext("Username");
gettext("Password");
gettext("Authenticator");
gettext("Preferences");
gettext("Dashboard");
gettext("Downloads");
gettext("About");
gettext("About");
gettext("Close");

2
server/src/uds/templates/uds/modern/index.html
View File

@ -2,6 +2,8 @@
<html lang="{{ LANGUAGE_CODE }}">
<head>
<!-- <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> -->
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
<meta charset="utf-8">
<title>Uds</title>
<base href="/modern">

3
server/src/uds/transports/RDP/BaseRDPTransport.py
View File

@ -40,7 +40,7 @@ from uds.core.transports import protocols
import logging
import os
__updated__ = '2018-05-18'
__updated__ = '2018-09-06'
logger = logging.getLogger(__name__)
@ -113,6 +113,7 @@ class BaseRDPTransport(Transport):
multimon = gui.CheckBoxField(label=_('Multiple monitors'), order=33, tooltip=_('If checked, all client monitors will be used for displaying (only works on windows clients)'), tab=gui.DISPLAY_TAB)
aero = gui.CheckBoxField(label=_('Allow Desk.Comp.'), order=34, tooltip=_('If checked, desktop composition will be allowed'), tab=gui.DISPLAY_TAB)
smooth = gui.CheckBoxField(label=_('Font Smoothing'), order=35, tooltip=_('If checked, fonts smoothing will be allowed'), tab=gui.DISPLAY_TAB)
showConnectionBar = gui.CheckBoxField(label=_('Connection Bar'), order=36, tooltip=_('If checked, connection bar will be shown (only on Windows clients)'), tab=gui.DISPLAY_TAB, defvalue=gui.TRUE)
multimedia = gui.CheckBoxField(label=_('Multimedia sync'), order=40, tooltip=_('If checked. Linux client will use multimedia parameter for xfreerdp'), tab='Linux Client')
alsa = gui.CheckBoxField(label=_('Use Alsa'), order=41, tooltip=_('If checked, Linux client will try to use ALSA, otherwise Pulse will be used'), tab='Linux Client')

5
server/src/uds/transports/RDP/RDPTransport.py
View File

@ -44,7 +44,7 @@ logger = logging.getLogger(__name__)
READY_CACHE_TIMEOUT = 30
__updated__ = '2018-07-19'
__updated__ = '2018-09-06'
class RDPTransport(BaseRDPTransport):
@ -72,6 +72,7 @@ class RDPTransport(BaseRDPTransport):
multimon = BaseRDPTransport.multimon
aero = BaseRDPTransport.aero
smooth = BaseRDPTransport.smooth
showConnectionBar = BaseRDPTransport.showConnectionBar
credssp = BaseRDPTransport.credssp
screenSize = BaseRDPTransport.screenSize
@ -113,6 +114,8 @@ class RDPTransport(BaseRDPTransport):
r.multimon = self.multimon.isTrue()
r.desktopComposition = self.aero.isTrue()
r.smoothFonts = self.smooth.isTrue()
r.displayConnectionBar = self.showConnectionBar.isTrue()
r.enablecredsspsupport = self.credssp.isTrue()
r.multimedia = self.multimedia.isTrue()
r.alsa = self.alsa.isTrue()
r.smartcardString = self.smartcardString.value

5
server/src/uds/transports/RDP/TRDPTransport.py
View File

@ -48,7 +48,7 @@ import logging
import random
import string
__updated__ = '2018-07-19'
__updated__ = '2018-09-06'
logger = logging.getLogger(__name__)
@ -88,6 +88,7 @@ class TRDPTransport(BaseRDPTransport):
multimon = BaseRDPTransport.multimon
aero = BaseRDPTransport.aero
smooth = BaseRDPTransport.smooth
showConnectionBar = BaseRDPTransport.showConnectionBar
credssp = BaseRDPTransport.credssp
screenSize = BaseRDPTransport.screenSize
@ -141,6 +142,7 @@ class TRDPTransport(BaseRDPTransport):
r.multimon = self.multimon.isTrue()
r.desktopComposition = self.aero.isTrue()
r.smoothFonts = self.smooth.isTrue()
r.enablecredsspsupport = self.credssp.isTrue()
r.multimedia = self.multimedia.isTrue()
r.alsa = self.alsa.isTrue()
r.smartcardString = self.smartcardString.value
@ -195,6 +197,7 @@ class TRDPTransport(BaseRDPTransport):
'ip': ip,
'password': password,
'this_server': request.build_absolute_uri('/'),
'r': r,
}
m = tools.DictAsObj(data)