Commit Graph

983 Commits (46245ab4aa79254b398d7c00ae1c7a47dc7e1a13)
 

Author SHA1 Message Date
ibuler 46245ab4aa fix record bug
9 years ago
ibuler 2c0d42e0da fix some bug
9 years ago
ibuler 0335bc26ca fix rule js bug
9 years ago
ibuler 60166ac008 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
9 years ago
ibuler f760df1e34 角色key问题修复
9 years ago
ibuler 6fe6342ca4 角色key问题修复
9 years ago
liuzheng712 175f2702d1 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
9 years ago
ibuler a7db713b1e Merge branch 'exec_cmd' into dev
9 years ago
wangyong 742e56fc5f Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
9 years ago
wangyong 0262d94dd3 fix disk detail bug
9 years ago
ibuler 32d036c2b0 修改setting字段
9 years ago
ibuler 1a63d32fe3 fix bug
9 years ago
ibuler ec9b00e255 fix bug
9 years ago
ibuler d7cb549eac Merge branch 'exec_cmd' into dev
9 years ago
ibuler 168157bfe1 fix
9 years ago
ibuler 7cbb7718eb fix bug
9 years ago
ibuler 2d65265fc6 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
9 years ago
ibuler 30fe9f5236 fix websocket授权
9 years ago
wangyong 49821062fb Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev
9 years ago
wangyong 99439be04f add update all button
9 years ago
ibuler 17ccac92ee fix 加密bug
9 years ago
wangyong dd4c243d7c Merge branch 'cmdb' of https://git.coding.net/jumpserver/jumpserver into cmdb
9 years ago
halcyon 34031bfd6b fix bugs
9 years ago
ibuler a7a030fedd fix bug
9 years ago
ibuler 4c50551249 fix some bug
9 years ago
ibuler 483ca9677c 资产列表添加连接
9 years ago
ibuler f00a2e003d Merge branch 'dev' into exec_cmd
9 years ago
ibuler 0b878216ed Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
9 years ago
ibuler f49a92e742 webscoket授权
9 years ago
kelianchun_miller ee218a5fed update connect.py
9 years ago
wangyong a9196ef149 merge cmdb | add asset update batch and crontab
9 years ago
wangyong 04bf37b52a Merge branch 'cmdb' into dev
9 years ago
wangyong 5a3c11f619 asset update batch and crontab
9 years ago
liuzheng712 c89d43d269 update, now Mac to develop will be all egg pain
9 years ago
ibuler 12f33176bf Merge branch 'dev' into exec_cmd
9 years ago
ibuler eb779e5bf6 修改run_websocket
9 years ago
ibuler 47ace5d654 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
9 years ago
ibuler 70db8c69d2 global SSH_FLAG to self.ssh_flag
9 years ago
liuzheng712 962d16172c Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
9 years ago
kelianchun_miller 5f9e675d00 update connect.py
9 years ago
ibuler 4cdc7f33ce 添加注释
9 years ago
kelianchun_miller c359d1e264 update connect.py
9 years ago
kelianchun_miller 0c42d039ff update connect.py
9 years ago
kelianchun_miller 55503c89e9 update connect.py
9 years ago
wangyong b8cb6f4246 Merge branch 'dev' into cmdb
9 years ago
wangyong d25e23623a fix bugs
9 years ago
ibuler a143797ac9 修改gen_resource api
9 years ago
liuzheng712 09de12c02a index show assets, need discussion
9 years ago
liuzheng712 246e8770ac http://localhost:8000/juser/user_detail/?id=5001 fix
9 years ago
liuzheng712 ea059790a9 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
9 years ago