 王怡栋
|
5d928bf027
|
Merge branch 'master_xieqiyu_56923' into 'master'
* Finish task#56923.
See merge request easycorp/zentaopms!3921
|
2022-06-15 00:25:48 +00:00 |
|
|
朱金勇
|
cb360f23fe
|
Merge branch 'master_conflictResolution' into 'master'
* Conflict resolution.
See merge request easycorp/zentaopms!3922
|
2022-06-15 00:06:01 +00:00 |
|
|
xieqiyu
|
cb06e1cd4d
|
* Conflict resolution.
|
2022-06-14 17:55:19 +08:00 |
|
|
朱金勇
|
cb9a0b6af9
|
Merge branch 'sprint202_leiyong_fix_bug' into 'master'
* Finish task#56933.
See merge request easycorp/zentaopms!3916
|
2022-06-14 09:44:45 +00:00 |
|
|
xieqiyu
|
e9e66259c1
|
* Finish task#56923.
|
2022-06-14 17:42:50 +08:00 |
|
|
王怡栋
|
d5bd29198c
|
Merge branch 'sprint/hufangzhou_notify' into 'master'
* Finish task #55002.
See merge request easycorp/zentaopms!3918
|
2022-06-14 09:38:26 +00:00 |
|
|
hufangzhou
|
9ac5c54bec
|
* Modify the triggering conditions.
|
2022-06-14 17:36:47 +08:00 |
|
|
hufangzhou
|
080f54a1b2
|
* Remove the unused code.
|
2022-06-14 17:32:47 +08:00 |
|
|
zhujinyong
|
87f50aa3be
|
Merge branch 'sprint/sunhao/task56391'
|
2022-06-14 17:12:21 +08:00 |
|
|
hufangzhou
|
a1a2d4f055
|
* Add trigger condition.
|
2022-06-14 17:10:02 +08:00 |
|
|
孙广明
|
271d1b1a3b
|
Merge branch 'sprint_204_57097' into 'master'
sprint_204_57097
See merge request easycorp/zentaopms!3920
|
2022-06-14 09:09:41 +00:00 |
|
|
hufangzhou
|
760cb05fb9
|
* Format the code.
|
2022-06-14 16:53:48 +08:00 |
|
|
李玉春
|
4740125462
|
Merge branch 'sprint/203_mayue_bug23184' into 'master'
* Fix bug #23184.
See merge request easycorp/zentaopms!3913
|
2022-06-14 08:50:25 +00:00 |
|
|
Hao Sun
|
86b1c3f82d
|
* support for update picker options in select project member.
|
2022-06-14 08:33:12 +00:00 |
|
|
mayue
|
51f3db8f40
|
* Optimize code.
|
2022-06-14 16:32:57 +08:00 |
|
|
Hao Sun
|
8d7ce128ee
|
* fix picker not update on deselect member.
|
2022-06-14 08:32:54 +00:00 |
|
|
Hao Sun
|
7e78d28966
|
* update picker lib.
|
2022-06-14 08:32:25 +00:00 |
|
|
hufangzhou
|
fa3520017b
|
* Adjust the code.
|
2022-06-14 16:26:44 +08:00 |
|
|
王怡栋
|
7c60199c84
|
Merge branch 'master_xieqiyu_56919' into 'master'
* Finish task#56919.
See merge request easycorp/zentaopms!3914
|
2022-06-14 08:21:41 +00:00 |
|
|
王怡栋
|
1c98c75274
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug #23680.
See merge request easycorp/zentaopms!3915
|
2022-06-14 08:20:57 +00:00 |
|
|
hufangzhou
|
17c1200b2c
|
* Finish task #55002.
|
2022-06-14 16:20:15 +08:00 |
|
|
孙广明
|
e31b570be2
|
* Fix bug #23680.
|
2022-06-14 16:18:34 +08:00 |
|
|
Hao Sun
|
fd21045b41
|
* task #56391, support for disable selected member with picker.
|
2022-06-14 08:11:47 +00:00 |
|
|
Hao Sun
|
44f7de103a
|
* update zui files.
|
2022-06-14 08:11:13 +00:00 |
|
|
zhujinyong
|
d4a23c5d00
|
Merge branch 'sprint/sunhao/task56924'
|
2022-06-14 16:03:23 +08:00 |
|
|
leiyong
|
b6f5c18dc9
|
* Finish task#56933.
|
2022-06-14 07:56:43 +00:00 |
|
|
xieqiyu
|
c03d486fab
|
* Finish task#56919.
|
2022-06-14 15:55:48 +08:00 |
|
|
mayue
|
92c7801528
|
* Fix bug #23184.
|
2022-06-14 15:44:54 +08:00 |
|
|
王怡栋
|
ee4ce60394
|
Merge branch 'sprint/204_liumengyi_23648' into 'master'
* Fix bug #23648.
See merge request easycorp/zentaopms!3912
|
2022-06-14 07:26:14 +00:00 |
|
|
王怡栋
|
71fb547445
|
Merge branch 'master_xieqiyu_56922' into 'master'
* Finish task#56922.
See merge request easycorp/zentaopms!3910
|
2022-06-14 07:19:42 +00:00 |
|
|
王怡栋
|
dce5aa0a23
|
Merge branch 'sprint/master_zhouxudong_56915' into 'master'
Sprint/master zhouxudong 56915
See merge request easycorp/zentaopms!3909
|
2022-06-14 07:18:50 +00:00 |
|
|
liumengyi
|
5ad98df2ca
|
* Fix bug #23648.
|
2022-06-14 15:17:57 +08:00 |
|
|
王怡栋
|
fd8c9b0f9a
|
Merge branch 'sprint/master_tanghucheng' into 'master'
* Finish story #33374.
See merge request easycorp/zentaopms!3911
|
2022-06-14 07:14:07 +00:00 |
|
|
tanghucheng
|
1f1b79948a
|
* Finish story #33374.
|
2022-06-14 15:03:36 +08:00 |
|
|
xieqiyu
|
38dad8467f
|
* Finish task#56922.
|
2022-06-14 15:00:08 +08:00 |
|
|
孙广明
|
dbb1ccc413
|
Merge branch 'sprint/203_zg_56558' into 'master'
* Finish task#56558
See merge request easycorp/zentaopms!3892
|
2022-06-14 06:58:39 +00:00 |
|
|
孙广明
|
7d37afcd4f
|
Merge branch 'sprint/203_zg_57156' into 'master'
* Finish task#57156,57159
See merge request easycorp/zentaopms!3905
|
2022-06-14 06:58:22 +00:00 |
|
|
zenggang
|
ea2280da59
|
* Adjust code
|
2022-06-14 06:56:01 +00:00 |
|
|
王怡栋
|
94a84d9463
|
Merge branch 'sprint/204_liumengyi_57090' into 'master'
* Fix bug for task #57090.
See merge request easycorp/zentaopms!3908
|
2022-06-14 06:41:42 +00:00 |
|
|
liumengyi
|
6aaf4f6308
|
* Fix bug for task #57090.
|
2022-06-14 14:39:55 +08:00 |
|
|
zhouxudong
|
1ad55fdd08
|
* Finish task #56915.
|
2022-06-14 06:39:25 +00:00 |
|
|
zenggang
|
18449b6c13
|
* Finish task #57159
|
2022-06-14 06:32:41 +00:00 |
|
|
王怡栋
|
d682c68483
|
Merge branch 'master_xieqiyu_56931' into 'master'
* Finish task#56931.
See merge request easycorp/zentaopms!3906
|
2022-06-14 06:30:53 +00:00 |
|
|
王怡栋
|
a8e7dcf2a3
|
Merge branch 'sprint/204_liumengyi_57090' into 'master'
* Fix bug #23648, #23650, and finish task #57090.
See merge request easycorp/zentaopms!3904
|
2022-06-14 06:29:34 +00:00 |
|
|
王怡栋
|
785d7ff2e2
|
Merge branch 'master_xieqiyu_56913' into 'master'
Master xieqiyu 56913
See merge request easycorp/zentaopms!3903
|
2022-06-14 06:27:37 +00:00 |
|
|
王怡栋
|
fa81f27748
|
Merge branch 'sprint/201_tianshujie_23663' into 'master'
* Fix bug #23663.
See merge request easycorp/zentaopms!3902
|
2022-06-14 06:25:45 +00:00 |
|
|
王怡栋
|
bfc378eba2
|
Merge branch 'master_xieqiyu_56935' into 'master'
* Finish task#56935.
See merge request easycorp/zentaopms!3899
|
2022-06-14 06:24:47 +00:00 |
|
|
王怡栋
|
68cf5cf967
|
Merge branch 'sprint/hufangzhou_ci' into 'master'
* Modify the makefile for gitlab ci.
See merge request easycorp/zentaopms!3895
|
2022-06-14 06:23:58 +00:00 |
|
|
王怡栋
|
f70f0c9f97
|
Merge branch 'sprint/master_zhouxudong_56910' into 'master'
Sprint/master zhouxudong 56910
See merge request easycorp/zentaopms!3898
|
2022-06-14 06:23:20 +00:00 |
|
|
hufangzhou
|
c5aa828a09
|
* Add the git pull command.
|
2022-06-14 14:21:56 +08:00 |
|