Commit Graph

89 Commits

Author SHA1 Message Date
7492662f7d Merge branch 'develop' into standalone_develop 2022-11-10 16:22:40 +08:00
ef83697cb8 修复:tooltip闪烁问题 2022-11-10 16:21:43 +08:00
e92588cf6d Merge branch 'develop' into standalone_develop 2022-11-09 14:56:43 +08:00
e24921bba3 修复 2022-11-09 14:56:27 +08:00
f75e05bb84 Merge branch 'develop' into standalone_develop 2022-11-09 14:55:06 +08:00
e4d62c5335 新增:字符串截取展示 2022-11-09 14:54:43 +08:00
33a3d7f48c merge from develop 2022-11-09 14:37:27 +08:00
83b46fcb50 新增:用户反馈意见后台管理逻辑 2022-11-09 11:37:12 +08:00
0a06b2098b Merge branch 'develop' into standalone_develop 2022-11-02 14:22:14 +08:00
07aefa79eb 更改:项目后台管理移除精选设置 2022-11-02 14:21:49 +08:00
2da84146eb Merge branch 'develop' into standalone_develop 2022-10-21 14:32:03 +08:00
cad7e24299 修复:项目列表表头样式 2022-10-18 15:53:37 +08:00
fa48e3f5ca 修复:许可证和忽略文件内容为空表单提示 2022-10-18 11:14:35 +08:00
a494a905fa Merge branch 'develop' into standalone_develop 2022-10-17 13:16:49 +08:00
dcc7ab6738 更改:项目分类去掉图片上传 2022-10-17 13:01:08 +08:00
2cdcd5f117 Merge branch 'develop' into standalone_develop 2022-10-14 15:31:39 +08:00
6383384287 更改:后台管理用户真实姓名改为昵称 2022-10-14 15:31:20 +08:00
“xxq250”
e33448db4d fixed nps统计 2022-09-26 16:53:55 +08:00
“xxq250”
2adf87a289 fixed nps数据统计 2022-09-20 09:52:40 +08:00
“xxq250”
b3afa15d2e fixed nps数据统计 2022-09-20 09:52:14 +08:00
“xxq250”
b40f48f87e Merge branch 'develop' into standalone_develop 2022-09-20 09:48:10 +08:00
“xxq250”
6954a860af fixed nps数据统计 2022-09-20 09:47:29 +08:00
“xxq250”
b07e5d6993 Merge remote-tracking branch 'origin/develop' into standalone_develop 2022-09-20 09:43:20 +08:00
“xxq250”
bb8e6aeaf8 nps数据统计 2022-09-20 09:41:27 +08:00
dfc2c68225 新增:管理后台新增类型筛选 2022-09-15 10:21:39 +08:00
“xxq250”
60894f00b1 nps已打分区分 2022-09-06 10:29:51 +08:00
“xxq250”
925b05e004 nps已打分区分 2022-09-06 10:29:49 +08:00
“xxq250”
f2b55977c9 nps已打分区分 2022-09-05 13:44:26 +08:00
“xxq250”
fd66a3149d nps已打分区分 2022-09-05 13:44:23 +08:00
“xxq250”
d51bb7030f Merge remote-tracking branch 'origin/develop' into standalone_develop
# Conflicts:
#	app/views/users/get_user_info.json.jbuilder
2022-08-30 18:14:17 +08:00
“xxq250”
7148957368 nps用户调研 2022-08-30 18:10:27 +08:00
xiaoxiaoqiong
04b9e43382 fixed 后台统计优化,新增项目数 2022-07-18 11:14:45 +08:00
xiaoxiaoqiong
07518f0d00 fixed 后台统计优化,新增项目数 2022-07-18 11:11:15 +08:00
xiaoxiaoqiong
e6e1b56309 后台统计优化 2022-07-18 10:42:45 +08:00
xiaoxiaoqiong
8dae15225e 后台统计优化 2022-07-18 10:37:53 +08:00
e69fe13745 merge from develop 2022-06-01 10:03:29 +08:00
877948b0cd 新增: 通用消息模板后台创建 2022-06-01 10:00:57 +08:00
d9b3711e08 Merge branch 'develop' into standalone_develop 2022-05-16 16:59:36 +08:00
77620f7735 add: download and import user template xlsx 2022-05-16 16:59:25 +08:00
7aea481ccf add: glcc_apply_infomations admin navbar 2022-04-18 10:24:54 +08:00
8aa935ad5c add: glcc news management and api data 2022-04-07 16:13:32 +08:00
5e696ae905 Merge branch 'develop' into standalone_develop 2022-02-15 17:33:55 +08:00
xiaoxiaoqiong
2f170a54c6 fixed setting编辑类型下拉选中 2022-02-15 17:10:57 +08:00
jasder
651bf34cfc FIX code review and conflict 2021-11-14 20:50:22 +08:00
jasder
03beee6cae FIX code review 2021-11-11 18:03:30 +08:00
jasder
9d05973700 FIX 解决featrue_homepage分支代码冲突 2021-11-08 15:07:35 +08:00
jasder
7ad3789fe2 FIX 解决develop分支代码冲突 2021-11-08 14:59:06 +08:00
jasder
e3588291b2 Merge pull request '首页api数据以及后台管理' (#240) from yystopf/forgeplus:hh_home_index into featrue_homepage 2021-11-08 14:35:19 +08:00
jasder
c19c83d505 Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop 2021-11-05 11:36:51 +08:00
jasder
9f31dc02f4 FIX 后台管理修改用户信息时同步git用户 2021-11-04 17:58:45 +08:00