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

381 Commits

Author SHA1 Message Date
yystopf 781babaa36 Merge branch 'standalone_develop' into dev_osredm_server 2025-11-06 16:09:35 +08:00
xxq250 c56a25cdf4 fixed zip js/css 2025-11-05 17:39:02 +08:00
xxq250 ede4e2ab9c fixed zip js/css 2025-11-05 17:35:24 +08:00
xxq250 b2ac855141 fixed zip js/css 2025-11-04 14:45:27 +08:00
yystopf f5f24a3b1d fix: 无法读取样式 2025-11-04 13:52:06 +08:00
yystopf f2370da548 Merge branch 'standalone_develop' into dev_osredm_server 2025-11-04 11:52:48 +08:00
yystopf 0b894bd177 Merge branch 'standalone_develop' into dev_osredm_server 2025-11-04 11:47:19 +08:00
yystopf 0d1ed72a18 fix: 更改验证密码长度 2025-11-04 11:46:28 +08:00
yystopf 4aab0ddf51 fix：回滚edit.js 2025-11-04 11:40:19 +08:00
Your Name e3dd23da3f fix: 样式 2025-11-04 11:39:47 +08:00
yystopf a25db1afbf Merge branch 'standalone_develop' into dev_osredm_server 2025-11-04 11:32:39 +08:00
yystopf 907ee60c1d 修复：后台管理密码位数为8 2025-11-04 11:30:14 +08:00
yystopf 300dd0c863 新增：测试导入导出文件 2025-07-24 10:45:17 +08:00
yystopf 6c7eaaff07 新增：测试导入模板 2025-06-25 10:04:04 +08:00
xxq250 d13e8531ff add 竞赛复赛数据 2025-05-26 16:39:55 +08:00
yystopf 74a5f83ccf 更改：assets compiler 2025-05-12 16:51:07 +08:00
xxq250 9cb4c214c0 fixed import_user.xlsx,num 2025-05-07 08:54:03 +08:00
xxq250 8e5aef8fc7 fixed import_user.xlsx 2025-05-06 16:05:33 +08:00
xxq250 b760d17988 Merge branch 'standalone_develop' into dev_osredm_server 
# Conflicts:
#	app/controllers/accounts_controller.rb
#	app/controllers/admins/users_controller.rb
#	app/controllers/application_controller.rb
#	app/controllers/owners_controller.rb
#	app/helpers/application_helper.rb
#	app/helpers/avatar_helper.rb
#	app/models/edu_setting.rb
#	app/models/user.rb
#	app/models/user_action.rb
#	app/views/layouts/admin.html.erb
#	app/views/projects/index.json.jbuilder
#	config/harmonious_dictionary/chinese_dictionary.txt
#	config/harmonious_dictionary/harmonious.hash
#	config/harmonious_dictionary/harmonious_english.yml
#	config/routes/api.rb
 2025-03-20 14:32:54 +08:00
xxq250 bb7125f266 fixed 删除用户图标 2024-10-11 14:53:36 +08:00
xxq250 3ada004098 风雷协议区分个人和企业版 2024-09-13 15:02:50 +08:00
xxq250 da93156c84 api logo 2024-07-02 09:31:51 +08:00
xxq250 6f49ab240b zip 后端js,css 2024-05-22 10:19:29 +08:00
xxq250 0d2c6665c1 zip 后端js,css 2024-05-22 09:13:16 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
yystopf c8b37448d5 新增：前端配置文件 2024-04-03 14:51:24 +08:00
yystopf 6e2816af75 新增：同步acge用户并同时创建平台账号 2024-03-21 14:58:35 +08:00
yystopf d6acce86a7 更改：marked.min.js文件替换 2024-03-21 10:28:01 +08:00
yystopf 444c57c237 更改：marked.min.js文件替换 2024-03-19 10:03:39 +08:00
xxq250 8d124a5128 增加开源协议，并支持对应文件下载 2024-02-01 15:13:13 +08:00
xxq250 af033bb8d0 废弃代码 2023-10-18 11:34:44 +08:00
xxq250 72469f9104 fixed 风雷协议配置 2023-09-13 16:14:11 +08:00
xxq250 34d763005e js zip 2023-08-15 17:28:15 +08:00
xxq250 f9a02c3bd6 后台js打包 2023-06-21 16:32:58 +08:00
xxq250 2a956d02ed openkylin导入 2023-04-25 10:58:47 +08:00
xxq250 7c249ea9fa openkylin导入 2023-04-25 10:51:03 +08:00
yystopf dfd4ff55a5 Merge branch 'pre_trustie_server' into trustie_server 2023-04-07 17:23:17 +08:00
yystopf b3de601527 Merge branch 'standalone_develop' into pre_trustie_server 2023-04-07 17:18:26 +08:00
yystopf 7fdbc3dad1 更改：api文档官网地址 2023-04-04 16:57:54 +08:00
yystopf 200b954f41 新增：初始化区块链脚本 2023-03-23 15:54:37 +08:00
yystopf 4952373655 新增：固定数据清洗及获取 2023-03-23 13:54:35 +08:00
xxq250 fbc8d68996 Merge branch 'standalone_develop' into pre_trustie_server 2022-12-26 11:31:11 +08:00
xxq250 87ee19e882 fixed 授权登录绑定账号返回用户信息 2022-12-26 11:19:58 +08:00
“xxq250” 10b3eb8a7b 导入用户 2022-10-25 22:04:56 +08:00
“xxq250” f39873efd8 导入用户 2022-10-25 22:02:59 +08:00
“xxq250” f880b316b9 导入用户 2022-10-25 22:00:11 +08:00
“xxq250” 074b999b2b 导入用户 2022-10-25 21:57:27 +08:00
“xxq250” ef867e1e83 导入用户 2022-10-22 22:41:45 +08:00
“xxq250” 4c4f4396fe 导入用户 2022-10-22 22:27:32 +08:00
“xxq250” e99333113f 导入用户 2022-10-22 22:23:19 +08:00