Commit Graph

220 Commits

Author SHA1 Message Date
caishi bd7e1b2742 整体页面设置最低高度 2021-11-02 14:56:53 +08:00
caishi 9ae3c0e786 Merge branch 'pre_develop_dev' into dev_educoder
# Conflicts:
#	public/css/iconfont.js
#	src/AppConfig.js
#	src/forge/Head/Footer.jsx
#	src/forge/Head/Header.js
#	src/forge/Head/header.scss
#	src/forge/Main/CoderDepot.jsx
#	src/forge/Main/CoderRootCommit.js
#	src/forge/Main/sub/DetailBanner.jsx
#	src/forge/New/Index.js
#	src/forge/Source/Index.jsx
#	src/modules/tpm/TPMIndexHOC.js
2021-10-23 15:41:21 +08:00
jasder e744714da0 Merge pull request 'FIX 合并测试分支代码' (#182) from pre_develop_dev into featrue_system_popup_notification 2021-10-18 11:49:55 +08:00
caishi 0903edfd2c 设置cookie为24小时的限制,超过后重新弹出弹框 2021-10-15 10:27:16 +08:00
caishi fbbb3c3aa6 markdown文件样式影响内容 2021-10-14 10:28:41 +08:00
caishi 5223a84dac 域名更换通知 2021-10-13 17:58:45 +08:00
谢思 30512cb4f4 修改代码库二级改版issue 2021-09-29 21:04:40 +08:00
caishi 0b2a5a910b 修改代码库二级页面(一部分) 2021-09-16 09:19:25 +08:00
caishi d558443c22 style 2021-09-09 16:09:16 +08:00
caishi 5eb542cfbf 同步账号密码 2021-09-08 16:50:16 +08:00
caishi 2f5d9d225c 路由 2021-09-08 11:29:55 +08:00
caishi 984856a29c md fullscreen 2021-09-06 17:48:13 +08:00
caishi 411b4e9de6 代码库样式整改 2021-09-06 17:47:47 +08:00
caishi 2d79d144a0 邮箱弹框点击事件 2021-09-06 10:57:31 +08:00
caishi a209b29100 2021-05-28同步develop分支 2021-09-06 10:57:17 +08:00
caishi 831ff66ebe merge develop 2021-09-06 10:34:54 +08:00
caishi 5f7eaa24c6 通知、消息的地址,trustie改为educoder 2021-09-06 10:24:09 +08:00
caishi e4e419beb2 冲突 2021-09-06 10:20:37 +08:00
caishi dd0a9e50e5 合并 2021-09-06 10:20:17 +08:00
caishi 7f7a1021df toubu 2021-09-06 10:15:53 +08:00
caishi 882d8aef75 代码冲突 2021-09-06 10:15:22 +08:00
caishi b1725a00ee style 2021-09-06 10:11:26 +08:00
caishi 0294439f18 未登录不弹框 2021-09-06 10:11:26 +08:00
caishi e7acb2f142 导航栏和底部 2021-09-06 10:11:26 +08:00
caishi 21ab03f3da update 2021-09-06 10:07:35 +08:00
caishi 76ed232f6a educoder和forge用户的密码是否一致 2021-09-06 10:06:31 +08:00
caishi f14443a6e8 弹框修改接口 2021-09-06 10:05:33 +08:00
caishi 146d4c9baa 邮箱绑定 2021-09-06 10:05:33 +08:00
何童崇 03d568f5f7 合并蔡世代码并解决冲突 2021-09-03 09:26:34 +08:00
何童崇 4f39f03b19 修改路由的issue 2021-09-02 17:20:26 +08:00
caishi 105e1c61b8 个人资料是否完善-弹框 2021-09-01 17:46:58 +08:00
caishi 86f50d4278 基本资料 2021-09-01 11:24:37 +08:00
caishi 58115f8dae box 2021-09-01 10:28:11 +08:00
何童崇 eb02b814a9 修改user路由 2021-08-30 10:31:51 +08:00
caishi 4f9f5649a9 设置模块-测试版第一版 2021-07-22 17:44:12 +08:00
何童崇 1d274985ca 解决冲突并提交 2021-06-11 19:03:17 +08:00
何童崇 b38cdd4bb3 修改search校验,同页搜索问题 2021-06-10 17:05:49 +08:00
何童崇 681d0b17e3 修改搜索的功能及图标 2021-06-09 19:47:14 +08:00
何童崇 ff2586f5b9 注释众包/帖子等tab 2021-06-08 16:05:32 +08:00
caishi 0b7d6ab5fd issue 2021-06-08 14:56:00 +08:00
何童崇 dd9c11dbd9 上传搜索的页面 2021-06-03 10:37:03 +08:00
caishi ebf75ed433 issue 2021-05-21 18:58:17 +08:00
caishi 303e06586e 新增icon+添加右侧的返回顶部等按钮(接口没有,先隐藏、需要合并到其它分支,上一个提交也一样) 2021-05-14 09:32:23 +08:00
caishi 2fcb645d42 04-28休假期修改issue --需合并至其它分支(合并请求相关) 2021-04-28 20:17:30 +08:00
caishi d6d6df806d imageUrl + / 2021-04-23 14:14:06 +08:00
caishi 29e3f0d59d 新建组织-组织账号正则 2021-04-21 16:55:10 +08:00
caishi 233e6a8226 底部样式+新建组织账号正则 2021-04-21 16:54:47 +08:00
caishi b8d40259e5 readme-文件增加一个目录下拉icon 2021-04-19 16:58:30 +08:00
caishi f12228aa51 组织详情显示nickname 2021-04-19 10:35:20 +08:00
caishi bcaec7a2db 新增组织账号,组织名称增加新的check条件 2021-04-06 18:40:01 +08:00