liuzheng712 d369d4b50f Merge branch 'jlog' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ ...

# Conflicts:
#	jumpserver/views.py
#	juser/models.py
#	juser/views.py
#	templates/jperm/perm_apply.html

2015-11-07 09:37:10 +08:00

..

cropper

search detail

2015-10-28 19:24:02 +08:00

datapicker

search detail

2015-10-28 19:24:02 +08:00

demo

version 2.0.0 beta

2015-04-20 10:12:11 +08:00

dropzone

upload page: need to fix click problem, want to show the list of machines, TODO

2015-11-06 00:21:59 +08:00

highcharts

version 2.0.0 beta

2015-04-20 10:12:11 +08:00

layer

resolve confilict

2015-04-20 20:56:26 +08:00

magnific

version 2.0.0 beta

2015-04-20 10:12:11 +08:00

plugins

search detail

2015-10-28 19:24:02 +08:00

validator

version 2.0.0 beta

2015-04-20 10:12:11 +08:00

base.js

授权管理

2015-10-07 17:16:20 +08:00

bootstrap-dialog.js

version 2.0.0 beta

2015-04-20 10:12:11 +08:00

bootstrap.min.js

version 2.0.0 beta

2015-04-20 10:12:11 +08:00

inspinia.js

version 2.0.0 beta

2015-04-20 10:12:11 +08:00

jquery-2.1.1.js

version 2.0.0 beta

2015-04-20 10:12:11 +08:00

jquery-ui-1.10.4.min.js

version 2.0.0 beta

2015-04-20 10:12:11 +08:00

jquery-ui.custom.min.js

version 2.0.0 beta

2015-04-20 10:12:11 +08:00

jquery.colorbox.js

version 2.0.0 beta

2015-04-20 10:12:11 +08:00

mindmup-editabletable.js

version 2.0.0 beta

2015-04-20 10:12:11 +08:00

term.js

完成webtermial demo

2015-11-05 18:31:00 +08:00

wssh.js

修正导入select错误

2015-11-05 20:07:21 +08:00