Commit Graph

1466 Commits

Author SHA1 Message Date
caishi c0f2c77e1a Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into pre_develop_dev 2021-10-14 13:59:08 +08:00
caishi c386bcf5e7 动态也数据显示、样式修改 2021-10-14 13:59:03 +08:00
jasder 0b4baa1d03 Merge pull request '项目复刻按钮显示优化' (#169) from hc1913847458/forgeplus-react:testdev into pre_develop_dev 2021-10-14 10:52:38 +08:00
jasder c0afc7a052 Merge pull request 'markdown编辑器' (#168) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev 2021-10-14 10:46:03 +08:00
hucong 1826c1923f 项目复刻按钮显示优化 2021-10-14 10:45:39 +08:00
caishi 76d8c4b67a Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into pre_develop_dev 2021-10-14 10:28:46 +08:00
caishi fbbb3c3aa6 markdown文件样式影响内容 2021-10-14 10:28:41 +08:00
jasder 2f06288507 Merge pull request '项目复刻按钮显示优化' (#167) from hc1913847458/forgeplus-react:testdev into pre_develop_dev 2021-10-14 10:23:37 +08:00
hucong 47b6c3d948 save 2021-10-14 10:21:47 +08:00
hucong f6b59e0a3a save 2021-10-14 10:20:36 +08:00
hucong bb6fe08c54 file 2021-10-14 10:00:51 +08:00
hucong 05eb0367ba 项目复刻按钮显示优化 2021-10-14 09:43:00 +08:00
hucong 7b180560a6 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into testdev 2021-10-14 09:38:00 +08:00
hucong 17cf0412cd Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into testdev
# Conflicts:
#	src/forge/Main/tag/Index.jsx
2021-10-14 09:37:34 +08:00
jasder f65781b49b Merge pull request '仓库设置-增加仓库标识的修改' (#164) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev 2021-10-14 09:37:33 +08:00
jasder 4afb131aef Merge pull request '未登录状态进入消息页面跳转首页' (#160) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev 2021-10-13 17:22:35 +08:00
谢思 5d19f6c06b 未登录状态进入消息页面跳转首页 2021-10-13 17:17:51 +08:00
baladiwei 095e27fcc3 Merge pull request '处理未登录状态下地址栏输入跳转消息页面情况' (#157) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev 2021-10-13 16:49:24 +08:00
谢思 5c819070bb 处理未登录状态下地址栏输入跳转消息页面情况 2021-10-13 16:45:21 +08:00
jasder baba177244 Merge pull request '未登录状态隐藏消息铃铛' (#156) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev 2021-10-13 15:24:47 +08:00
谢思 38c553d87c 未登录状态隐藏消息铃铛 2021-10-13 15:14:47 +08:00
baladiwei de79518e0d Merge pull request '动态配置是否开启通知模块' (#155) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev 2021-10-13 13:46:21 +08:00
谢思 a7c2120cf3 动态配置通知模块 2021-10-13 13:37:51 +08:00
谢思 8dcc6c6d59 Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into pre_develop_dev 2021-10-13 11:54:12 +08:00
caishi fe4c5a79d2 仓库设置-可修改项目标识 2021-10-13 09:57:04 +08:00
jasder 2fc59748b4 Merge pull request 'FIx css bug' (#153) from pre_develop_dev into pre_develop 2021-10-12 18:23:27 +08:00
jasder 2060e28ca2 Merge pull request '标签列表数据少时内容居中了' (#152) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev 2021-10-12 18:08:23 +08:00
caishi 94ceec26e9 标签列表内容 2021-10-12 18:03:25 +08:00
jasder e5787e3e66 Merge pull request 'FIX WIP' (#151) from pre_develop_dev into pre_develop 2021-10-12 17:34:37 +08:00
jasder 8ae34b8f32 Merge pull request '代码库一级页面样式' (#150) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev 2021-10-12 17:33:46 +08:00
caishi 6244ad3323 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into pre_develop_dev 2021-10-12 17:32:13 +08:00
caishi 1fbe6671b1 代码库一级页面样式 2021-10-12 17:32:09 +08:00
hucong cda7311fa1 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into testdev 2021-10-12 17:19:11 +08:00
jasder 4c25aed9a0 Merge pull request '贡献者样式修改+细节样式+仓库设置项目标识(接口还在测试,暂时隐藏)' (#149) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev 2021-10-12 17:18:50 +08:00
caishi b578383e8d 设置项目标识暂时隐藏 2021-10-12 17:15:16 +08:00
jasder d05829ac80 Merge pull request 'FIX some bug' (#148) from pre_develop_dev into pre_develop 2021-10-12 17:14:13 +08:00
hucong e726ba40ea Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into testdev 2021-10-12 16:43:06 +08:00
谢思 9812761b47 Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into pre_develop_dev 2021-10-12 16:09:55 +08:00
jasder c037712b3e Merge pull request '代码库二级页面改版' (#146) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev 2021-10-12 15:20:05 +08:00
谢思 19b7381120 issue 2021-10-12 15:14:49 +08:00
jasder a54f1b6e1a Merge pull request 'FIX 完善代码库二级页面存在的相关问题' (#144) from pre_develop_dev into pre_develop 2021-10-12 13:52:50 +08:00
hucong 8b186467a4 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into testdev 2021-10-12 13:38:26 +08:00
jasder 4902a26646 Merge pull request '标签列表显示头像、样式修改' (#143) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev 2021-10-12 12:04:39 +08:00
caishi c282a1e034 标签列表头像 2021-10-12 11:57:27 +08:00
hucong 112aacb6a1 代码库二级页面标签加载优化 2021-10-12 11:49:04 +08:00
jasder 0a81bc6e6e Merge pull request 'issue标签页样式修改' (#142) from hc1913847458/forgeplus-react:testdev into pre_develop_dev 2021-10-12 11:06:15 +08:00
hucong 1406b30a54 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into testdev 2021-10-12 11:03:22 +08:00
hucong fd58c70c54 issue标签页样式 2021-10-12 11:03:03 +08:00
jasder 8cb0e32afa Merge pull request '标签无数据提示问题' (#141) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev 2021-10-12 10:55:47 +08:00
caishi 6837be3104 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into pre_develop_dev 2021-10-12 10:52:58 +08:00