 李玉春
|
7c9add376d
|
Merge branch 'sprint/170_songchenxuan_16376' into 'sprint/170'
Sprint/170 songchenxuan 16376
See merge request easycorp/zentaopms!530
|
2021-11-18 09:20:35 +00:00 |
|
|
李玉春
|
36e39591be
|
Merge branch 'sprint/173_wangjianhua_44503' into 'sprint/170'
* finish task 44503
See merge request easycorp/zentaopms!516
|
2021-11-18 09:19:19 +00:00 |
|
|
songchenxuan
|
f92a67b62a
|
* Fix bug 16376
|
2021-11-18 17:09:42 +08:00 |
|
|
songchenxuan
|
1f9f382aa0
|
* Fix bug 16376
|
2021-11-18 17:06:44 +08:00 |
|
|
wangjianhua
|
e011da6fd2
|
- Finish task 44503. Remove usless variable.
|
2021-11-18 09:02:45 +00:00 |
|
|
孙广明
|
640eb3a48b
|
Merge branch 'sprint/170_tianshujie_16429' into 'sprint/170'
* Fix bug #16429.
See merge request easycorp/zentaopms!527
|
2021-11-18 08:57:25 +00:00 |
|
|
李玉春
|
936f56e325
|
Merge branch 'sprint/173_wangjianhua_44491' into 'sprint/170'
* finish task 44491
See merge request easycorp/zentaopms!505
|
2021-11-18 08:47:29 +00:00 |
|
|
tianshujie
|
9c6c4dfc9c
|
* Fix bug #16429.
|
2021-11-18 16:30:45 +08:00 |
|
|
李玉春
|
644abad1fb
|
Merge branch 'sprint/170_tianshujie_16431' into 'sprint/170'
* Fix bug #16431.
See merge request easycorp/zentaopms!523
|
2021-11-18 07:37:37 +00:00 |
|
|
tianshujie
|
662a1960f5
|
* Fix bug #16431.
|
2021-11-18 15:35:54 +08:00 |
|
|
李玉春
|
3f52d7ce47
|
Merge branch 'sprint/170_mayue_code_error' into 'sprint/170'
* Fix code error.
See merge request easycorp/zentaopms!520
|
2021-11-18 07:26:45 +00:00 |
|
|
mayue
|
039784e212
|
* Fix code error.
|
2021-11-18 15:24:15 +08:00 |
|
|
李玉春
|
af6d5e4ca0
|
Merge branch 'sprint/170_tianshujie_16396' into 'sprint/170'
* Fix bug #16396.
See merge request easycorp/zentaopms!518
|
2021-11-18 07:13:15 +00:00 |
|
|
tianshujie
|
eac30e4699
|
* Modify code.
|
2021-11-18 15:12:38 +08:00 |
|
|
liyuchun
|
8fa3ad39c1
|
Merge branch 'sprint/170_mayue_16364' into sprint/170
|
2021-11-18 15:09:52 +08:00 |
|
|
李玉春
|
bf47fb620b
|
Merge branch 'sprint/170' into 'sprint/170_mayue_16364'
# Conflicts:
# module/project/control.php
|
2021-11-18 07:09:28 +00:00 |
|
|
tianshujie
|
0a03aea29a
|
* Fix bug #16396.
|
2021-11-18 15:07:51 +08:00 |
|
|
mayue
|
c26fb97685
|
* Fix bug #16364.
|
2021-11-18 15:07:42 +08:00 |
|
|
李玉春
|
12b6f58053
|
Merge branch 'sprint/170_songchenxuan_16377' into 'sprint/170'
Sprint/170 songchenxuan 16377
See merge request easycorp/zentaopms!514
|
2021-11-18 07:06:26 +00:00 |
|
|
songchenxuan
|
073deec215
|
* Fix bug 16377
|
2021-11-18 15:05:56 +08:00 |
|
|
李玉春
|
c4e9dc5a4e
|
Merge branch 'sprint/170_zhengrunyu_BUG_16378' into 'sprint/170'
*Finish task #16378.
See merge request easycorp/zentaopms!512
|
2021-11-18 07:03:43 +00:00 |
|
|
孙广明
|
6085ad3089
|
Merge branch 'sprint/170_tianshujie_44496' into 'sprint/170'
*Finish task #44496
See merge request easycorp/zentaopms!511
|
2021-11-18 06:59:45 +00:00 |
|
|
songchenxuan
|
504e284d63
|
* Fix bug 16377.
|
2021-11-18 14:48:41 +08:00 |
|
|
tianshujie
|
22fdf1f0fc
|
* Modify code.
|
2021-11-18 14:48:21 +08:00 |
|
|
mayue
|
49b3b22630
|
* Fix bug #16364.
|
2021-11-18 14:48:05 +08:00 |
|
|
李玉春
|
d8993bf4d5
|
Merge branch 'sprint/170_songchenxuan_codefortest-bug' into 'sprint/170'
* Code for test-bug.
See merge request easycorp/zentaopms!510
|
2021-11-18 06:42:46 +00:00 |
|
|
zhujinyong
|
a796848a49
|
Merge branch 'sprint/170' of https://gitlab.zcorp.cc/easycorp/zentaopms into 170
|
2021-11-18 14:35:50 +08:00 |
|
|
zhujinyong
|
6175d59ce3
|
* Compatiblity for ubb.
|
2021-11-18 14:35:21 +08:00 |
|
|
李玉春
|
15967171de
|
Merge branch 'sprint/173_lizhiqiang_16371' into 'sprint/170'
Fix bug#16371.
See merge request easycorp/zentaopms!513
|
2021-11-18 06:33:49 +00:00 |
|
|
李玉春
|
3870f6f9e4
|
Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Finis task #44486,44487,44488.
See merge request easycorp/zentaopms!495
|
2021-11-18 06:30:03 +00:00 |
|
|
mayue
|
03620d8454
|
* Fix bug #16364.
|
2021-11-18 14:24:29 +08:00 |
|
|
lizhiqiang
|
e5653c5dd7
|
*Finish Bug #16371.
|
2021-11-18 14:21:34 +08:00 |
|
|
zhouxin
|
b658a98de3
|
Fix some problem.
|
2021-11-18 14:13:32 +08:00 |
|
|
songchenxuan
|
91c8826f45
|
* Fix bug 16377
|
2021-11-18 14:08:21 +08:00 |
|
|
songchenxuan
|
2df3d6aa39
|
* Fix bug 16377
|
2021-11-18 14:08:07 +08:00 |
|
|
孙广明
|
73ea750b76
|
Merge branch 'sprint/173_tianshujie_44502' into 'sprint/170'
* Finish task #44502.
See merge request easycorp/zentaopms!503
|
2021-11-18 06:05:39 +00:00 |
|
|
孙广明
|
099d2365af
|
Merge branch 'sprint/170_tianshuejie_bug' into sprint/170
|
2021-11-18 14:04:05 +08:00 |
|
|
孙广明
|
8f2c87cae1
|
Merge branch 'sprint/170' into 'sprint/170_tianshuejie_bug'
# Conflicts:
# module/execution/view/create.html.php
|
2021-11-18 06:03:46 +00:00 |
|
|
zhengrunyu
|
0e51961266
|
*Finish task #16378.
|
2021-11-18 13:51:25 +08:00 |
|
|
tianshujie
|
5e473398be
|
* Batch modify the judgment of the branch to which the bug belongs.
|
2021-11-18 13:49:04 +08:00 |
|
|
songchenxuan
|
745a2e3fea
|
* Code for test-bug.
|
2021-11-18 13:42:47 +08:00 |
|
|
zhujinyong
|
98a3b04e99
|
* Compatibility in scm.
|
2021-11-18 13:39:01 +08:00 |
|
|
zhujinyong
|
8c1cc5c875
|
* Update purifier library.
|
2021-11-18 13:35:32 +08:00 |
|
|
liyuchun
|
2582f32c78
|
Merge branch 'sprint/170_mayue_branch' into sprint/170
|
2021-11-18 13:17:10 +08:00 |
|
|
李玉春
|
e41ccac2b7
|
Merge branch 'sprint/170' into 'sprint/170_mayue_branch'
# Conflicts:
# module/build/view/create.html.php
# module/project/model.php
|
2021-11-18 05:15:10 +00:00 |
|
|
李玉春
|
8639b02e76
|
Merge branch 'sprint/170_songchenxuan_44490' into 'sprint/170'
Sprint/170 songchenxuan 44490
See merge request easycorp/zentaopms!501
|
2021-11-18 05:12:40 +00:00 |
|
|
wangjianhua
|
6aa55f5011
|
* Finish task 44503. Add branch name before version name.
|
2021-11-18 03:52:39 +00:00 |
|
|
xieqiyu
|
a9c2c09338
|
* Optimize the code.
|
2021-11-18 11:41:17 +08:00 |
|
|
tianshujie
|
68f629210b
|
* Change picture.
|
2021-11-18 11:23:03 +08:00 |
|
|
tianshujie
|
7044ccbf2c
|
* Modify logic.
|
2021-11-18 11:17:22 +08:00 |
|