Commit Graph

890 Commits

Author SHA1 Message Date
baladiwei fe72be2f30 Merge pull request 'pre-release' (#23) from pre_dev_military into dev_military 2021-08-24 17:34:03 +08:00
baladiwei 4d41f44100 Merge pull request '公告新增2个类型' (#22) from tongChong/forgeplus-react:dev_military_notice into pre_dev_military 2021-08-24 17:14:00 +08:00
tongChong afa839e0b1 Merge pull request '红山开源的公告页面' (#3) from durian/forgeplus-react:dev_military_notice_xiesi into dev_military_notice 2021-08-24 13:59:21 +08:00
xiesi 83d59a2e64 修改公告详情页面的公告类型 2021-08-24 13:46:00 +08:00
tongChong 758f4267ed Merge pull request '红山开源的公告页面' (#2) from durian/forgeplus-react:dev_military_notice_xiesi into dev_military_notice 2021-08-24 13:29:17 +08:00
xiesi 38948a84cd 修改红山开源公告数据展示部分 2021-08-24 13:05:29 +08:00
xiesi 51d739f4a0 修改公告导航菜单 2021-08-24 11:51:31 +08:00
tongChong 706830928e 修改公告页面左侧导航栏-谢思
修改公告页面左侧导航栏-谢思
2021-08-23 14:40:16 +08:00
xiesi 8dc08c3992 红山开源的公告页面 2021-08-23 14:18:11 +08:00
caishi 6facc3e65f title 2021-07-16 10:40:44 +08:00
caishi 2f538ff394 keywords desc 2021-07-15 16:35:59 +08:00
caishi 909663bc47 新增招标公告 2021-07-02 13:58:22 +08:00
caishi 9ea9da9672 nav没有显示,被清空 2021-07-02 11:54:49 +08:00
何童崇 97bd7673e1 新增招标公告类型 2021-07-02 10:57:35 +08:00
caishi 8162b8b908 修改头部选中样式 2021-06-28 16:02:25 +08:00
何童崇 7a59d43eec 修改头部选中样式 2021-06-28 15:56:48 +08:00
caishi 008ba8d1de 修改富文本样式及文件下载路径 2021-06-28 14:07:33 +08:00
何童崇 98a9344b02 修改样式 2021-06-28 14:05:12 +08:00
何童崇 b8342288dd 修改富文本样式 2021-06-28 13:56:23 +08:00
caishi 7cf5e23cb9 修改指向后台的url及优化代码结构 2021-06-25 14:11:30 +08:00
何童崇 8594168d33 修改指向后台的url及优化代码结构 2021-06-25 13:15:35 +08:00
caishi 2d7c6cb82d 合并公告模块 2021-06-24 17:11:12 +08:00
何童崇 c36925c136 新增公告模块代码 2021-06-24 17:01:05 +08:00
caishi 6cfe81aea3 meta keywords 2021-06-16 17:15:51 +08:00
caishi c32b333bc2 Merge branch 'dev_m_copy' into dev_military
# Conflicts:
#	src/forge/DevOps/Index.jsx
#	src/forge/Index.js
#	src/forge/Main/Detail.js
#	src/forge/Merge/MessageCount.js
#	src/forge/Settings/Collaborator.js
#	src/forge/Settings/CollaboratorMember.jsx
#	src/forge/users/watch_users.js
#	src/modules/tpm/NewHeader.js
2021-04-12 15:57:30 +08:00
caishi c965da7dd5 默认 2021-03-22 09:47:34 +08:00
caishi b44399968f 协作者分页 2021-03-22 09:46:30 +08:00
caishi 2591f28ccc bug 2021-03-22 09:37:37 +08:00
caishi 5530e8c723 diff-查看文件 2021-03-10 10:48:08 +08:00
caishi fa26dc9fa5 diff-查看文件 2021-03-10 10:47:23 +08:00
caishi 4cf40f9dfc update 2021-03-09 15:33:18 +08:00
caishi 2c034f5dff 修改资料-url 2021-03-09 14:09:06 +08:00
caishi d68d8318c1 account 2021-03-09 13:59:02 +08:00
caishi 41ae6b1f8d 修改资料练级 2021-03-09 13:55:02 +08:00
caishi a6e2171fca filedetail 2021-03-09 11:49:48 +08:00
caishi 916cc293ac url 2021-03-08 11:15:05 +08:00
caishi 5565eac601 nodata 2021-03-08 09:55:12 +08:00
caishi 860b71c7c6 外围贡献者 2021-03-04 17:02:20 +08:00
caishi f1c2841fe0 logo 2021-03-03 16:46:45 +08:00
caishi c6d5078d42 Merge branch 'develop' into dev_m_copy 2021-03-02 11:43:58 +08:00
caishi ebe2d625fa Merge branch 'dev_military' of https://git.trustie.net/jasder/forgeplus-react into dev_military 2021-03-02 11:43:26 +08:00
caishi b5e1a91af5 style 2021-03-02 11:43:19 +08:00
caishi 72fcbcd4dd root 2021-03-02 11:40:55 +08:00
caishi 4b8d72a6eb Merge branch 'develop' into dev_m_copy 2021-03-02 10:52:09 +08:00
caishi 80f1e4d448 查看文件-url 2021-03-02 10:51:50 +08:00
caishi 3071c785bc sync mirror 2021-03-01 16:02:02 +08:00
caishi f0e1858cd4 update 2021-03-01 16:01:26 +08:00
caishi a92468953a style 2021-03-01 11:11:30 +08:00
caishi fdab967b6a Merge branch 'develop' into dev_m_copy
# Conflicts:
#	src/AppConfig.js
#	src/forge/DevOps/Index.jsx
#	src/forge/Index.js
#	src/forge/Main/Detail.js
#	src/forge/Main/IndexItem.js
#	src/forge/Merge/MessageCount.js
#	src/forge/Settings/Collaborator.js
#	src/forge/users/watch_users.js
#	src/modules/tpm/NewHeader.js
2021-03-01 10:21:14 +08:00
caishi 7e8929f166 appconfig 2021-03-01 10:17:38 +08:00