github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
1,396 Commits
68 Branches
248 Tags
109 MiB
Commit Graph

186 Commits (16f5906979a15bfc7f72c8dc827369c05c014944)

Author SHA1 Message Date
liuzheng712 d67aab573d fix: ip and port use jumpserver.conf to configure 2016-02-26 22:59:17 +08:00
liuzheng712 9c93d5a8d2 add /ws/ 2016-02-25 20:42:35 +08:00
liuzheng712 4f75f76db8 fix: web socket url update 2016-02-25 20:05:20 +08:00
ibuler 0e9a962506 具体体现在 日志监控页，定期回收过期的在线log 
需要运行python manage.py crontab add来添加

运行 python manage.py crontab remove 来去掉

crontab -l
 2016-02-20 16:02:31 +08:00
ibuler 99f09709ec 修改默认端口获取 2016-01-26 15:37:12 +08:00
ibuler fe87e32e2b roll back 2016-01-21 19:37:20 +08:00
ibuler 1c2cba64ec 修改推送默认端口bug 2016-01-21 18:17:18 +08:00
Tad Wang d9455e3f9b fix wss issue when using https #37 2016-01-07 15:59:57 +08:00
ibuler 7bef517518 支持修改窗口大小 2016-01-01 22:38:50 +08:00
wangyong f6c26a201e 修改硬盘不显示问题 2015-12-30 22:35:32 +08:00
ibuler f63b75c01b fix 随机密码默认长度 2015-12-24 11:31:05 +08:00
ibuler 39b7a7290f merge with dev 2015-12-19 17:30:21 +08:00
ibuler 7b792907d3 merge with dev 2015-12-19 17:27:12 +08:00
ibuler c103738302 merge with dev 2015-12-19 17:26:34 +08:00
ibuler 32ab051bbc modify cmd_group num bug 2015-07-03 21:27:20 +08:00
ibuler f7e70e56e3 modify sudo conn timeout bug 2015-07-03 21:09:17 +08:00
ibuler 1662269153 websocket auth add 2015-05-28 17:00:03 +08:00
ibuler bf80799fb6 modify port type 2015-05-25 17:13:08 +08:00
ibuler b1add204b6 ޸ʾ 2015-04-28 15:08:28 +08:00
ibuler ba55cdde87 modify service.sh bug 2015-04-24 19:12:14 +08:00
ibuler 6c10cf1a5a Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-04-22 18:58:26 +08:00
halcyon 27d6df7a38 解决django低版本不支持first()问题 2015-04-21 14:45:38 +08:00
ibuler e2ac212fc3 resolve confilict 2015-04-20 20:56:26 +08:00
ibuler 09d3763a02 fix a bug 2015-04-20 20:54:10 +08:00
ibuler ea37374ea5 django 1.6 2015-04-20 18:56:30 +08:00
ibuler 412dadce76 version 2.0.0 beta 2015-04-20 10:12:11 +08:00
ibuler 8b50e5252f merge with wangyong 2015-04-19 18:45:07 +08:00
halcyon 86e334e4fa last bug? 2015-04-19 18:36:41 +08:00
ibuler 17e89bb55b ޸һbug 2015-04-19 18:26:38 +08:00
ibuler d5fba23d73 ȨҳûҳӵȨб 2015-04-19 00:23:35 +08:00
ibuler c8d91884c8 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 
Conflicts:
	jumpserver/api.py
 2015-04-18 18:06:17 +08:00
halcyon bd2d7ce007 hehe 2015-04-18 18:04:03 +08:00
ibuler 6d6e9d97b5 ޸ 2015-04-18 18:04:01 +08:00
ibuler c1d8de4558 ϲ 2015-04-18 16:58:16 +08:00
ibuler 0873211d13 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 2015-04-18 14:02:57 +08:00
ibuler bcc5774365 ӳɹҳ 2015-04-18 13:52:28 +08:00
halcyon 84929840d0 bug 2015-04-18 13:51:47 +08:00
ibuler d6171f7fe7 merge 2015-04-18 12:37:55 +08:00
ibuler 4f1b4f1947 ޸bug 2015-04-17 22:22:21 +08:00
halcyon a269c43d1c 优化 2015-04-16 19:03:02 +08:00
halcyon 29d196410e Merge branch 'master' into wangyong 2015-04-16 14:34:49 +08:00
ibuler e2e131146d Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-04-16 14:33:55 +08:00
guanghongwei c08cee8052 û 2015-04-15 17:32:30 +08:00
guanghongwei 3424bef5d0 ޸bug 2015-04-15 12:07:59 +08:00
halcyon 99293cc019 bug 2015-04-14 20:09:11 +08:00
halcyon 4abf25ef13 hehe 2015-04-13 21:25:43 +08:00
guanghongwei 12df8cf060 ޸ 2015-04-11 17:45:33 +08:00
guanghongwei 3c1af0e266 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-04-11 12:53:22 +08:00
guanghongwei 3b00cfa97d ޸ĸbug 2015-04-11 12:52:17 +08:00
halcyon 9cfe6c569d hehe 2015-04-11 12:52:00 +08:00