tianshujie
|
cd2e539a6d
|
* Fix bug #21212.
|
2022-03-28 13:56:04 +08:00 |
|
李玉春
|
c458dab32a
|
Merge branch 'sprint/tianshujie_bug_19072' into 'master'
Sprint/tianshujie bug 19072
See merge request easycorp/zentaopms!2496
|
2022-03-24 02:40:57 +00:00 |
|
tianshujie
|
9178a6e3b3
|
* Modify variable name.
|
2022-03-24 10:27:42 +08:00 |
|
tianshujie
|
e9ee8a176d
|
* Fix bug #19072.
|
2022-03-24 09:35:39 +08:00 |
|
李玉春
|
6729298c92
|
Merge branch 'bugfix_cyy' into 'master'
Modify app language and API
See merge request easycorp/zentaopms!2488
|
2022-03-24 00:29:54 +00:00 |
|
孙广明
|
337f12b7e3
|
Merge branch 'master_xieqiyu_20930' into 'master'
* Fix bug#20930.
See merge request easycorp/zentaopms!2462
|
2022-03-23 05:53:02 +00:00 |
|
zhouxudong
|
9acef59ced
|
* Fix bug #17053.
|
2022-03-23 13:31:52 +08:00 |
|
caoyanyi
|
19e7095e6c
|
* Fix bug #21075.
|
2022-03-23 13:11:39 +08:00 |
|
xieqiyu
|
c614eb44e4
|
* Fix bug#20930.
|
2022-03-23 09:03:41 +08:00 |
|
zhouxin
|
89a56dc374
|
* Fix bug #18746.
|
2022-03-22 08:35:13 +00:00 |
|
李玉春
|
26f84d495d
|
Merge branch 'sprint/master_zhouxudong_16575' into 'master'
Sprint/master zhouxudong 16575
See merge request easycorp/zentaopms!2453
|
2022-03-22 08:18:36 +00:00 |
|
zhouxudong
|
81e4aa867a
|
* Fix bug #16575.
|
2022-03-22 16:14:28 +08:00 |
|
李玉春
|
56e4317e23
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!2447
|
2022-03-22 07:55:27 +00:00 |
|
tianshujie
|
5458aeeff9
|
* Delete useless judgment conditions.
|
2022-03-22 15:54:03 +08:00 |
|
tianshujie
|
69e1f67fbd
|
* Fix bug #21054.
|
2022-03-22 14:32:52 +08:00 |
|
zhouxin
|
cc2704e1d0
|
Fix bug #17415.
|
2022-03-22 05:10:45 +00:00 |
|
李玉春
|
7127d6e8ab
|
Merge branch 'sprint/master_zhoxudong_15984' into 'master'
* Fix bug #15984.
See merge request easycorp/zentaopms!2419
|
2022-03-22 02:43:35 +00:00 |
|
zhouxudong
|
d74e5c4c58
|
* Fix bug #15984.
|
2022-03-22 09:58:43 +08:00 |
|
zhouxin
|
ddc8a8f724
|
Fix bug #17415.
|
2022-03-22 01:38:31 +00:00 |
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
liyuchun
|
0187fb80c7
|
Merge branch 'devops24'
|
2022-03-22 08:28:32 +08:00 |
|
朱金勇
|
ec7c5022c8
|
Merge branch 'master' into 'Zentao_app1.1'
# Conflicts:
# module/execution/control.php
|
2022-03-21 06:12:21 +00:00 |
|
zhouxin
|
22b377a5aa
|
Fix bug #19382.
|
2022-03-21 05:48:13 +00:00 |
|
liyuchun
|
8efe478798
|
* Fix bug #19231,19230.
|
2022-03-21 10:15:36 +08:00 |
|
李玉春
|
f935639cb8
|
Merge branch 'pailei2_zhouxin_fixbugs' into 'pailei2'
Pailei2 zhouxin fixbugs
See merge request easycorp/zentaopms!2375
|
2022-03-18 09:11:32 +00:00 |
|
zhouxin
|
6dc51aafc0
|
Adjust code.
|
2022-03-18 09:08:48 +00:00 |
|
孙广明
|
d9505fa9fa
|
Merge branch 'pailei2_zhouxin_50796' into 'pailei2'
Pailei2 zhouxin 50796
See merge request easycorp/zentaopms!2341
|
2022-03-18 03:25:54 +00:00 |
|
zhouxin
|
f280e32777
|
Fix bug #17415.
|
2022-03-18 02:43:14 +00:00 |
|
zhouxin
|
78263786ed
|
Move getError from controller to model.
|
2022-03-17 07:50:54 +00:00 |
|
zhouxudong
|
6b09aac4aa
|
* Fix bug #20832.
|
2022-03-17 14:20:33 +08:00 |
|
tianshujie
|
74548de746
|
* Fix the problem of no Kanban after Kanban execution creation.
|
2022-03-16 12:54:13 +08:00 |
|
tianshujie
|
bc03600b03
|
* Fix bug #19289.
|
2022-03-16 10:50:08 +08:00 |
|
王怡栋
|
c1f3258a74
|
* adjust for get dynamic.
|
2022-03-14 16:08:58 +08:00 |
|
tianshujie
|
ccb9dfdf07
|
* Fix bug #17960.
|
2022-03-14 10:04:23 +08:00 |
|
Zongjun Lan
|
9b8f238779
|
* code format
|
2022-03-11 17:31:31 +08:00 |
|
Zongjun Lan
|
22c49a0949
|
* fix bug #20647
|
2022-03-11 16:29:00 +08:00 |
|
Zongjun Lan
|
b51e39e69f
|
* fix bug #20640
|
2022-03-11 14:58:39 +08:00 |
|
songchenxuan
|
c309388a68
|
*Kanban view data.
|
2022-03-08 15:40:05 +08:00 |
|
tanghucheng
|
15e6262065
|
* Fix bug #20329,20350,20366.
|
2022-03-07 16:42:58 +08:00 |
|
孙华伟
|
c01323fdbb
|
*Fix bug #20273 .
|
2022-03-03 09:40:43 +08:00 |
|
孙华伟
|
e0640737c2
|
*Fix bug #20273.
|
2022-03-03 09:34:41 +08:00 |
|
李玉春
|
a0da36e3f2
|
Merge branch 'pailei' into 'pailei_sunhuawei_story_30528'
# Conflicts:
# module/execution/control.php
# module/execution/view/kanban.html.php
|
2022-03-02 05:34:15 +00:00 |
|
孙华伟
|
e7d721af85
|
*
|
2022-03-02 13:15:04 +08:00 |
|
孙华伟
|
33a2aec741
|
*
|
2022-03-02 11:00:51 +08:00 |
|
孙广明
|
b63fa55607
|
Merge branch 'pailei_zhangzilong_49297' into 'pailei'
* Finish task #49297.
See merge request easycorp/zentaopms!2029
|
2022-03-02 03:00:45 +00:00 |
|
孙华伟
|
0402049b85
|
*
|
2022-03-02 10:58:08 +08:00 |
|
xieqiyu
|
e3b101a807
|
* Fix bug of foreach.
|
2022-03-02 09:36:54 +08:00 |
|
孙广明
|
5decf2cf6c
|
Merge branch 'sprint/185_zhouxudong_19962' into 'pailei'
* Finish task #49696.
See merge request easycorp/zentaopms!1991
|
2022-03-02 00:31:17 +00:00 |
|
xieqiyu
|
06af0ff6c4
|
* Code for task#49696.
|
2022-03-01 17:28:57 +08:00 |
|
孙华伟
|
23511a0472
|
*Story #30528.
|
2022-03-01 15:37:05 +08:00 |
|