gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,166 Commits 14 Branches 0 Tags
c0181beb34ab08ee28c36dd551936a3a3a83be5b
Commit Graph

1166 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangxin
c0181beb34 音视频，图片类型修改 2018-08-15 20:01:47 +08:00
duandongmei
1744feb9e3 Merge branch 'develop' into 'demostration_08' 
Develop

See merge request !24
 2018-08-15 18:49:00 -04:00
duandongmei
83b61fb040 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-15 18:22:53 +08:00
wangxin
1f63c52347 Merge branch 'demostration_08' into 'develop' 
系统国际化修改：tcp修改为TCP,udp修改为UDP

See merge request !23
 2018-08-15 16:14:47 -04:00
wangxin
c649f3a037 Merge branch 'demostration_08' into 'develop' 
Demostration 08

See merge request !22
 2018-08-15 15:31:53 -04:00
duandongmei
3c5e22fcae 国际化修改ipv 为IPv 2018-08-15 18:22:13 +08:00
wangxin
f52e526456 系统国际化修改：tcp修改为TCP,udp修改为UDP 2018-08-15 16:12:06 +08:00
wangxin
6df371372b IP，ISP等词大写;首字母大写 2018-08-15 15:27:25 +08:00
duandongmei
487847b8df Merge branch 'develop' into 'demostration_08' 
国际化更改

See merge request !21
 2018-08-15 15:09:46 -04:00
duandongmei
95b711c2d5 国际化更改 2018-08-15 15:04:36 +08:00
wangxin
e93d0f26d4 ip_subnet中文国际化翻译为子网掩码，ip_range国际化翻译为IP范围 2018-08-15 15:00:50 +08:00
wangxin
c9278253e2 Jquery-validation 中文国际化文件调整与英文国际化文件一致，去除了重复的国际化，调整了国际化顺序 2018-08-15 14:54:30 +08:00
duandongmei
91540db503 Merge branch 'develop' into 'demostration_08' 
Develop

See merge request !20
 2018-08-15 14:42:57 -04:00
duandongmei
e14aa17e2e 国际化中文补全，中文统一根据英文翻译，去掉英文中不使用的国际化 2018-08-15 14:37:46 +08:00
duandongmei
11050d489d Merge branch 'demostration_08' into 'develop' 
Demostration 08

See merge request !19
 2018-08-15 09:23:42 -04:00
wangxin
e2a649339a 特定服务页面tab切换时去掉desc的必选*号 2018-08-15 11:45:33 +08:00
wangxin
5801922c78 特定服务页面去掉desc的必选*号，列表页面注释掉详情页面的链接 2018-08-15 11:32:07 +08:00
duandongmei
00ff603663 去掉return 2018-08-15 09:17:32 +08:00
duandongmei
029046afe0 xmpp界面增加loading('onloading...'); 
picUrlForm界面修改遮罩层位置bug
 2018-08-15 09:16:10 +08:00
zhangwenqing
96ca3d6b3c 添加国际化代码. 2018-08-14 21:31:52 +08:00
wangxin
61b0d23336 Merge branch 'demostration_08' into 'develop' 
加入中文'出错'判断

See merge request !18
 2018-08-14 18:42:34 -04:00
wangxin
92eae3bf39 Merge branch 'demostration_08' into 'develop' 
异常提示调整

See merge request !17
 2018-08-14 18:01:51 -04:00
wangxin
2c1b8d4b59 Merge branch 'demostration_08' into 'develop' 
(1)去掉误输入的字符

See merge request !16
 2018-08-14 15:04:54 -04:00
wangxin
d843d1e412 加入中文出错判断 2018-08-14 18:37:45 +08:00
wangxin
3f9aa29320 (1)加入新异常，调用外部程序异常。原外部程序调用异常提示在在返回信息 
(2)音视频控制类异常处理，防止出现表单提交，审核时为了防止出现未知异常导致界面出错，catch
MaatCovertException修改为catch exeption,根据异常类型进行判断返回界面信息
(3)message.tag不够严谨，修改了success的判断
 2018-08-14 17:58:00 +08:00
wangxin
a4cc2fb89c (1)去掉误输入的字符 
(2)添加加密隧道行为菜单项
 2018-08-14 15:01:19 +08:00
duandongmei
c87ad112c5 增加request_service统计的requests空集合bug 2018-08-14 14:54:12 +08:00
wangxin
49679a93fc Merge branch 'demostration_08' into 'develop' 
(1)tag根节点替换root_node

See merge request !15
 2018-08-14 14:40:37 -04:00
zhanghongqing
127f814734 Merge branch 'demostration_08' into 'develop' 
解决日志中火狐title不自动换行问题

See merge request !14
 2018-08-14 10:56:53 -04:00
wangxin
6ffd267c6a (1)tag根节点替换root_node 
(2)特定服务app列名替换
 2018-08-14 14:37:48 +08:00
zhanghongqing
429024eab4 解决日志中火狐title不自动换行问题 2018-08-14 10:51:27 +08:00
duandongmei
4f9f1bb8cb Merge branch 'demostration_08' into 'develop' 
行为日志去掉action

See merge request !13
 2018-08-13 18:39:25 -04:00
zhangwenqing
ff041bfe68 Merge branch 'demostration_08' into 'develop' 
日志界面URL列加宽

See merge request !12
 2018-08-13 18:15:29 -04:00
duandongmei
41fb17eff6 Merge branch 'demostration_08' into 'develop' 
Demostration 08

See merge request !11
 2018-08-13 18:02:53 -04:00
duandongmei
2de40c838f Merge branch 'demostration_08' into 'develop' 
日志行为识别去掉App_label字段，增加五个标签

See merge request !10
 2018-08-13 17:37:30 -04:00
duandongmei
af91ea8ac4 Merge branch 'demostration_08' into 'develop' 
来函列表增加Id展示，方便用户做导入来函查看

See merge request !9
 2018-08-13 15:59:21 -04:00
wangxin
69d1c4bbb2 Merge branch 'demostration_08' into 'develop' 
message忽略大小写

See merge request !8
 2018-08-13 15:37:54 -04:00
zhanghongqing
cb1b87df21 Merge branch 'demostration_08' into 'develop' 
Demostration 08

See merge request !7
 2018-08-13 15:14:56 -04:00
wangxin
fadb66bb7f Merge branch 'demostration_08' into 'develop' 
ip列表界面增加IP格式和端口格式

See merge request !6
 2018-08-13 14:00:26 -04:00
duandongmei
f9dfbd4370 Merge branch 'demostration_08' into 'develop' 
合并到develop

See merge request !5
 2018-08-13 12:32:48 -04:00
duandongmei
a5458cacc3 Merge branch 'demostration_08' into 'develop' 
Demostration 08

See merge request !4
 2018-08-13 11:15:58 -04:00
duandongmei
96b6b2abe5 行为日志去掉action 2018-08-13 18:34:14 +08:00
zhangwenqing
d42b161602 日志界面URL列加宽. 2018-08-13 18:11:37 +08:00
zhanghongqing
32eaa9d4d8 修改http分页bug 2018-08-13 18:03:00 +08:00
duandongmei
a17b3272ca Merge branch 'demostration_08' of http://10.0.6.99/gwall/gwall.git into demostration_08 2018-08-13 17:54:31 +08:00
duandongmei
969f441a53 c2s_pkt_num=C2S(Pkt) 
s2c_pkt_num=S2C(Pkt)
c2s_byte_num=C2S(Byte)
s2c_byte_num=S2C(Byte)
target_ip_protect=Target IP Protect
国际化更改
 2018-08-13 17:53:25 +08:00
zhanghongqing
b8d742e11c 日志行为识别去掉App_label字段，增加五个标签 
LABEL_PROTO_ID
LABEL_OS_ID
LABEL_BS_ID
LABEL_BEHAV_ID
LABEL_APP_ID
 2018-08-13 17:26:16 +08:00
duandongmei
84d548b6fd 来函列表增加Id展示，方便用户做导入来函查看 2018-08-13 15:53:11 +08:00
wangxin
dac6531d17 message忽略大小写 2018-08-13 15:33:57 +08:00
zhanghongqing
17b61ff96e 修改日志文件字段为http前缀 2018-08-13 14:53:37 +08:00