forgeplus-react

Commit Graph

Select branches

Hide Pull Requests

dev_assistance

dev_bei

dev_chain

dev_change_top_navigation

dev_devOps

dev_devopsDispose

dev_edu_local

dev_jupter

dev_local

dev_military

dev_ms_military

dev_mulan

dev_orgnize

dev_orgnize_hs

dev_pr

dev_trustie

dev_trustie_forum

dev_wenba

develop

develop_educoder

develop_new

develop_search

featrue_login_and_register

feature_notification

feature_repo_upgrade

feature_router

gitlink_server

hotfix_websocket

master

mulanoss_git_server

mulanoss_server

newVersion_forge

pre_dev_military

pre_develop

pre_develop_dev

standalone

standalone_develop

test_forge

undo

version_forge

#1

v3.1.5

v3.2.0

631f8ceeea FIX 合并登陆注册功能分支代码 gitlink_server jasder 2021-11-09 09:45:36 +0800
d70ddfb2f7 Merge remote-tracking branch 'gitlink/gitlink_server' into gitlink_server jasder 2021-11-09 09:31:23 +0800
54741a6d8a Merge branch 'develop' into gitlink_server jasder 2021-11-09 09:31:05 +0800
116c3e531f Merge pull request '登陆注册功能' (#250) from durian/forgeplus-react:featrue_login_and_register into featrue_login_and_register jasder 2021-11-09 09:19:36 +0800
990cfe2781 代码优化谢思 2021-11-08 16:44:38 +0800
66e1235c3b 找回密码次数上限+找回密码确认密码优化谢思 2021-11-08 16:39:37 +0800
76fdff6737 背景图片过大加载慢谢思 2021-11-08 16:15:04 +0800
4bc79b5153 添加第三方登录谢思 2021-11-08 15:43:55 +0800
ea979b78ee Merge pull request '目录跳转问题' (#248) from hc1913847458/forgeplus-react:testdev into develop develop jasder 2021-11-08 14:34:11 +0800
b1775e5158 目录跳转问题 hucong 2021-11-08 14:05:39 +0800
3678b8eb72 issue hucong 2021-11-08 13:58:46 +0800
12d8f5bf5d 登陆注册功能谢思 2021-11-08 13:29:12 +0800
e04fb11194 目录跳转问题 hucong 2021-11-05 19:03:24 +0800
010edf3cb2 目录跳转问题 hucong 2021-11-05 18:31:14 +0800
ab26a528b6 Merge pull request 'gitlink首页数据绑定以及需求更改、文案修改等' (#246) from caishi/forgeplus-react:gitlink_server into gitlink_server jasder 2021-11-04 14:18:37 +0800
6d39e25667 Merge pull request 'pr中的用户名称显示问题' (#244) from hc1913847458/forgeplus-react:testdev into develop jasder 2021-11-03 18:46:12 +0800
a2ea832208 gitlink首页-数据绑定 caishi 2021-11-03 18:43:41 +0800
d1bc3680b9 gitlink首页 caishi 2021-11-02 14:15:19 +0800
08416390e5 update caishi 2021-11-02 10:23:04 +0800
190200d1e6 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into testdev hucong 2021-11-01 14:41:27 +0800
b124364203 pr中用户名称显示问题 hucong 2021-11-01 14:40:41 +0800
35c2f63c55 update caishi 2021-10-29 18:22:45 +0800
30c61f0a7d 上线update caishi 2021-10-29 17:01:55 +0800
743dabd553 需求+设计+bug修改 caishi 2021-10-29 14:18:30 +0800
015296e065 merge gitlink首页、项目首页，update caishi 2021-10-29 09:39:59 +0800
48c21ac245 Merge pull request 'merge' (#241) from caishi/forgeplus-react:gitlink_server into gitlink_server jasder 2021-10-28 18:26:10 +0800
a93b8a08c9 register caishi 2021-10-28 18:23:22 +0800
1c48ffb130 合并平台首页、项目首页功能分支，并处理代码冲突 jasder 2021-10-28 18:11:07 +0800
0ee9280bb1 Merge pull request 'fix 开发主干分支并入gitlink服务分支' (#239) from develop into gitlink_server jasder 2021-10-28 17:54:22 +0800
e785e9a358 Merge pull request 'ADD 项目首页功能并入开发分支' (#238) from featrue_project_homepage into develop jasder 2021-10-28 17:53:05 +0800
b3b95e9856 Merge pull request 'merge' (#237) from caishi/forgeplus-react:featrue_project_homepage into featrue_project_homepage jasder 2021-10-28 17:51:56 +0800
5be8ead356 Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus-react into featrue_project_homepage caishi 2021-10-28 17:48:56 +0800
7d78919c4a Merge pull request 'FIX 解决冲突' (#236) from pre_develop into develop jasder 2021-10-28 17:48:45 +0800
d5b4c5425f Merge pull request 'wip' (#235) from pre_develop_dev into pre_develop jasder 2021-10-28 17:48:03 +0800
f259f05cdc Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus-react into featrue_project_homepage caishi 2021-10-28 17:46:55 +0800
95cd289373 Merge pull request '项目首页改版更新' (#232) from caishi/forgeplus-react:featrue_project_homepage into featrue_project_homepage jasder 2021-10-28 17:43:43 +0800
e739f5b786 Merge pull request 'fix 更改注册页面备案号等相关信息' (#231) from jasder/forgeplus-react:gitlink_server into gitlink_server jasder 2021-10-28 17:43:16 +0800
c79be9a597 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into featrue_project_homepage caishi 2021-10-28 17:41:54 +0800
fb03565a25 Merge pull request '并入开发分支' (#230) from pre_develop_dev into develop jasder 2021-10-28 17:39:40 +0800
7ec53a246c Merge pull request 'logo 从接口获取 nav_logo_url' (#226) from caishi/forgeplus-react:feature_homepage into feature_homepage jasder 2021-10-28 17:30:39 +0800
56946f94e8 更改域名相关信息 jasder 2021-10-28 17:29:35 +0800
61ee3fe36f 注册页面相关信息修改 caishi 2021-10-28 17:25:50 +0800
d5f989bbe2 update caishi 2021-10-28 17:08:36 +0800
f5817e5150 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into feature_homepage caishi 2021-10-28 09:31:35 +0800
1c24baf3b9 数据绑定 caishi 2021-10-28 09:31:08 +0800
3d3ef19d4a 项目首页 banner caishi 2021-10-26 09:40:35 +0800
7b77c46915 Merge pull request '导入仓库链接和项目issue优化更改' (#228) from hc1913847458/forgeplus-react:testdev into pre_develop_dev jasder 2021-10-25 17:33:48 +0800
746f552a21 issue hucong 2021-10-25 16:37:50 +0800
7872d5ecab 导入链接优化 hucong 2021-10-25 15:56:06 +0800
60da6bd110 导入链接优化 hucong 2021-10-25 15:46:57 +0800
a3bbf6b1c1 头部logo caishi 2021-10-25 11:29:21 +0800
d37709b1a5 首页文件夹 caishi 2021-10-25 11:24:21 +0800
aeff357660 项目页icon更改 hucong 2021-10-25 11:09:41 +0800
0e6cb3954a 项目页icon更改 hucong 2021-10-25 11:09:13 +0800
ae12618c0c 导入链接显示优化 hucong 2021-10-25 10:45:40 +0800
3bf9de2d4c Merge pull request 'FIX 合并主干开发分支功能' (#220) from develop into master master featrue_login_and_register jasder 2021-10-22 16:55:27 +0800
6be0d12e8c Merge pull request 'cherry pick' (#219) from jasder/forgeplus-react:develop into develop jasder 2021-10-22 16:54:51 +0800
b000fc11f3 iconfont + style caishi 2021-10-22 13:56:34 +0800
914966bd39 detail caishi 2021-10-22 16:42:43 +0800
f89f4b6628 Merge branch 'standalone_develop' of https://git.trustie.net/Gitlink/forgeplus-react into feature_homepage caishi 2021-10-22 14:33:40 +0800
7407545d1f Merge pull request '冲突引起iconfont丢失' (#215) from caishi/forgeplus-react:standalone into standalone standalone_develop standalone jasder 2021-10-22 14:05:27 +0800
f0ffc9a29c iconfont + style caishi 2021-10-22 13:56:34 +0800
987eb39681 Merge pull request 'standalone merge problem' (#214) from caishi/forgeplus-react:standalone into standalone jasder 2021-10-22 11:44:51 +0800
848109afe8 settings caishi 2021-10-22 11:40:41 +0800
d7bdb35bb7 merge bug caishi 2021-10-22 11:28:22 +0800
254b3173d1 merge caishi 2021-10-22 11:25:44 +0800
44f06b7305 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into feature_homepage caishi 2021-10-22 10:33:18 +0800
b16e95923a Merge pull request 'FIX bug' (#211) from jasder/forgeplus-react:standalone into standalone jasder 2021-10-22 10:11:03 +0800
98a7f73c04 Merge branch 'master' into standalone jasder 2021-10-22 10:09:53 +0800
a0fa4eccf0 Merge pull request 'FIX bug' (#209) from jasder/forgeplus-react:develop into develop jasder 2021-10-22 10:09:16 +0800
d81b40969a FIX 项目路由改造的bug jasder 2021-10-22 10:05:24 +0800
b6a450a482 FIX 项目路由改造的bug jasder 2021-10-22 10:04:39 +0800
9f4069fc6a Merge pull request 'Add license 协议' (#207) from master into develop jasder 2021-10-22 09:58:00 +0800
257519f98b Merge branch 'master' of https://git.trustie.net/Gitlink/forgeplus-react jasder 2021-10-22 09:56:37 +0800
0c180ace32 ADD MulanPSL-2.0 LICENSE jasder 2021-10-22 09:55:53 +0800
b703c27d44 Merge pull request '并入master分支' (#205) from develop into master jasder 2021-10-22 09:47:53 +0800
fe2318021e Merge pull request '合并最新功能代码' (#206) from jasder/forgeplus-react:master into master jasder 2021-10-22 09:47:39 +0800
8f9e9b0152 解决代码冲突 jasder 2021-10-22 09:41:50 +0800
cde55c1b3c Merge pull request 'WIP' (#204) from jasder/forgeplus-react:develop into develop jasder 2021-10-21 18:38:47 +0800
0f0130742e FIX 解决文件冲突 jasder 2021-10-21 18:35:47 +0800
66c495d6b5 Merge pull request '合并代码后，变量重复引发错误' (#203) from caishi/forgeplus-react:standalone into standalone jasder 2021-10-21 18:32:37 +0800
42139ef998 settings多次声明 caishi 2021-10-21 18:30:28 +0800
925d5ea356 Merge pull request '并入独立版本' (#202) from jasder/forgeplus-react:standalone into standalone jasder 2021-10-21 18:28:15 +0800
ad1f0e29e7 FIX 合并主干分支代码并解决冲突 jasder 2021-10-21 18:24:06 +0800
12f97cce62 Merge pull request '添加一些功能和修复相关问题' (#196) from pre_develop_dev into pre_develop jasder 2021-10-21 14:51:56 +0800
2f90ccab3c Merge pull request '通知管理' (#195) from durian/forgeplus-react:feature_notification_v2_noticeSettings into pre_develop_dev jasder 2021-10-21 14:19:51 +0800
035296732a Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into feature_notification_v2_noticeSettings 谢思 2021-10-21 11:04:36 +0800
cc62bde5b4 修改提交列表页提交信息多行样式问题谢思 2021-10-21 11:02:15 +0800
5ef02c698d Merge pull request 'detail.json接口数据精简，前端做对应的修改' (#194) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev jasder 2021-10-21 10:49:33 +0800
13c58faad8 项目详情接口-根据接口使用对应的数据字段 caishi 2021-10-21 10:37:10 +0800
6435b09982 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into feature_notification_v2_noticeSettings 谢思 2021-10-21 09:42:25 +0800
a0081bf3b1 Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into feature_notification_v2_noticeSettings 谢思 2021-10-21 09:41:44 +0800
a542ed3dcd Merge pull request 'pr新建、编辑、列表等页面，分支过长时需处理' (#193) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev jasder 2021-10-20 16:52:52 +0800
057881097d pr 分支长度 caishi 2021-10-20 16:26:23 +0800
d47c725b96 pr分支过长，显示时应固定宽度 caishi 2021-10-20 15:25:35 +0800
be3e2b6936 Merge pull request '通知公告弹框bug以及pr页面下拉弹框的宽度' (#192) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev jasder 2021-10-20 11:19:13 +0800
76c2d205eb cookie设置时间 caishi 2021-10-20 11:06:49 +0800
2c867f9856 cookie设置path caishi 2021-10-20 11:05:38 +0800
7b74564ecc Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into pre_develop_dev caishi 2021-10-20 10:45:56 +0800
b31503ee0d Merge pull request 'ÅDD compare api on create pr action' (#191) from pre_develop_dev into pre_develop jasder 2021-10-19 11:50:39 +0800