From c0bbda97699099f697c37ba2d9405d4bef702289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= <ibuler@qq.com>
Date: Fri, 27 Apr 2018 15:38:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[Update]=20=E6=9A=82=E6=97=B6=E9=9A=90?=
 =?UTF-8?q?=E8=97=8Frdp=E7=9A=84session=EF=BC=8C=E7=AD=89=E5=BE=85windows?=
 =?UTF-8?q?=E5=BD=95=E5=83=8F=E6=92=AD=E6=94=BE=20(#1276)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/terminal/views/session.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/terminal/views/session.py b/apps/terminal/views/session.py
index 3b66baff7..24e323647 100644
--- a/apps/terminal/views/session.py
+++ b/apps/terminal/views/session.py
@@ -47,7 +47,8 @@ class SessionListView(AdminUserRequiredMixin, DatetimeSearchMixin, ListView):
             filter_kwargs['system_user'] = self.system_user
         if filter_kwargs:
             self.queryset = self.queryset.filter(**filter_kwargs)
-        return self.queryset
+        # Todo: 暂时隐藏rdp
+        return self.queryset.filter(protocol='ssh')
 
     def get_context_data(self, **kwargs):
         context = {

From 1edfb1cec431293ef3cf1e706f41a6b43264f41a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= <ibuler@qq.com>
Date: Wed, 2 May 2018 10:52:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=20(#1282)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/__init__.py            | 2 +-
 apps/templates/_footer.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/__init__.py b/apps/__init__.py
index def994bcd..90767858b 100644
--- a/apps/__init__.py
+++ b/apps/__init__.py
@@ -2,4 +2,4 @@
 # -*- coding: utf-8 -*-
 #
 
-__version__ = "1.2.1"
+__version__ = "1.3.0"
diff --git a/apps/templates/_footer.html b/apps/templates/_footer.html
index f23c89399..8a723646d 100644
--- a/apps/templates/_footer.html
+++ b/apps/templates/_footer.html
@@ -1,6 +1,6 @@
 <div class="footer fixed">
     <div class="pull-right">
-        Version <strong>1.2.1-{% include '_build.html' %}</strong> GPLv2.
+        Version <strong>1.3.0-{% include '_build.html' %}</strong> GPLv2.
         <img style="display: none" src="http://www.jumpserver.org/img/evaluate_avatar1.jpg">
     </div>
     <div>