maxjhandsome
/
forgeplus-react
forked from tongChong/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,742 Commits 52 Branches 0 Tags 116 MiB
Commit Graph

229 Commits

Author SHA1 Message Date
caishi 30c61f0a7d 上线update 2021-10-29 17:01:55 +08:00
caishi 743dabd553 需求+设计+bug修改 2021-10-29 14:18:30 +08:00
caishi a93b8a08c9 register 2021-10-28 18:23:22 +08:00
jasder 1c48ffb130 合并平台首页、项目首页功能分支，并处理代码冲突 2021-10-28 18:11:07 +08:00
caishi c79be9a597 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into featrue_project_homepage 2021-10-28 17:41:54 +08:00
caishi 61ee3fe36f 注册页面相关信息修改 2021-10-28 17:25:50 +08:00
caishi 3d3ef19d4a 项目首页 banner 2021-10-26 09:40:35 +08:00
caishi d37709b1a5 首页文件夹 2021-10-25 11:24:21 +08:00
caishi f89f4b6628 Merge branch 'standalone_develop' of https://git.trustie.net/Gitlink/forgeplus-react into feature_homepage 2021-10-22 14:33:40 +08:00
caishi 848109afe8 settings 2021-10-22 11:40:41 +08:00
caishi 254b3173d1 merge 2021-10-22 11:25:44 +08:00
caishi 44f06b7305 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into feature_homepage 
# Conflicts:
#	public/css/iconfont.css
#	public/css/iconfont.js
#	public/css/iconfont.json
#	public/css/iconfont.ttf
#	public/css/iconfont.woff
#	public/css/iconfont.woff2
#	src/App.js
#	src/forge/Head/Footer.jsx
#	src/modules/tpm/TPMIndexHOC.js
 2021-10-22 10:33:18 +08:00
caishi 42139ef998 settings多次声明 2021-10-21 18:30:28 +08:00
jasder ad1f0e29e7 FIX 合并主干分支代码并解决冲突 2021-10-21 18:24:06 +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 0c816805fb gitlink 首页：合作单位的image以及需求更新 2021-09-28 16:08:25 +08:00
caishi 0b2a5a910b 修改代码库二级页面（一部分） 2021-09-16 09:19:25 +08:00
caishi d558443c22 style 2021-09-09 16:09:16 +08:00
caishi 984856a29c md fullscreen 2021-09-06 17:48:13 +08:00
caishi 411b4e9de6 代码库样式整改 2021-09-06 17:47:47 +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
caishi a257d832cb issue 2021-06-09 18:08:01 +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 465c4cc8c7 04-28休假期修改issue --需合并至其它分支（合并请求相关） 2021-04-28 20:23:57 +08:00
caishi 2fcb645d42 04-28休假期修改issue --需合并至其它分支（合并请求相关） 2021-04-28 20:17:30 +08:00
caishi 383b3f5d74 imageUrl + / 2021-04-23 16:36:41 +08:00
caishi 3b6cc99d49 merge 2021-04-23 16:35:49 +08:00
caishi d872ffc606 merge 2021-04-23 16:31:15 +08:00
caishi d870f17b85 readme-文件增加一个目录下拉icon 2021-04-23 16:26:02 +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