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

504 Commits

Author SHA1 Message Date
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 ae3057d150 项目简介长度2000 2022-03-30 13:51:00 +08:00
xiaoxiaoqiong 033865df66 项目简介长度2000 2022-03-30 13:49:54 +08:00
xiaoxiaoqiong e4ec205890 Merge branch 'dev_military_server_local' into dev_jk_server 2022-03-29 17:50:54 +08:00
xiaoxiaoqiong aa9006bfe5 管理员状态，和管理赛区 2022-03-29 17:50:26 +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 c4843da207 Merge branch 'dev_military_server_local' into dev_jk_server 2022-03-25 14:39:06 +08:00
xiaoxiaoqiong 78cee5f7d1 启智竞赛报名导出 2022-03-25 13:56:23 +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 78fd1d158f 启智竞赛接口 2022-03-24 10:15:24 +08:00
xiaoxiaoqiong 9b91557bb6 启智竞赛 2022-03-23 16:40:53 +08:00
yystopf e489c57fe8 fix: merge from develop 2022-03-10 11:07:14 +08:00
xiaoxiaoqiong 747bc4ab45 fixed 项目中发行版 2022-03-08 14:01:44 +08:00
yystopf 5cb2e55f74 add: organization users insist team nickname search 2022-03-07 09:58:05 +08:00
xiaoxiaoqiong 9b08a09a1b 登录密码支持base64 2022-03-02 18:02:19 +08:00
yystopf 9e2db8a7f6 fix: merge from develop 2022-03-01 17:37:10 +08:00
yystopf 1a93477635 fix: forked templete delay 2022-02-24 14:26:04 +08:00
xiaoxiaoqiong fcc827522c Merge branch 'develop' into dev_jk_server 2022-02-21 16:49:21 +08:00
xiaoxiaoqiong 4e3f9cc019 竞赛通知任务调度 2022-02-21 16:48:59 +08:00
xiaoxiaoqiong fe08cab2e5 Merge branch 'develop' into dev_jk_server 2022-02-21 16:47:08 +08:00
xiaoxiaoqiong 5ed7b3e4ad 竞赛通知任务调度 2022-02-21 16:46:40 +08:00
xiaoxiaoqiong 2e511655f6 Merge branch 'develop' into dev_jk_server 
# Conflicts:
#	app/models/concerns/matchable.rb
#	config/routes.rb
 2022-02-17 18:31:25 +08:00
xiaoxiaoqiong 4e2c46260c Merge remote-tracking branch 'origin/develop' into develop 2022-02-17 18:28:40 +08:00
xiaoxiaoqiong 9ba00b21c9 竞赛通知api 2022-02-17 18:28:32 +08:00
yystopf b11f5fd228 fix: cache rollback 2022-02-17 11:12:50 +08:00
yystopf 90dbe0730a fix: job not affect 2022-02-17 10:59:18 +08:00
yystopf d6633cb73a fix 2022-02-17 09:43:44 +08:00
yystopf a7a6abd22a fix: add rule for issue expire 2022-02-17 09:40:44 +08:00
yystopf c956667ce0 fix 2022-02-17 09:36:49 +08:00
yystopf 5701c818ed fix 2022-02-16 15:10:10 +08:00
yystopf 1ac2ddfaa5 fix: default setting for new template message 2022-02-16 11:46:34 +08:00
yystopf 84b56bfcb8 fix: project milestone create notice template 2022-02-16 09:34:31 +08:00
yystopf 7485564bb9 add: template message platform varible 2022-02-15 18:30:13 +08:00
yystopf e3f4313c80 fix 2022-02-15 17:29:13 +08:00
yystopf b223abe229 fix: init data 2022-02-15 17:26:46 +08:00
yystopf b3bede308c add: some new message rules 2022-02-15 17:13:06 +08:00
yystopf 22293572ac fix: issue changed about version callback 2022-02-14 17:02:59 +08:00
yystopf 959c1e8d95 add: user profile setting message 2022-02-14 13:55:34 +08:00
yystopf 29dc3fff39 fix: migrate use old rule 2022-02-11 16:27:22 +08:00
yystopf 298abdd1b1 fix: devops organization bug 2022-02-10 14:08:14 +08:00
yystopf 380ca3a066 fix: projects query rule 2022-01-24 14:26:24 +08:00
yystopf 237b0afb08 fix: team user build use find or create by 2022-01-24 10:44:46 +08:00
yystopf 04f2dbee9a merge from develop 2022-01-18 15:30:57 +08:00
yystopf 84f12adce8 fix: webhook tasks list error delay 2022-01-06 14:29:31 +08:00
yystopf 12edc620df fix: complete profile condition 2021-12-24 16:15:59 +08:00
yystopf 4ce03145df fix 2021-12-23 14:33:31 +08:00
yystopf 3e04a37ece add: team remove and joined template message 2021-12-23 14:26:40 +08:00