anph
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,508 Commits 48 Branches 16 Tags 710 MiB
Commit Graph

205 Commits

Author SHA1 Message Date
“xxq250” 1731d5fc20 fixed 小程序活动后台管理问题修复 2022-11-07 15:15:04 +08:00
“xxq250” 4560b9231e fixed 小程序活动 2022-11-04 11:23:47 +08:00
“xxq250” eb7f4e6da3 fixed 资讯增加活动报名 2022-10-24 16:21:42 +08:00
“xxq250” 548a983a7a fixed 竞赛增加访问量 2022-10-12 10:32:40 +08:00
“xxq250” 1852070f5b fixed 竞赛增加开始时间 2022-10-11 16:16:44 +08:00
“xxq250” 16205927d8 fixed 关注竞赛 2022-10-09 10:05:39 +08:00
“xxq250” 997ab5a8f8 注册增加专业领域 2022-10-08 15:37:01 +08:00
“xxq250” 497342bcff 合并develop代码，pr_reviews 2022-09-27 15:43:23 +08:00
“xxq250” cb302b50dd Merge branch 'develop' into dev_jk_server 
# Conflicts:
#	app/assets/javascripts/admin.js
#	app/controllers/accounts_controller.rb
#	app/controllers/application_controller.rb
#	app/controllers/attachments_controller.rb
#	app/controllers/concerns/login_helper.rb
#	app/controllers/concerns/register_helper.rb
#	app/controllers/concerns/render_helper.rb
#	app/controllers/concerns/repository/languages_percentagable.rb
#	app/controllers/repositories_controller.rb
#	app/controllers/users/is_pinned_projects_controller.rb
#	app/controllers/users_controller.rb
#	app/docs/slate/source/api.html.md
#	app/docs/slate/source/includes/_projects.md
#	app/docs/slate/source/includes/_pulls.md
#	app/docs/slate/source/includes/_repositories.md
#	app/docs/slate/source/includes/_teams.md
#	app/docs/slate/source/includes/_users.md
#	app/helpers/application_helper.rb
#	app/imports/admins/new_import_user_from_excel.rb
#	app/libs/custom_regexp.rb
#	app/models/journal.rb
#	app/models/project.rb
#	app/models/user.rb
#	app/queries/admins/user_query.rb
#	app/services/admins/import_user_from_excel_service.rb
#	app/views/admins/users/index.html.erb
#	app/views/members/index.json.jbuilder
#	app/views/settings/show.json.jbuilder
#	config/routes.rb
#	public/导入用户模板.xlsx
 2022-09-27 15:32:46 +08:00
“xxq250” fd07a8c6ae 竞赛增加小程序banner配置 2022-09-23 11:02:00 +08:00
“xxq250” f072a2a7f3 小程序banner增加显示位置 2022-09-23 10:25:21 +08:00
yystopf cc42683316 新增：活跃度计算访问量限制 2022-09-23 10:07:52 +08:00
“xxq250” c42fa03b8b 竞赛上架下架开关 2022-09-06 13:51:50 +08:00
“xxq250” 7148957368 nps用户调研 2022-08-30 18:10:27 +08:00
“xxq250” cfadde830f fixed 组织新闻增加标题和跳转url 2022-07-29 14:54:24 +08:00
“xxq250” 4ccf8ea5ff CloudIDEA文件标记已读未读 2022-07-28 16:42:21 +08:00
“xxq250” 0a87973e71 移植gitlink中banner模块 2022-07-27 16:02:55 +08:00
“xxq250” 0f0d348d9f 增加组织的新闻和介绍 2022-07-27 15:03:27 +08:00
yystopf d6b5dc326a 新增: 评论相关api根据需求重写 2022-07-27 14:52:49 +08:00
“xxq250” 5877474f59 Merge remote-tracking branch 'origin/develop' into develop 2022-07-26 10:44:21 +08:00
“xxq250” 1bbde165c2 reposyncer同步仓库接口 2022-07-26 10:44:12 +08:00
yystopf 1feb166fd5 修复：合并请求评审模型修改 2022-07-25 16:20:42 +08:00
xiaoxiaoqiong ed0655452c 增加从webhook接收仓库日志记录 2022-07-18 09:34:56 +08:00
yystopf 76cc185a1d 新增: 合并请求审核model 2022-06-29 17:16:29 +08:00
xiaoxiaoqiong 9a5ce74d98 定制竞赛排行榜 2022-06-23 08:50:33 +08:00
yystopf 531495429c 修复: 无法正常更改token长度的问题 2022-06-20 13:05:25 +08:00
yystopf bed2469014 fix: change error 2022-06-20 10:34:25 +08:00
yystopf 1ebb6cb561 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-06-20 09:34:29 +08:00
yystopf 21ccedab9c 修复: doorkeeper 无法生成jwt token 2022-06-17 18:33:37 +08:00
xiaoxiaoqiong 1f9caeece5 auth2接入 2022-06-17 17:02:24 +08:00
yystopf c42f3d5928 新增：邀请用户链接生成 2022-06-17 14:06:59 +08:00
xiaoxiaoqiong 5b33da0aa5 竞赛配置加映射关系字段，增加报名字段 2022-05-19 17:41:49 +08:00
yystopf 000197b0d1 fix: issues and pull_request length calculate 2022-05-06 17:25:34 +08:00
yystopf ec3a556a6f fix: default value for show super description 2022-04-28 11:03:42 +08:00
yystopf 396ac55429 add: user super description 2022-04-28 10:42:55 +08:00
xiaoxiaoqiong 50db13a7ef 管理员新字段 2022-04-27 18:14:12 +08:00
xiaoxiaoqiong 2d067f0a18 定制竞赛作品下载 2022-04-27 11:11:10 +08:00
xiaoxiaoqiong c00a8a67f9 竞赛报名状态变更 2022-04-21 10:33:04 +08:00
yystopf 4bbb843edf add: trace users and get trace token 2022-03-31 12:54:39 +08:00
xiaoxiaoqiong f0fc456a1c merge local 2022-03-30 14:13:42 +08:00
xiaoxiaoqiong 2f06e89b54 竞赛banner_url 2022-03-30 14:10:19 +08:00
xiaoxiaoqiong 3f0ded057b merge local 2022-03-28 18:07:32 +08:00
xiaoxiaoqiong a72a0de2b9 竞赛配置增加属性，通知管理 2022-03-28 18:05:31 +08:00
xiaoxiaoqiong cee09d9f8f Merge branch 'dev_military_server_local' into dev_jk_server 
# Conflicts:
#	app/controllers/accounts_controller.rb
#	app/controllers/concerns/login_helper.rb
#	app/controllers/users_controller.rb
#	config/routes.rb
 2022-03-24 16:35:04 +08:00
xiaoxiaoqiong 7ab87df7fc 启智竞赛接口调整 2022-03-24 16:03:01 +08:00
xiaoxiaoqiong 9b91557bb6 启智竞赛 2022-03-23 16:40:53 +08:00
yystopf 04f2dbee9a merge from develop 2022-01-18 15:30:57 +08:00
yystopf 8e79b43aaf add: member bind team user 2021-12-22 11:16:27 +08:00
yystopf 43cccc5429 fix: admins navbar and platform communicates order index and competitions filter 2021-12-09 14:04:03 +08:00
yystopf 4310cc9f26 add: platform person admin 2021-12-06 16:41:12 +08:00