Commit Graph

  • 2e6b8fc3ec Merge branch 'master' of git.trustie.net:csxjy/xjy-forgeplus-react master 巴拉迪维 2021-11-04 14:05:01 +0800
  • d180433bee modify url to csmaci.com 巴拉迪维 2021-11-04 14:04:47 +0800
  • 73a9c0dd7d Merge pull request '给 forge 新增退出的操作' (#2) from baladiwei/xjy-forgeplus-react:master into master baladiwei 2021-11-03 15:28:48 +0800
  • 695dc038e3 给 forge 新增退出的操作 巴拉迪维 2021-11-03 15:28:02 +0800
  • a1b6ca2138 Merge pull request '刘琛更改header' (#1) from liu2592603532/forgeplus-react:master into master baladiwei 2021-11-02 12:54:51 +0800
  • 3d894f3d8b merge 刘琛 2021-11-02 11:34:23 +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
  • eadec88e0c Merge pull request '合并请求' (#190) from durian/forgeplus-react:router_v2_issue into pre_develop_dev jasder 2021-10-19 11:46:59 +0800
  • 31af77e704 通知管理 谢思 2021-10-19 10:45:15 +0800
  • 6ff27a559f Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into feature_notification_v2_noticeSettings 谢思 2021-10-19 10:28:34 +0800
  • fe1bacb984 通知管理+删除基本资料页面的consolo语句 谢思 2021-10-19 10:26:36 +0800
  • 573ec813a6 Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into router_v2_issue 谢思 2021-10-19 09:10:37 +0800
  • 11b92ac52b 通知管理 谢思 2021-10-19 09:00:00 +0800
  • e992849723 Merge pull request 'FIx 合并测试分支功能代码' (#188) from pre_develop_dev into pre_develop jasder 2021-10-18 18:00:02 +0800
  • 0c52ea22a7 Merge pull request 'ADD平台通知公告' (#187) from featrue_system_popup_notification into pre_develop_dev jasder 2021-10-18 17:59:02 +0800
  • b6b19eabe9 仓库不同时调用compare接口 谢思 2021-10-18 17:28:40 +0800
  • edbd47ea0f Merge pull request '域名更换弹框样式' (#186) from caishi/forgeplus-react:featrue_system_popup_notification into featrue_system_popup_notification jasder 2021-10-18 17:25:35 +0800
  • 644e3c3f73 cookie失效时间改为一天 caishi 2021-10-18 17:19:20 +0800
  • e7a322e038 弹框样式-markdown渲染有影响 caishi 2021-10-18 17:13:52 +0800
  • a2c5c1ea6f 通知管理模块 谢思 2021-10-18 16:54:16 +0800
  • dfa9b3d835 issue caishi 2021-10-18 15:48:31 +0800
  • e744714da0 Merge pull request 'FIX 合并测试分支代码' (#182) from pre_develop_dev into featrue_system_popup_notification jasder 2021-10-18 11:49:55 +0800
  • 14df994cd6 Merge pull request 'issue - 易修、合并请求标题长度和显示样式' (#181) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev jasder 2021-10-18 11:46:58 +0800
  • e9546951c9 非汉字需要强制换行 caishi 2021-10-18 11:30:20 +0800
  • 9de7ac7c90 易修、合并请求标题:字符长度、详情的显示、列表的显示长度等 caishi 2021-10-18 11:15:38 +0800
  • 3e3e9f3681 Merge pull request '202110151541 release' (#179) from pre_develop_dev into pre_develop baladiwei 2021-10-15 16:03:59 +0800
  • 4b2651339b Merge pull request '修改新建合并请求页面目标分支存在但显示不存在bug以及提交详情页面的浏览文件按钮上移样式问题' (#177) from durian/forgeplus-react:router_v2_issue into pre_develop_dev jasder 2021-10-15 15:28:11 +0800
  • 4b9cc26d9c Merge pull request 'issue上线' (#178) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev jasder 2021-10-15 15:26:44 +0800
  • 66108083fd 修改新建合并请求页面目标分支存在但显示不存在bug以及提交详情页面的浏览文件按钮上移样式问题 谢思 2021-10-15 15:22:22 +0800
  • adfd2ae66c Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into pre_develop_dev caishi 2021-10-15 15:21:59 +0800
  • f78eecd775 Merge pull request 'FIX 合并生产版本分支代码' (#175) from pre_develop into pre_develop_dev jasder 2021-10-15 15:21:48 +0800
  • b30f2169e4 数据state caishi 2021-10-15 15:20:21 +0800
  • 8ace7da3a7 同上-数据传参 caishi 2021-10-15 14:40:40 +0800
  • 35110b7db4 动态页面数据传参 caishi 2021-10-15 14:15:23 +0800
  • 95050bb3bd 非.git结尾的也需要自动填充 caishi 2021-10-15 10:54:26 +0800
  • f97c90f20e Merge pull request '弹框弹出时间用cookie保存' (#173) from caishi/forgeplus-react:featrue_system_popup_notification into featrue_system_popup_notification jasder 2021-10-15 10:49:17 +0800
  • afd2cec4f2 保存cookie时先删除cookie caishi 2021-10-15 10:29:03 +0800
  • 0903edfd2c 设置cookie为24小时的限制,超过后重新弹出弹框 caishi 2021-10-15 10:27:16 +0800
  • 1aa6c05869 动态比例数据 caishi 2021-10-14 14:55:35 +0800
  • 94fd500423 Merge pull request '合并请求相关路由改造' (#170) from durian/forgeplus-react:feature_router_v2 into pre_develop jasder 2021-10-14 14:34:56 +0800
  • 90cfac4436 Merge pull request '动态配置开启通知模块' (#171) from durian/forgeplus-react:pre_develop_dev into pre_develop jasder 2021-10-14 14:34:50 +0800
  • db2c3b707a Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into pre_develop_dev caishi 2021-10-14 14:28:24 +0800
  • bb1175de01 setting修改报错时要隐藏加载效果 caishi 2021-10-14 14:28:20 +0800
  • c45a6ffe1a Merge pull request '动态页面数据显示、以及样式更改' (#172) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev jasder 2021-10-14 14:06:17 +0800
  • c0f2c77e1a Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into pre_develop_dev caishi 2021-10-14 13:59:08 +0800
  • c386bcf5e7 动态也数据显示、样式修改 caishi 2021-10-14 13:59:03 +0800
  • 0b4baa1d03 Merge pull request '项目复刻按钮显示优化' (#169) from hc1913847458/forgeplus-react:testdev into pre_develop_dev jasder 2021-10-14 10:52:38 +0800
  • c0afc7a052 Merge pull request 'markdown编辑器' (#168) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev jasder 2021-10-14 10:46:03 +0800
  • 1826c1923f 项目复刻按钮显示优化 hucong 2021-10-14 10:45:39 +0800
  • 76d8c4b67a Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into pre_develop_dev caishi 2021-10-14 10:28:46 +0800
  • fbbb3c3aa6 markdown文件样式影响内容 caishi 2021-10-14 10:28:41 +0800
  • 2f06288507 Merge pull request '项目复刻按钮显示优化' (#167) from hc1913847458/forgeplus-react:testdev into pre_develop_dev jasder 2021-10-14 10:23:37 +0800
  • 47b6c3d948 save hucong 2021-10-14 10:21:47 +0800
  • f6b59e0a3a save hucong 2021-10-14 10:20:36 +0800
  • bb6fe08c54 file hucong 2021-10-14 10:00:51 +0800
  • a7283b5567 Merge pull request '域名更换增加提示弹框样式' (#165) from caishi/forgeplus-react:featrue_system_popup_notification into featrue_system_popup_notification jasder 2021-10-14 09:49:02 +0800
  • 05eb0367ba 项目复刻按钮显示优化 hucong 2021-10-14 09:43:00 +0800
  • 3ca38e76a1 弹框的样式 caishi 2021-10-14 09:38:20 +0800
  • 7b180560a6 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into testdev hucong 2021-10-14 09:38:00 +0800
  • 17cf0412cd Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into testdev hucong 2021-10-14 09:37:34 +0800
  • f65781b49b Merge pull request '仓库设置-增加仓库标识的修改' (#164) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev jasder 2021-10-14 09:37:33 +0800
  • 82d8a0d198 Merge pull request '域名更换增加提示弹框' (#163) from caishi/forgeplus-react:featrue_system_popup_notification into featrue_system_popup_notification jasder 2021-10-13 18:05:26 +0800
  • 0d7805fc9d Merge branch 'featrue_system_popup_notification' of https://git.trustie.net/Gitlink/forgeplus-react into featrue_system_popup_notification caishi 2021-10-13 18:03:24 +0800
  • 68b34ab418 Merge pull request 'fix wip' (#162) from pre_develop into featrue_system_popup_notification jasder 2021-10-13 18:02:49 +0800
  • 5223a84dac 域名更换通知 caishi 2021-10-13 17:58:45 +0800
  • 4afb131aef Merge pull request '未登录状态进入消息页面跳转首页' (#160) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev jasder 2021-10-13 17:22:35 +0800
  • 5d19f6c06b 未登录状态进入消息页面跳转首页 谢思 2021-10-13 17:17:51 +0800
  • a4902739f2 Merge pull request 'pr路由改造bugfix' (#159) from yuzhantian/forgeplus-react:feature_pull_routers into feature_router_v2 baladiwei 2021-10-13 17:01:18 +0800
  • bfcf714822 Merge branch 'feature_router_v2' of https://git.trustie.net/Gitlink/forgeplus-react into feature_pull_routers yuzhantian 2021-10-13 16:56:01 +0800
  • fc305ae952 Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into feature_router_v2 巴拉迪维 2021-10-13 16:52:58 +0800
  • 095e27fcc3 Merge pull request '处理未登录状态下地址栏输入跳转消息页面情况' (#157) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev baladiwei 2021-10-13 16:49:24 +0800
  • 5c819070bb 处理未登录状态下地址栏输入跳转消息页面情况 谢思 2021-10-13 16:45:21 +0800
  • 8e3bd741cb fix: pr路由bugfix yuzhantian 2021-10-13 16:38:43 +0800
  • baba177244 Merge pull request '未登录状态隐藏消息铃铛' (#156) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev jasder 2021-10-13 15:24:47 +0800
  • 38c553d87c 未登录状态隐藏消息铃铛 谢思 2021-10-13 15:14:47 +0800
  • de79518e0d Merge pull request '动态配置是否开启通知模块' (#155) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev baladiwei 2021-10-13 13:46:21 +0800
  • a7c2120cf3 动态配置通知模块 谢思 2021-10-13 13:37:51 +0800
  • 8dcc6c6d59 Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into pre_develop_dev 谢思 2021-10-13 11:54:12 +0800
  • fe4c5a79d2 仓库设置-可修改项目标识 caishi 2021-10-13 09:57:04 +0800
  • fd21cc6d00 Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into feature_pull_routers yuzhantian 2021-10-13 09:11:18 +0800
  • 2fc59748b4 Merge pull request 'FIx css bug' (#153) from pre_develop_dev into pre_develop jasder 2021-10-12 18:23:27 +0800
  • 2060e28ca2 Merge pull request '标签列表数据少时内容居中了' (#152) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev jasder 2021-10-12 18:08:23 +0800
  • 94ceec26e9 标签列表内容 caishi 2021-10-12 18:03:25 +0800
  • e5787e3e66 Merge pull request 'FIX WIP' (#151) from pre_develop_dev into pre_develop jasder 2021-10-12 17:34:37 +0800
  • 8ae34b8f32 Merge pull request '代码库一级页面样式' (#150) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev jasder 2021-10-12 17:33:46 +0800