Martinlwx
/
forgeplus
forked from Gitlink/forgeplus
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,964 Commits 3 Branches 0 Tags 563 MiB
Commit Graph

2964 Commits

Author SHA1 Message Date
xxq250 9a8a0b4c5d Merge pull request '20220303版本' (#303) from Trustie/forgeplus:trustie_server into master 2022-03-03 15:33:17 +08:00
xiaoxiaoqiong ed54e2ae8e merge pre 2022-03-03 15:25:28 +08:00
xiaoxiaoqiong 386c90592e Merge branch 'standalone_develop' into pre_trustie_server 2022-03-03 15:07:24 +08:00
xiaoxiaoqiong 664b806c0a routes合并 2022-03-03 15:06:56 +08:00
xiaoxiaoqiong b530de4ddc Merge branch 'standalone_develop' into pre_trustie_server 2022-03-03 14:21:22 +08:00
xiaoxiaoqiong 94d259ea03 fixed fork列表中存在组织时显示错误 2022-03-03 14:16:05 +08:00
yystopf 3091593d14 add: standalone admin menu 2022-03-02 10:48:21 +08:00
yystopf c5d2fad913 Merge branch 'develop' into standalone_develop 2022-03-02 10:34:16 +08:00
yystopf b97c42d0ae fix: email logo 2022-03-02 10:33:35 +08:00
yystopf c76466a883 Merge branch 'pre_trustie_server' into trustie_server 2022-02-24 18:10:06 +08:00
yystopf 217e0fdd97 Merge branch 'standalone_develop' into pre_trustie_server 2022-02-24 18:09:53 +08:00
yystopf f0b8489828 Merge branch 'develop' into standalone_develop 2022-02-24 18:09:20 +08:00
yystopf a2612d8009 fix 2022-02-24 18:09:11 +08:00
yystopf 2f2655525f fix: user rank user_id must exist 2022-02-24 18:07:18 +08:00
xxq250 9b44d90c0a Update README.md 2022-02-24 16:52:01 +08:00
xxq250 cc31d8ed2c Merge pull request '更新readme' (#302) from young/forgeplus:master into master 2022-02-24 16:50:34 +08:00
yystopf 70ade7b27b Merge branch 'pre_trustie_server' into trustie_server 2022-02-24 16:45:12 +08:00
yystopf 57c60b2fe9 Merge branch 'standalone_develop' into pre_trustie_server 2022-02-24 16:44:58 +08:00
young 778ec17986 Update README.md 2022-02-24 16:21:25 +08:00
young 86f854dc69 Update README.md 2022-02-24 16:20:17 +08:00
young 9835d69da0 add figs 
Signed-off-by: young <1593815610@qq.com>
 2022-02-24 16:18:44 +08:00
young defaa1e46b Delete 'docs/figs' 2022-02-24 16:14:34 +08:00
young a13820b229 ADD file via upload 2022-02-24 16:14:22 +08:00
young 541b67f3a5 Delete 'docs/figs/issue_view.png' 2022-02-24 16:13:35 +08:00
young 0ba7524408 Delete 'docs/figs/milestone.png' 2022-02-24 16:13:23 +08:00
young bd553ac532 Delete 'docs/figs/issue_assign2.png' 2022-02-24 16:13:08 +08:00
young a73d4a221a Delete 'docs/figs/issue_manage.png' 2022-02-24 16:12:50 +08:00
young 2d232073e6 Delete 'docs/figs/issue_assign.png' 2022-02-24 16:12:36 +08:00
young e7dc4727ae Delete 'docs/figs/code.png' 2022-02-24 16:12:17 +08:00
young 9ec9529b32 Update README.md 2022-02-24 16:10:17 +08:00
yystopf aa643430fa Merge branch 'develop' into standalone_develop 2022-02-24 14:27:31 +08:00
yystopf 1a93477635 fix: forked templete delay 2022-02-24 14:26:04 +08:00
yystopf 8f9aedd7d6 Merge branch 'pre_trustie_server' into trustie_server 2022-02-24 11:47:38 +08:00
yystopf ab989ed7d7 Merge branch 'standalone_develop' into pre_trustie_server 2022-02-24 11:46:44 +08:00
xxq250 137fd5187c Merge pull request 'readme更新' (#300) from young/forgeplus:master into master 2022-02-24 11:16:14 +08:00
xiaoxiaoqiong 28d07d5c54 fixed 合并冲突 2022-02-22 17:49:14 +08:00
yystopf 53d094784b Merge branch 'develop' into standalone_develop 2022-02-22 11:03:47 +08:00
yystopf 7c664addbd fix 2022-02-22 11:03:28 +08:00
yystopf 6167834bfa Merge branch 'pre_trustie_server' into trustie_server 2022-02-22 10:40:11 +08:00
yystopf 1bb754e9d8 Merge branch 'standalone_develop' into pre_trustie_server 2022-02-22 10:39:47 +08:00
yystopf f2f2ce8252 merge from develop 2022-02-22 10:38:42 +08:00
yystopf c6b79f82bc fix: change password new version 2022-02-22 10:03:51 +08:00
xiaoxiaoqiong a88b093353 Merge branch 'trustie_server' 2022-02-22 09:42:54 +08:00
xiaoxiaoqiong 4e3f9cc019 竞赛通知任务调度 2022-02-21 16:48:59 +08:00
xiaoxiaoqiong 5ed7b3e4ad 竞赛通知任务调度 2022-02-21 16:46:40 +08:00
xiaoxiaoqiong 4e2c46260c Merge remote-tracking branch 'origin/develop' into develop 2022-02-17 18:28:40 +08:00
xiaoxiaoqiong 9ba00b21c9 竞赛通知api 2022-02-17 18:28:32 +08:00
yystopf 1100309038 Merge branch 'develop' into standalone_develop 2022-02-17 11:12:58 +08:00
yystopf b11f5fd228 fix: cache rollback 2022-02-17 11:12:50 +08:00
yystopf af5f2b2fe3 Merge branch 'develop' into standalone_develop 2022-02-17 10:59:29 +08:00