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

1370 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 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 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 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 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 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 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 bcd5c6bee0 已报名信息 2022-03-28 09:48:08 +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 b852b8cf08 启智竞赛接口调整 2022-03-25 09:17:43 +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
xiaoxiaoqiong 521a1a2c8a autologin_action可配置 2022-03-22 15:18:09 +08:00
yystopf e489c57fe8 fix: merge from develop 2022-03-10 11:07:14 +08:00
yystopf 8d0a6d267a fix: download escape 2022-03-10 10:47:06 +08:00
xiaoxiaoqiong cd85fea841 fixed 重复上传协议 2022-03-10 09:53:00 +08:00
yystopf b1c03ed5e8 fix: activity issues must only issue 2022-03-10 09:51:46 +08:00
xiaoxiaoqiong e9daacc1b2 fixed 项目特殊许可证私有可见 2022-03-09 16:09:27 +08:00
xiaoxiaoqiong ce4aee366a fixed 新建issues时分支信息 2022-03-08 14:16:58 +08:00
xiaoxiaoqiong fc3344c78a fixed 项目中下载文件 2022-03-08 13:53:51 +08:00
yystopf e120c4dac2 add: origin repository need open pr menu 2022-03-07 10:53:07 +08:00
yystopf e1cf2fcdeb fix: owner project not allow repeat name 2022-03-07 10:25:05 +08:00
yystopf c4f380873e fix: is public project attachment allow is not member read 2022-03-07 10:20:51 +08:00
yystopf 5cb2e55f74 add: organization users insist team nickname search 2022-03-07 09:58:05 +08:00
xiaoxiaoqiong fbd1533a53 通知竞赛链接跳转 2022-03-02 16:23:58 +08:00