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

1255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangxin
23f2910e7c Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-20 22:27:52 +08:00
wangxin
6c80e62a45 图片IP，APP IP IP白名单关系添加 2018-08-20 22:27:16 +08:00
fangshunjian
974a34ea49 Merge remote-tracking branch 'origin/develop' into develop 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
 2018-08-20 22:17:34 +08:00
fangshunjian
1bb113766b 1、新增 http redirect&block 支持文件作为应答内容 2018-08-20 22:12:05 +08:00
wangxin
14301b43f3 修复common.js中的返回方法跳到首页的bug 
音视频页面修改由function_region_dict控制
 2018-08-20 21:29:56 +08:00
zhangwenqing
f40b1c6bb0 APP SSL配置提交以及相关表结构、字典sql. 2018-08-20 21:01:58 +08:00
wangxin
738099ca4e 修复indexOf异常 2018-08-20 20:49:40 +08:00
wangxin
bfb5d0f476 防止不同页面冲突，加入判断 2018-08-20 20:11:06 +08:00
wangxin
3ea864a0c9 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-20 20:08:04 +08:00
wangxin
82b63a2ba7 ip部分页面修改为根据公共属性判断 2018-08-20 20:07:26 +08:00
zhanghongqing
fc2e0443fe 设置是否记录日志默认值同matt默认值，防止审核失败 2018-08-20 19:58:50 +08:00
wangxin
493ff4013f IP导入改为数字验证 2018-08-20 18:52:44 +08:00
zhanghongqing
aa7c75da99 1.增加do_log字典属性2.cfg_index_info增加do_log字段更新sql文件 
3.VoIP IP跟account增加do_log是否显示日志
 2018-08-20 18:48:10 +08:00
zhanghongqing
73e41d4500 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-20 18:46:13 +08:00
leijun
18e8c872f3 类名报错 2018-08-20 18:39:06 +08:00
zhanghongqing
faf13409c3 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-20 17:47:01 +08:00
zhanghongqing
ada7d38be9 Revert "冲突" 
This reverts commit 8d9bbabbee.
 2018-08-20 17:46:28 +08:00
zhanghongqing
8d9bbabbee 冲突 2018-08-20 17:27:03 +08:00
leijun
2c3c545059 p2p文件名更正 2018-08-20 17:22:39 +08:00
duandongmei
224402956b Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
 2018-08-20 16:19:58 +08:00
duandongmei
6aa6f253d4 增加proxy证书提交 2018-08-20 16:17:38 +08:00
wangxin
203cf3355b (1)取消点击触发的函数提取到common.js 
(2)搜索submitHandler中恢复loading
 2018-08-20 12:47:26 +08:00
zhanghongqing
26d4ed4a9c voip 拆分为VoIP IP跟VoIP Account 2018-08-20 11:35:07 +08:00
leijun
a8aebd9e23 添加P2P日志查询 2018-08-20 11:33:34 +08:00
leijun
2c52a0acc3 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-20 11:28:45 +08:00
leijun
e6bc92cb24 提交本地 2018-08-20 11:28:27 +08:00
leijun
488cdde3e6 提交本地 2018-08-20 11:15:02 +08:00
wangxin
8033731f0e 导出加入关闭提示 2018-08-20 10:51:16 +08:00
wangxin
7b86868cd1 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-20 10:16:35 +08:00
duandongmei
fbbe28a619 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
 2018-08-20 10:03:10 +08:00
duandongmei
1b42f73d4e 国际化添加intercepter限速和替换 2018-08-20 10:01:52 +08:00
zhangwenqing
b2bb12a52b 添加国际化代码. 2018-08-20 09:52:44 +08:00
wangxin
5fa8ad485c region,service字典增加字段 2018-08-20 09:24:44 +08:00
zhangwenqing
32b229e233 1.P2P审核未通过的配置修改后改为未审核状态 2.P2P新增界面Hash配置只能选择十六进制 2018-08-19 18:00:08 +08:00
duandongmei
86d8663994 region 字典增加configServiceType属性 2018-08-19 15:56:17 +08:00
duandongmei
45556b7e05 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/resources/sql/function_region_dict_add_colunm.sql
	所有配置界面修改为使用region表动态属性值
 2018-08-19 15:55:27 +08:00
duandongmei
8c7e1d088d 字典增加域类型属性 2018-08-19 15:52:11 +08:00
zhanghongqing
8db613d464 增加注解 2018-08-19 10:52:32 +08:00
zhanghongqing
8dbad03cb3 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-19 10:47:52 +08:00
zhanghongqing
30e2cc0805 码表标签直接取，注释缓存 2018-08-19 10:47:42 +08:00
zhangwenqing
fbdae196f8 提交新增字典数据sql 2018-08-19 10:42:26 +08:00
zhangwenqing
d1d29a52dd 提交新建库表结构sql文件. 2018-08-19 09:27:15 +08:00
duandongmei
af704de60a 修改增强字符串类域的region属性为动态展示 2018-08-18 20:47:32 +08:00
duandongmei
56cb6f1df2 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-18 20:41:38 +08:00
leijun
cbeaaadb00 修改基础协议界面标题及IP Address增加action查询条件 2018-08-18 19:58:08 +08:00
duandongmei
2b55c19c54 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-18 19:54:53 +08:00
duandongmei
69a8c8c616 冲突解决 2018-08-18 19:54:31 +08:00
zhangwenqing
ab07d98b55 p2p配置提交以及相关国际化代码. 2018-08-18 19:05:12 +08:00
duandongmei
0c653dc05b 日志修改direction取错字典的bug 2018-08-18 15:27:00 +08:00
duandongmei
e0b01d9c9a Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-18 15:00:57 +08:00