 孙广明
|
4d07a2d45b
|
Merge branch 'sprint/199_mayue_task56550,56553' into 'master'
* Finish task #56550,56553.
See merge request easycorp/zentaopms!3840
|
2022-06-10 01:02:07 +00:00 |
|
|
孙广明
|
448bec0032
|
Merge branch 'liyuchun_56556' into 'master'
Liyuchun 56556
See merge request easycorp/zentaopms!3826
|
2022-06-09 09:22:37 +00:00 |
|
|
孙广明
|
25a79b513b
|
Merge branch 'sprint/hufangzhou_productOrder' into 'master'
* Make the order of products in the product drop-down consistent with the product list.
See merge request easycorp/zentaopms!3836
|
2022-06-09 09:22:27 +00:00 |
|
|
孙广明
|
f02350122a
|
Merge branch 'liyuchun_56551' into 'master'
Liyuchun 56551
See merge request easycorp/zentaopms!3822
|
2022-06-09 09:21:32 +00:00 |
|
|
王怡栋
|
7d3ea4b91e
|
Merge branch 'sprint200_fix_bug_23486' into 'master'
* Fix bug#23494,bug#23486.
See merge request easycorp/zentaopms!3839
|
2022-06-09 09:17:19 +00:00 |
|
|
王怡栋
|
a49725905a
|
Merge branch 'fixbug' into 'master'
* Fix bug #23228.
See merge request easycorp/zentaopms!3837
|
2022-06-09 09:16:46 +00:00 |
|
|
mayue
|
edda32ba72
|
* Finish task #56550,56553.
|
2022-06-09 17:15:44 +08:00 |
|
|
李玉春
|
3cd9b94ecb
|
Merge branch 'cyy_56548' into 'master'
* Modify task import.
See merge request easycorp/zentaopms!3834
|
2022-06-09 09:13:47 +00:00 |
|
|
李玉春
|
fa152a30c8
|
Merge branch '201_zhouxin_fixbug' into 'master'
* Fix bug for task #56458.
See merge request easycorp/zentaopms!3838
|
2022-06-09 09:13:26 +00:00 |
|
|
zhouxin
|
367ed5c190
|
* Adjust code.
|
2022-06-09 08:59:56 +00:00 |
|
|
leiyong
|
4d5ccc180e
|
* Fix bug#23494,bug#23486.
|
2022-06-09 08:58:05 +00:00 |
|
|
zhouxin
|
5500e2fb58
|
* Fix bug for task #56458.
|
2022-06-09 08:54:56 +00:00 |
|
|
wangyidong
|
9b699300ff
|
* code for bug #23516.
|
2022-06-09 16:50:07 +08:00 |
|
|
tanghucheng
|
72d05c14df
|
* Fix bug #23228.
|
2022-06-09 16:40:16 +08:00 |
|
|
孙广明
|
d3afbb5922
|
Merge branch 'sprint/201_liumengyi_fixbug' into 'master'
* Fix bug #23506, #23439.
See merge request easycorp/zentaopms!3835
|
2022-06-09 08:26:54 +00:00 |
|
|
hufangzhou
|
4385eab733
|
* Make the order of products in the product drop-down consistent with the product list.
|
2022-06-09 16:25:29 +08:00 |
|
|
liumengyi
|
f3ce4377a8
|
* Fix bug #23506, #23439.
|
2022-06-09 16:22:58 +08:00 |
|
|
wangyidong
|
e407b58e2a
|
* adjust for get lang api.
|
2022-06-09 16:02:35 +08:00 |
|
|
caoyanyi
|
861a695535
|
* Modify task import.
|
2022-06-09 15:54:16 +08:00 |
|
|
李玉春
|
227586f566
|
Merge branch 'cyy_56548' into 'master'
* Modify access check.
See merge request easycorp/zentaopms!3833
|
2022-06-09 07:48:59 +00:00 |
|
|
caoyanyi
|
6a93732c19
|
* Modify access check.
|
2022-06-09 15:47:28 +08:00 |
|
|
wangyidong
|
4606a9eb2e
|
Merge branch 'sprint200_leiyong_task_56384'
|
2022-06-09 15:40:40 +08:00 |
|
|
王怡栋
|
c9a29bb420
|
Merge branch 'master' into 'sprint200_leiyong_task_56384'
# Conflicts:
# module/kanban/view/space.html.php
|
2022-06-09 07:40:03 +00:00 |
|
|
李玉春
|
f8581fd2c4
|
Merge branch 'zentaopms_199' into 'master'
Zentaopms 199
See merge request easycorp/zentaopms!3832
|
2022-06-09 07:38:52 +00:00 |
|
|
leiyong
|
1b511cac59
|
* Handling html tags.
|
2022-06-09 07:33:00 +00: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 |
|
|
wangyidong
|
85affa75ba
|
Merge branch 'sprint/201_liumengyi_fixbug'
|
2022-06-09 15:24:44 +08:00 |
|
|
王怡栋
|
ad0ebf0aa1
|
Merge branch 'master' into 'sprint/201_liumengyi_fixbug'
# Conflicts:
# module/execution/js/kanban.js
|
2022-06-09 07:24:23 +00:00 |
|
|
王怡栋
|
349260a146
|
Merge branch 'master_xieqiyu_56386' into 'master'
* Finish task#56386.
See merge request easycorp/zentaopms!3825
|
2022-06-09 07:20:12 +00:00 |
|
|
liumengyi
|
63717f4fd0
|
* Fix bug of task #56454.
|
2022-06-09 15:18:56 +08:00 |
|
|
李玉春
|
9b0368a6f4
|
Merge branch 'sprint/199_cyy_56548' into 'zentaopms_199'
Sprint/199 cyy 56548
See merge request easycorp/zentaopms!3811
|
2022-06-09 07:13:01 +00:00 |
|
|
tanghucheng
|
181fb38e7e
|
* Fix bug #23125.
|
2022-06-09 15:11:51 +08:00 |
|
|
leiyong
|
c44b1096c4
|
* Adjust code.
|
2022-06-09 07:06:22 +00:00 |
|
|
朱金勇
|
cb488e5635
|
Merge branch 'sgm_productorder' into 'master'
* Fix product order bug.
See merge request easycorp/zentaopms!3828
|
2022-06-09 06:57:24 +00:00 |
|
|
朱金勇
|
5a32a1374b
|
Merge branch 'liwenrui-master-patch-52046' into 'master'
* reword xuan message title.
See merge request easycorp/zentaopms!3829
|
2022-06-09 06:55:53 +00:00 |
|
|
tanghucheng
|
415542746b
|
* Fix bug #23374.
|
2022-06-09 14:54:54 +08:00 |
|
|
文睿 李
|
0918fea373
|
* reword xuan message title.
|
2022-06-09 06:49:33 +00:00 |
|
|
孙广明
|
ecd7f1197f
|
* Fix product order bug.
|
2022-06-09 14:48:56 +08:00 |
|
|
leiyong
|
70ee0323f6
|
* Fix bug#23487.
|
2022-06-09 06:48:21 +00:00 |
|
|
tanghucheng
|
c4765a8431
|
* Fix bug #23441.
|
2022-06-09 14:41:26 +08:00 |
|
|
liyuchun
|
f1c720c4a0
|
* Finish task #56556.
|
2022-06-09 06:36:52 +00:00 |
|
|
xieqiyu
|
5d5bc8f927
|
* Finish task#56386.
|
2022-06-09 14:35:20 +08:00 |
|
|
王怡栋
|
ce38afd825
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!3817
|
2022-06-09 06:35:07 +00:00 |
|
|
tanghucheng
|
87e879e047
|
* Fix bug #23474,23474.
|
2022-06-09 14:34:11 +08:00 |
|
|
wangyidong
|
7549dc822a
|
Merge branch 'sprint/master_zhouxudong_56362'
|
2022-06-09 14:32:36 +08:00 |
|
|
王怡栋
|
084f66dd51
|
Merge branch 'master' into 'sprint/master_zhouxudong_56362'
# Conflicts:
# module/kanban/model.php
|
2022-06-09 06:32:06 +00:00 |
|
|
孙广明
|
06768fb562
|
Merge branch 'sprint/scx_api' into 'master'
* Fix create user bug.
See merge request easycorp/zentaopms!3823
|
2022-06-09 06:31:14 +00:00 |
|
|
王怡栋
|
8dc792e94b
|
Merge branch 'fixbug' into 'master'
* Fix bug for lite kanban.
See merge request easycorp/zentaopms!3821
|
2022-06-09 06:27:07 +00:00 |
|
|
leiyong
|
aec5b3612e
|
* Finish task#56384.
|
2022-06-09 06:23:50 +00:00 |
|
|
王怡栋
|
174512c042
|
Merge branch 'sgm_feedback' into 'master'
* Finish task #56546.
See merge request easycorp/zentaopms!3824
|
2022-06-09 06:23:39 +00:00 |
|