 孙广明
|
0c1c8ab16d
|
Merge branch 'sprint/210_mayue_bug#24408' into 'master'
* Fix bug #24408.
See merge request easycorp/zentaopms!4172
|
2022-06-28 05:04:23 +00:00 |
|
|
mayue
|
c860a20edf
|
* Fix bug #24408.
|
2022-06-28 10:15:36 +08:00 |
|
|
xieqiyu
|
b55f45be0f
|
* Finish task#58592.
|
2022-06-28 09:49:22 +08:00 |
|
|
xieqiyu
|
132433cc92
|
* Modify language item.
|
2022-06-27 17:27:15 +08:00 |
|
|
xieqiyu
|
9b1c865964
|
* Code for task#57854.
|
2022-06-27 17:11:59 +08:00 |
|
|
xieqiyu
|
8dd618528a
|
* Fix test bug.
|
2022-06-27 16:51:53 +08:00 |
|
|
xieqiyu
|
08faa3edff
|
* Finish task#57854.
|
2022-06-27 13:33:11 +08:00 |
|
|
xieqiyu
|
d4ac1b4a5f
|
* Code for task#57850.
|
2022-06-23 17:20:19 +08:00 |
|
|
孙广明
|
a6ec47142f
|
Merge branch 'sprint/207_mayue_bug#24062' into 'master'
* Fix bug #24062.
See merge request easycorp/zentaopms!4108
|
2022-06-23 07:01:47 +00:00 |
|
|
mayue
|
c15bda57a8
|
* Fix bug #24062.
|
2022-06-23 14:58:39 +08:00 |
|
|
孙广明
|
6d88c0c22b
|
* Code for code error.
|
2022-06-23 14:16:01 +08:00 |
|
|
王怡栋
|
c69384617a
|
Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.
See merge request easycorp/zentaopms!4083
|
2022-06-23 00:39:25 +00:00 |
|
|
xieqiyu
|
21b0217aa8
|
* Code for task#57850.
|
2022-06-22 13:15:44 +08:00 |
|
|
tianshujie
|
7372f7f936
|
* Finish story #32623.
|
2022-06-22 08:51:05 +08:00 |
|
|
孙广明
|
34ddc497ba
|
Merge branch 'zentaopms_207'
|
2022-06-22 08:33:17 +08:00 |
|
|
hufangzhou
|
adad8ea3ae
|
* Finish task #57882, #57874, #57873, #57855.
|
2022-06-21 17:30:36 +08:00 |
|
|
mayue
|
a0fd431401
|
* Optimize code.
|
2022-06-21 15:23:12 +08:00 |
|
|
mayue
|
d97b5aeb97
|
* Fix bug #23765.
|
2022-06-21 13:30:00 +08:00 |
|
|
孙广明
|
3f83669de2
|
Merge branch 'sprint202_leiyong_fix_bug' into 'master'
* Fix bug#23707.
See merge request easycorp/zentaopms!3992
|
2022-06-16 09:28:33 +00:00 |
|
|
leiyong
|
f4e3a0dc61
|
* Fix bug#23707.
|
2022-06-16 09:14:11 +00:00 |
|
|
xieqiyu
|
783d4471b0
|
* Fix bug#23797.
|
2022-06-16 15:50:25 +08:00 |
|
|
孙广明
|
3a1d6a8982
|
Merge branch 'fixbug_23694' into 'master'
fixbug_23694
See merge request easycorp/zentaopms!3971
|
2022-06-16 06:36:28 +00:00 |
|
|
sunjun
|
e2e1bddf96
|
fixbug_23694
|
2022-06-16 05:17:24 +00:00 |
|
|
leiyong
|
fcd6f4c333
|
* Finish task#56932.
|
2022-06-15 10:57:05 +00:00 |
|
|
leiyong
|
b6f5c18dc9
|
* Finish task#56933.
|
2022-06-14 07:56:43 +00:00 |
|
|
xieqiyu
|
c7919c48d0
|
* Fix bug#23597.
|
2022-06-13 13:17:25 +08:00 |
|
|
wangyidong
|
9b699300ff
|
* code for bug #23516.
|
2022-06-09 16:50:07 +08:00 |
|
|
王怡栋
|
95fa3f04e1
|
Merge branch 'fixbug' into 'master'
* Fix bug #23474,23474,23441,23374.
See merge request easycorp/zentaopms!3830
|
2022-06-09 07:25:39 +00:00 |
|
|
liumengyi
|
63717f4fd0
|
* Fix bug of task #56454.
|
2022-06-09 15:18:56 +08:00 |
|
|
tanghucheng
|
415542746b
|
* Fix bug #23374.
|
2022-06-09 14:54:54 +08:00 |
|
|
王怡栋
|
fd0cb543ba
|
Merge branch 'master' into 'sprint_200'
# Conflicts:
# module/execution/lang/en.php
# module/execution/lang/zh-cn.php
# module/execution/view/kanban.html.php
# module/kanban/css/space.css
|
2022-06-09 03:16:20 +00:00 |
|
|
孙广明
|
cfb3814e86
|
Merge branch 'sprint_201_56468' into 'master'
sprint_201_56468
See merge request easycorp/zentaopms!3806
|
2022-06-09 01:29:18 +00:00 |
|
|
sunjun
|
cd20d42306
|
sprint_201_56468
|
2022-06-09 00:39:32 +00:00 |
|
|
wangyidong
|
11e6edcd22
|
Merge branch 'zdoo18'
|
2022-06-08 17:06:07 +08:00 |
|
|
xieqiyu
|
bb574373b4
|
* Finish task#56388.
|
2022-06-08 11:27:23 +08:00 |
|
|
孙广明
|
b896377846
|
* Change zentao license.
|
2022-06-08 10:02:29 +08:00 |
|
|
孙广明
|
b528156589
|
* Change license.
|
2022-06-08 09:34:46 +08:00 |
|
|
tianshujie
|
a396ad68c4
|
* Fix bug #23348,23349.
|
2022-06-07 13:55:45 +08:00 |
|
|
孙广明
|
61ad544156
|
Merge branch 'zentaopms_198'
|
2022-06-02 15:04:56 +08:00 |
|
|
sunjun
|
136d48f85e
|
fixbug_sunjun_22971
|
2022-06-02 06:14:57 +00:00 |
|
|
zhujinyong
|
9a2933df72
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-06-02 08:33:12 +08:00 |
|
|
zhujinyong
|
cc42a0e685
|
Merge branch 'sprint/sunhao/fix_picker'
|
2022-06-02 08:33:01 +08:00 |
|
|
孙广明
|
2d572a9d14
|
Merge branch '197'
|
2022-06-02 08:32:45 +08:00 |
|
|
Hao Sun
|
c9febeb72b
|
* fix picker not work in page story-create.
|
2022-06-01 09:14:49 +00:00 |
|
|
sunjun
|
1c8db1da3a
|
fixbug_sunjun_22531
|
2022-06-01 09:14:12 +00:00 |
|
|
zhouxin
|
fd6fe986ad
|
* Fix bug #23168.
|
2022-06-01 09:14:08 +00:00 |
|
|
孙广明
|
c671cc3186
|
Merge branch 'sprint/197_zhouxin_55674' into 'sprint/197'
Sprint/197 zhouxin 55674
See merge request easycorp/zentaopms!3691
|
2022-06-01 08:57:31 +00:00 |
|
|
zhouxin
|
cda4d7e809
|
* Adjust code.
|
2022-06-01 08:56:49 +00:00 |
|
|
zhouxin
|
bc803e56c8
|
* Finish task #55676.
|
2022-06-01 07:34:04 +00:00 |
|
|
wangyidong
|
2400dfc83a
|
* code for task #55568.
|
2022-06-01 14:48:35 +08:00 |
|