Commit Graph

181 Commits

Author SHA1 Message Date
caishi f1c2841fe0 logo 2021-03-03 16:46:45 +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 2c3d917bd4 mygetHelmetapi2 2021-02-09 10:44:41 +08:00
caishi 98d40482f3 issue 2021-02-05 16:19:35 +08:00
caishi 617f139f52 fault 2021-02-04 15:13:08 +08:00
caishi de550d5f42 remove 2021-02-04 15:05:37 +08:00
caishi f12230dc91 url 2021-02-04 15:02:26 +08:00
caishi 828cc2470d 个人中心-我的组织 2021-01-29 17:26:08 +08:00
caishi 586d9e0c05 新建组织 2021-01-25 10:49:39 +08:00
caishi 0b007b35d9 new 2021-01-19 18:11:38 +08:00
caishi 4e7a2fa3d7 Merge branch 'develop' into dev_m_copy
# Conflicts:
#	public/css/edu-purge.css
#	public/css/iconfont.css
#	src/AppConfig.js
#	src/forge/Main/CoderRootDirectory.js
#	src/forge/Main/Index.js
#	src/forge/Main/list.css
#	src/forge/Newfile/m_editor.js
#	src/forge/css/index.scss
#	src/modules/tpm/NewHeader.js
#	src/modules/tpm/TPMIndex.css
2020-12-24 17:50:26 +08:00
caishi e3c1e7b82f markdown 2020-12-17 17:59:30 +08:00
caishi 7795fe1d04 markdown 2020-12-17 14:35:36 +08:00
caishi e95ef11058 style 2020-12-11 18:14:25 +08:00
caishi ccb5eb8ae5 Merge commit 'ef6559400411d4e9de4072441c9865e226936ba7' into dev_bei
# Conflicts:
#	src/AppConfig.js
2020-11-26 11:21:48 +08:00
caishi b27f0e796d === 2020-11-25 12:39:59 +08:00
caishi cbfb9c3ffe 本地版本-注册页面 2020-11-18 11:31:52 +08:00
caishi 0c59855e9c bug 2020-11-11 16:09:57 +08:00
caishi 0cb6986aed 无数据提示 2020-10-30 10:42:02 +08:00
caishi 849f695a78 Merge branch 'newVersion_forge' into dev_devOps 2020-10-21 16:50:15 +08:00
caishi d80f1d32dc 非trustie则新开页 2020-10-21 16:49:59 +08:00
caishi b6dfe2cd4a Merge branch 'newVersion_forge' into dev_devOps
# Conflicts:
#	src/forge/Main/Detail.js
2020-10-19 15:43:53 +08:00
sylor_huang@126.com 5a8daf7cfe Change NewHeader active 2020-10-16 17:17:14 +08:00
caishi aca923fe07 Merge branch 'newVersion_forge' into dev_devOps 2020-10-16 10:36:04 +08:00
caishi 4f13421872 style 2020-10-12 14:00:18 +08:00
caishi c66717bf1b Merge branch 'newVersion_forge' into dev_devOps 2020-10-10 10:11:58 +08:00
caishi 37b0ca5817 detail update 2020-10-10 10:11:44 +08:00
caishi 8b1b923c92 Merge branch 'newVersion_forge' into dev_devOps 2020-10-09 16:32:59 +08:00
caishi c93b874493 背景颜色 2020-10-09 16:32:47 +08:00
caishi 229b5a704e Merge branch 'newVersion_forge' into dev_devOps 2020-10-09 09:25:08 +08:00
caishi 36a9f16634 头部改版 2020-10-09 09:24:57 +08:00
caishi a14b125d34 Merge branch 'newVersion_forge' into dev_devOps 2020-09-29 10:41:17 +08:00
caishi d7103d44f7 decodeURL 2020-09-29 10:41:04 +08:00
caishi c3ed52bc32 Merge branch 'newVersion_forge' into dev_devOps 2020-09-27 13:59:04 +08:00
caishi 2a5823a347 小修 2020-09-27 13:58:44 +08:00
caishi 8397daec22 Merge branch 'newVersion_forge' into dev_devOps 2020-09-24 10:34:22 +08:00
caishi 68a859d1c7 header 2020-09-24 10:34:10 +08:00
caishi 1e80457885 Merge branch 'newVersion_forge' into dev_devOps 2020-09-23 21:33:00 +08:00
caishi 0c966b4ad3 logo闪现 2020-09-23 21:32:46 +08:00
caishi cd6540a84c Merge branch 'newVersion_forge' into dev_devOps 2020-09-16 18:00:07 +08:00
caishi 44ac961ef1 color 2020-09-16 17:59:57 +08:00
caishi 10d4ad7221 Merge branch 'newVersion_forge' into dev_devOps 2020-09-16 17:48:12 +08:00
caishi c7b462957e 用户名 2020-09-16 17:47:56 +08:00
caishi 440e7cd91e 头部 2020-09-16 17:10:26 +08:00
caishi 776ebfdef5 头部 2020-09-16 17:09:31 +08:00
sylor_huang@126.com c2129c994a change Header5 2020-09-16 15:14:46 +08:00
sylor_huang@126.com e968ece34c Change Header4 2020-09-16 15:08:54 +08:00
sylor_huang@126.com 70d407963e Change Header2 2020-09-16 14:58:37 +08:00
sylor_huang@126.com 00ccba74a1 Change Header1 2020-09-16 14:48:58 +08:00
sylor_huang@126.com 0790abb6f9 Change Header 2020-09-16 14:39:13 +08:00