floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
5,944 Commits 7 Branches 16 Tags 707 MiB
Commit Graph

191 Commits

Author SHA1 Message Date
yystopf 6e46b683e1 Merge branch 'develop' into standalone_develop 2022-11-11 14:13:56 +08:00
yystopf 4cde7c374e 更改：反馈意见编辑器隐藏上传按钮 2022-11-11 14:04:36 +08:00
yystopf 7492662f7d Merge branch 'develop' into standalone_develop 2022-11-10 16:22:40 +08:00
yystopf ef83697cb8 修复：tooltip闪烁问题 2022-11-10 16:21:43 +08:00
yystopf e92588cf6d Merge branch 'develop' into standalone_develop 2022-11-09 14:56:43 +08:00
yystopf e24921bba3 修复 2022-11-09 14:56:27 +08:00
yystopf f75e05bb84 Merge branch 'develop' into standalone_develop 2022-11-09 14:55:06 +08:00
yystopf e4d62c5335 新增：字符串截取展示 2022-11-09 14:54:43 +08:00
yystopf 33a3d7f48c merge from develop 2022-11-09 14:37:27 +08:00
yystopf 83b46fcb50 新增：用户反馈意见后台管理逻辑 2022-11-09 11:37:12 +08:00
viletyy 0a06b2098b Merge branch 'develop' into standalone_develop 2022-11-02 14:22:14 +08:00
yystopf 07aefa79eb 更改：项目后台管理移除精选设置 2022-11-02 14:21:49 +08:00
viletyy 2da84146eb Merge branch 'develop' into standalone_develop 2022-10-21 14:32:03 +08:00
yystopf cad7e24299 修复：项目列表表头样式 2022-10-18 15:53:37 +08:00
yystopf fa48e3f5ca 修复：许可证和忽略文件内容为空表单提示 2022-10-18 11:14:35 +08:00
viletyy a494a905fa Merge branch 'develop' into standalone_develop 2022-10-17 13:16:49 +08:00
yystopf dcc7ab6738 更改：项目分类去掉图片上传 2022-10-17 13:01:08 +08:00
viletyy 2cdcd5f117 Merge branch 'develop' into standalone_develop 2022-10-14 15:31:39 +08:00
yystopf 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
yystopf 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
yystopf e69fe13745 merge from develop 2022-06-01 10:03:29 +08:00
yystopf 877948b0cd 新增: 通用消息模板后台创建 2022-06-01 10:00:57 +08:00
yystopf d9b3711e08 Merge branch 'develop' into standalone_develop 2022-05-16 16:59:36 +08:00
yystopf 77620f7735 add: download and import user template xlsx 2022-05-16 16:59:25 +08:00
yystopf 7aea481ccf add: glcc_apply_infomations admin navbar 2022-04-18 10:24:54 +08:00
yystopf 8aa935ad5c add: glcc news management and api data 2022-04-07 16:13:32 +08:00
yystopf 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
yystopf a3f57d3cbc fix: paginate and img width 2021-11-03 11:38:47 +08:00
yystopf 35f04afe91 add: home index admins 2021-11-02 19:00:07 +08:00
yystopf de2399a0a1 fix: project category load slowly 2021-10-29 19:54:58 +08:00
yystopf 3f690fd9a0 add: pinned projects size 2021-10-28 11:00:32 +08:00
yystopf 2b6d5e694e fix 2021-10-28 10:56:30 +08:00
yystopf 43dc966cf9 add: project category upload logo 2021-10-27 18:02:21 +08:00
yystopf f0580720e3 fix 2021-10-27 16:58:31 +08:00
yystopf 91852d7957 add: project explore management 2021-10-27 16:50:18 +08:00
jasder 74a7bc62ea FIX 合并develop分支代码并处理冲突 2021-10-22 11:16:22 +08:00
yystopf 0d60e58304 fix: system notification edit error 2021-10-18 13:51:32 +08:00
yystopf d176508010 add: system notification management 2021-10-18 13:49:58 +08:00
yystopf 04207595d8 fix: template fix 2021-09-24 15:40:07 +08:00
yystopf 6b68ea998d add: email message sended by html 2021-09-24 15:37:55 +08:00
yystopf 1c27e9ccd8 fix: textarea md editor 2021-09-23 17:08:53 +08:00
yystopf 53212975f1 add: init data button 2021-09-22 09:53:43 +08:00
yystopf 0581c59a84 fix: message template simple type 2021-09-18 18:50:45 +08:00
yystopf d957e0544f add: message template management 2021-09-18 18:41:03 +08:00
jasder 4c41d50506 ADD 后台系统配置管理功能 2021-09-10 15:29:08 +08:00
jasder 36adfcf016 FIX 整理后台管理相关功能 2021-09-09 17:34:09 +08:00
yystopf 4cb71179fd add: reversed keyword management 2021-08-31 14:22:49 +08:00
jasder 6f19093dc2 FIX merge develop flick 2021-06-18 17:23:48 +08:00
jasder d2340e30cb ADD admim statistics url 2021-06-11 11:21:44 +08:00
jasder aeeaedbd7a Merge branch 'develop' into standalone 2021-05-24 10:11:02 +08:00
jasder dac07bcae0 ADD 页面置顶功能、帮助文档快速入口 2021-05-14 16:23:19 +08:00
jasder 60b22b3912 Merge develop 2021-05-08 18:16:45 +08:00
jasder 95a355b87c FIX admin projects api bug 2021-04-26 16:45:26 +08:00
jasder 7c2aa2209d delete helps sidebar 2021-03-31 11:21:09 +08:00
sylor_huang@126.com 248eadb918 Add Setting button 2020-10-16 16:43:59 +08:00
sylor_huang@126.com 3596ddeee4 Change 2020-08-12 15:03:14 +08:00
sylor_huang@126.com 5465d61d50 Fix bugs 2020-07-22 17:22:23 +08:00
sylor_huang@126.com 24d73f4eb6 Fix admin project list 2020-07-22 17:21:59 +08:00
sylor_huang@126.com 0b3683b99e 修改部分bug 2020-05-25 14:22:57 +08:00
sylor_huang@126.com cf20cc3a0b 修改admins页面的sidekiq 2020-05-14 18:25:11 +08:00
sylor_huang@126.com 5d770c14a7 修改sidekiq为admins才能看 2020-05-14 18:13:07 +08:00
sylor_huang@126.com ac2e3ae730 admins 页面的修改 2020-05-14 18:08:27 +08:00
Jasder 260e6f8932 FIX 更改云上实验室主站配置 2020-04-24 10:15:02 +08:00
Jasder f1aea1fc7d FIX admin 2020-04-16 09:42:56 +08:00
Jasder 546e112f80 FIX 解决后台管理导航的问题 2020-04-02 14:33:13 +08:00
Jasder 2937b2a94d init project 2020-03-09 00:40:16 +08:00