KingChan
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,862 Commits 67 Branches 0 Tags 728 MiB
Commit Graph

2353 Commits

Author SHA1 Message Date
xiaoxiaoqiong c00a8a67f9 竞赛报名状态变更 2022-04-21 10:33:04 +08:00
xiaoxiaoqiong 854ef5ca45 竞赛报名更新 2022-04-21 09:33:47 +08:00
xiaoxiaoqiong dc43b3542c 竞赛外网版本字段控制 2022-04-19 16:05:00 +08:00
xiaoxiaoqiong 1b8006f438 admin_layout 2022-04-13 14:00:31 +08:00
xiaoxiaoqiong 5c123edfaa 删除多的文件 2022-04-11 18:15:34 +08:00
xiaoxiaoqiong 3f94cf3637 登录同步gitea密码 2022-04-11 18:07:07 +08:00
xiaoxiaoqiong 689a91ab49 Merge branch 'dev_military_server_local' into dev_jk_server 
# Conflicts:
#	app/controllers/application_controller.rb
#	app/controllers/attachments_controller.rb
#	app/controllers/competition_infos_controller.rb
 2022-04-11 17:41:03 +08:00
xiaoxiaoqiong a517d1df68 登录cookie_action 2022-04-02 15:49:08 +08:00
xiaoxiaoqiong 547cf7ce86 密码长度20 2022-04-02 10:29:58 +08:00
xiaoxiaoqiong 560adc458c 密码长度20 2022-04-02 10:27:29 +08:00
xiaoxiaoqiong 6dfffb8a6d 竞赛详情更新权限 2022-04-01 19:14:39 +08:00
xiaoxiaoqiong 1c5b42e01b 竞赛详情更新权限 2022-04-01 19:13:46 +08:00
xiaoxiaoqiong 85302102d6 竞赛详情更新权限 2022-04-01 19:10:17 +08:00
xiaoxiaoqiong 316fb0ff58 竞赛详情更新权限 2022-04-01 19:00:27 +08:00
xiaoxiaoqiong d475413fd6 Merge remote-tracking branch 'origin/dev_military_server_local' into dev_military_server_local 2022-04-01 16:44:47 +08:00
xiaoxiaoqiong cd40efc760 竞赛详情更新报错 2022-04-01 16:44:42 +08:00
xiaoxiaoqiong 76ed52b68a 竞赛详情更新报错 2022-04-01 15:09:32 +08:00
xiaoxiaoqiong d1b5ead752 debug模式对应用户 2022-03-31 09:51:24 +08:00
xiaoxiaoqiong 972373a277 上传图片去掉dun检测 2022-03-31 09:39:42 +08:00
xiaoxiaoqiong 66dead1e6a Merge branch 'dev_military_server_local' into dev_jk_server 2022-03-31 09:02:10 +08:00
xiaoxiaoqiong f901ff8920 赛事详编辑方式 2022-03-31 09:01:40 +08:00
xiaoxiaoqiong 00a4be2879 赛事详编辑方式 2022-03-31 08:57:25 +08:00
xiaoxiaoqiong 90738a6117 登录base64 2022-03-30 22:16:31 +08:00
xiaoxiaoqiong dea5a223d1 Merge branch 'dev_military_server_local' into dev_jk_server 2022-03-30 21:07:01 +08:00
xiaoxiaoqiong bd88870405 竞赛通知id 2022-03-30 21:06:30 +08:00
xiaoxiaoqiong 9b11bccd42 Merge branch 'dev_military_server_local' into dev_jk_server 2022-03-30 17:42:57 +08:00
xiaoxiaoqiong fae11267f7 竞赛文案 2022-03-30 17:36:07 +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 ae3057d150 项目简介长度2000 2022-03-30 13:51:00 +08:00
xiaoxiaoqiong 033865df66 项目简介长度2000 2022-03-30 13:49:54 +08:00
xiaoxiaoqiong 7ca13fb387 项目简介长度2000 2022-03-30 13:22:33 +08:00
xiaoxiaoqiong 2fb263d6c9 Merge branch 'dev_military_server_local' into dev_jk_server 2022-03-30 12:25:55 +08:00
xiaoxiaoqiong fda21d782c 竞赛导出调整 2022-03-30 12:25:05 +08:00
xiaoxiaoqiong 71836ca3ae Merge branch 'dev_military_server_local' into dev_jk_server 2022-03-29 17:53:02 +08:00
xiaoxiaoqiong 4dadce904d 管理员状态，和管理赛区 2022-03-29 17:52:34 +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 00c1486e89 Merge branch 'dev_military_server_local' into dev_jk_server 2022-03-29 09:16:54 +08:00
xiaoxiaoqiong f8ef2d48a0 竞赛报名状态 2022-03-29 09:16:34 +08:00
xiaoxiaoqiong 0f83639565 Merge branch 'dev_military_server_local' into dev_jk_server 2022-03-29 09:14:46 +08:00
xiaoxiaoqiong 0607a62b17 竞赛配置增加属性，通知管理 2022-03-29 09:14:10 +08:00
xiaoxiaoqiong 3f0ded057b merge local 2022-03-28 18:07:32 +08:00
xiaoxiaoqiong 1e1d07e697 竞赛配置增加属性，通知管理 2022-03-28 18:05:52 +08:00
xiaoxiaoqiong a72a0de2b9 竞赛配置增加属性，通知管理 2022-03-28 18:05:31 +08:00
xiaoxiaoqiong 6079441f8a Merge branch 'dev_military_server_local' into dev_jk_server 2022-03-28 10:08:38 +08:00
xiaoxiaoqiong f0bc08cd47 附件可重复上传 2022-03-28 10:04:54 +08:00
xiaoxiaoqiong 39526b091b 已报名信息 2022-03-28 09:50:43 +08:00
xiaoxiaoqiong bcd5c6bee0 已报名信息 2022-03-28 09:48:08 +08:00
xiaoxiaoqiong cf0565ddb6 已报名信息 2022-03-28 09:47:21 +08:00