adminWzh
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
881 Commits 78 Branches 2 Tags 702 MiB
Commit Graph

184 Commits

Author SHA1 Message Date
caishi fdca717eeb imageUrl + / 2021-04-23 16:13:55 +08:00
caishi af2feeb34f 新建组织-组织账号正则 2021-04-23 16:12:58 +08:00
caishi 40918bf1d7 merge develop 2021-04-23 16:12:35 +08:00
caishi 1f6a4bda6c readme-文件增加一个目录下拉icon 2021-04-20 09:42:47 +08:00
caishi 21902543f4 新增组织账号，组织名称增加新的check条件 2021-04-06 18:40:59 +08:00
caishi 2383710c54 通知、消息的地址，trustie改为educoder 2021-04-01 15:46:51 +08:00
caishi c74c40b73e 冲突 2021-03-31 14:06:13 +08:00
caishi 74deb640a9 合并 2021-03-31 11:37:05 +08:00
caishi f2ef3183ea toubu 2021-03-30 13:46:52 +08:00
caishi 29f37b9760 代码冲突 2021-03-26 10:04:01 +08:00
caishi 29f25a585d Merge branch 'develop_new' into develop_educoder 
# Conflicts:
#	src/forge/Head/Header.js
#	src/modules/tpm/TPMIndex.css
#	src/modules/tpm/TPMIndexHOC.js
 2021-03-24 14:11:12 +08:00
caishi 26e74e7ed4 condition 2021-03-23 17:40:23 +08:00
caishi 68b1296652 Merge branch 'develop_new' into develop_educoder 
# Conflicts:
#	src/modules/tpm/NewHeader.js
 2021-03-23 16:13:36 +08:00
caishi 3384cd2703 style+banner 2021-03-23 09:20:16 +08:00
caishi 0f7c8a4b5d style 2021-03-22 16:54:41 +08:00
caishi 98289b05aa 未登录不弹框 2021-03-22 14:19:50 +08:00
caishi 83086e7d61 导航栏和底部 2021-03-22 13:51:02 +08:00
caishi 65b906f49f update 2021-03-19 16:31:46 +08:00
caishi 284bf67f82 educoder和forge用户的密码是否一致 2021-03-19 13:44:02 +08:00
caishi fbdde52651 弹框修改接口 2021-03-19 11:52:04 +08:00
caishi 64dcdce51b Merge branch 'develop_new' into develop_educoder 2021-03-19 11:35:20 +08:00
caishi d16ee801ec 背景色 2021-03-19 11:35:03 +08:00
caishi 741a461f7e 邮箱绑定 2021-03-19 09:33:22 +08:00
caishi 98d40482f3 issue 2021-02-05 16:19:35 +08:00
caishi 828cc2470d 个人中心-我的组织 2021-01-29 17:26:08 +08:00
caishi 586d9e0c05 新建组织 2021-01-25 10:49:39 +08:00
caishi 0b007b35d9 new 2021-01-19 18:11:38 +08:00
caishi e3c1e7b82f markdown 2020-12-17 17:59:30 +08:00
caishi 7795fe1d04 markdown 2020-12-17 14:35:36 +08:00
caishi e95ef11058 style 2020-12-11 18:14:25 +08:00
caishi ccb5eb8ae5 Merge commit 'ef6559400411d4e9de4072441c9865e226936ba7' into dev_bei 
# Conflicts:
#	src/AppConfig.js
 2020-11-26 11:21:48 +08:00
caishi b27f0e796d === 2020-11-25 12:39:59 +08:00
caishi cbfb9c3ffe 本地版本-注册页面 2020-11-18 11:31:52 +08:00
caishi 0c59855e9c bug 2020-11-11 16:09:57 +08:00
caishi 0cb6986aed 无数据提示 2020-10-30 10:42:02 +08:00
caishi 849f695a78 Merge branch 'newVersion_forge' into dev_devOps 2020-10-21 16:50:15 +08:00
caishi d80f1d32dc 非trustie则新开页 2020-10-21 16:49:59 +08:00
caishi b6dfe2cd4a Merge branch 'newVersion_forge' into dev_devOps 
# Conflicts:
#	src/forge/Main/Detail.js
 2020-10-19 15:43:53 +08:00
sylor_huang@126.com 5a8daf7cfe Change NewHeader active 2020-10-16 17:17:14 +08:00
caishi aca923fe07 Merge branch 'newVersion_forge' into dev_devOps 2020-10-16 10:36:04 +08:00
caishi 4f13421872 style 2020-10-12 14:00:18 +08:00
caishi c66717bf1b Merge branch 'newVersion_forge' into dev_devOps 2020-10-10 10:11:58 +08:00
caishi 37b0ca5817 detail update 2020-10-10 10:11:44 +08:00
caishi 8b1b923c92 Merge branch 'newVersion_forge' into dev_devOps 2020-10-09 16:32:59 +08:00
caishi c93b874493 背景颜色 2020-10-09 16:32:47 +08:00
caishi 229b5a704e Merge branch 'newVersion_forge' into dev_devOps 2020-10-09 09:25:08 +08:00
caishi 36a9f16634 头部改版 2020-10-09 09:24:57 +08:00
caishi a14b125d34 Merge branch 'newVersion_forge' into dev_devOps 2020-09-29 10:41:17 +08:00
caishi d7103d44f7 decodeURL 2020-09-29 10:41:04 +08:00
caishi c3ed52bc32 Merge branch 'newVersion_forge' into dev_devOps 2020-09-27 13:59:04 +08:00