zhouxin
|
6cdeacd9ac
|
* Fix bug #21374.
|
2022-04-12 07:51:55 +00:00 |
|
zhouxin
|
125fa381fc
|
* Fix bug #21374.
|
2022-04-12 07:40:28 +00:00 |
|
朱金勇
|
e1eb543ed7
|
Merge branch 'app_zry' into 'master'
App zry
See merge request easycorp/zentaopms!2872
|
2022-04-12 07:28:24 +00:00 |
|
zhengrunyu
|
0909c6602b
|
* Add api for active bug.
|
2022-04-12 15:25:04 +08:00 |
|
zhengrunyu
|
a13a8ce570
|
* Fix api.
|
2022-04-12 15:23:31 +08:00 |
|
zhengrunyu
|
581479860a
|
* Fix api .
|
2022-04-12 15:08:45 +08:00 |
|
王怡栋
|
403ad59a5f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-12 15:03:48 +08:00 |
|
王怡栋
|
3a382c8334
|
Merge branch 'sprint/tianshujie_bug16527'
|
2022-04-12 15:03:30 +08:00 |
|
孙广明
|
0e676c281a
|
Merge branch 'mayue_fix_bug#17864' into 'master'
* Fix bug#17864.
See merge request easycorp/zentaopms!2880
|
2022-04-12 07:02:41 +00:00 |
|
王怡栋
|
538f831692
|
Merge branch 'master' into 'sprint/tianshujie_bug16527'
# Conflicts:
# module/testcase/control.php
# module/testcase/view/batchedit.html.php
|
2022-04-12 06:57:23 +00:00 |
|
孙广明
|
2f5a7dccef
|
Merge branch 'fixbugs_zhouxin_21636' into 'master'
* Fix bug #21636.
See merge request easycorp/zentaopms!2877
|
2022-04-12 06:47:00 +00:00 |
|
孙广明
|
1e86d0872a
|
Merge branch 'shunhuawei_fixbug_21488' into 'master'
Shunhuawei fixbug 21488
See merge request easycorp/zentaopms!2879
|
2022-04-12 06:44:47 +00:00 |
|
孙华伟
|
684196f776
|
*Optimize the code.
|
2022-04-12 14:43:05 +08:00 |
|
zhengrunyu
|
9cb5cb1134
|
* Add api for resolve bug.
|
2022-04-12 14:40:48 +08:00 |
|
孙华伟
|
91597abdb7
|
*Optimize the code.
|
2022-04-12 14:39:27 +08:00 |
|
孙广明
|
22fe70ec4e
|
Merge branch 'sprint/autoTest_liumengyi_programplan' into 'master'
* Add unit test of programplan.
See merge request easycorp/zentaopms!2888
|
2022-04-12 06:31:13 +00:00 |
|
liumengyi
|
14c6b4b9de
|
* Add unit test of programplan.
|
2022-04-12 14:29:29 +08:00 |
|
孙华伟
|
03cf60bdcb
|
*project,execution,bug have the same problem.
|
2022-04-12 14:26:12 +08:00 |
|
王怡栋
|
2cea2376d9
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-12 14:21:27 +08:00 |
|
王怡栋
|
f52e4a8a82
|
* code for bug #18161.
|
2022-04-12 14:21:07 +08:00 |
|
王怡栋
|
393f0d61a5
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #18722
See merge request easycorp/zentaopms!2881
|
2022-04-12 06:06:04 +00:00 |
|
王怡栋
|
c6f7312b2e
|
Merge branch 'sprint/fixbug_hufangzhou_14551' into 'master'
* Fix bug #14551.
See merge request easycorp/zentaopms!2878
|
2022-04-12 06:02:27 +00:00 |
|
王怡栋
|
89df957e9c
|
Merge branch 'sprint/fixbug_hufangzhou_15641' into 'master'
* Fix bug #15641.
See merge request easycorp/zentaopms!2876
|
2022-04-12 06:01:51 +00:00 |
|
王怡栋
|
0e2e23f98a
|
Merge branch 'sprint/fixbug_hufangzhou_15648' into 'master'
* Fix bug #15648.
See merge request easycorp/zentaopms!2875
|
2022-04-12 06:00:50 +00:00 |
|
王怡栋
|
a8c1b34b8e
|
Merge branch 'sprint/fixbug_hufangzhou_15633' into 'master'
* Fix bug #15633.
See merge request easycorp/zentaopms!2874
|
2022-04-12 06:00:11 +00:00 |
|
tianshujie
|
a8b051c12b
|
* Fix bug #16527.
|
2022-04-12 12:58:56 +08:00 |
|
孙华伟
|
80a565aa47
|
*Optimize the code.
|
2022-04-12 11:17:20 +08:00 |
|
Zongjun Lan
|
4184435c38
|
* fix bug *18722
|
2022-04-12 11:00:08 +08:00 |
|
Zongjun Lan
|
8ef47e9292
|
* fix bug *18722
|
2022-04-12 10:58:35 +08:00 |
|
mayue
|
8730491de8
|
* Fix bug#17864.
|
2022-04-12 10:54:21 +08:00 |
|
孙华伟
|
6e4153cdb9
|
*Optimize the code.
|
2022-04-12 10:44:49 +08:00 |
|
孙华伟
|
92a01376bb
|
*Fix bug#21488.
|
2022-04-12 10:42:45 +08:00 |
|
hufangzhou
|
d3fe628bcd
|
* Fix bug #14551.
|
2022-04-12 10:37:41 +08:00 |
|
zhouxin
|
105874959c
|
* Fix bug #21636.
|
2022-04-12 02:26:19 +00:00 |
|
李玉春
|
8772488231
|
Merge branch 'cyy_11026' into 'master'
* Fix bug #11026.
See merge request easycorp/zentaopms!2851
|
2022-04-12 02:13:53 +00:00 |
|
hufangzhou
|
96eae06795
|
* Fix bug #15641.
|
2022-04-12 10:11:20 +08:00 |
|
hufangzhou
|
2031d9df86
|
* Fix bug #15648.
|
2022-04-12 10:04:08 +08:00 |
|
zhengrunyu
|
7d3a91ab39
|
* Change function name for getBudgetWithUnit.
|
2022-04-12 09:53:30 +08:00 |
|
hufangzhou
|
baf4a67ed8
|
* Fix bug #15633.
|
2022-04-12 09:51:09 +08:00 |
|
孙广明
|
a3858d1512
|
Merge branch 'master_xieqiyu_14595' into 'master'
* Fix bug#14595.
See merge request easycorp/zentaopms!2871
|
2022-04-12 01:41:18 +00:00 |
|
孙广明
|
2b02f4dd38
|
Merge branch 'fixbug_sunjun_21618' into 'master'
Fixbug sunjun 21618
See merge request easycorp/zentaopms!2859
|
2022-04-12 01:40:59 +00:00 |
|
孙广明
|
71ce874dc3
|
Merge branch 'fixbugs_zhouxin_21654' into 'master'
* Fix bug #21654.
See merge request easycorp/zentaopms!2873
|
2022-04-12 01:40:47 +00:00 |
|
zhengrunyu
|
73642794a1
|
* Fix api.
|
2022-04-12 09:39:01 +08:00 |
|
zhouxin
|
1571548411
|
* Fix bug #21654.
|
2022-04-12 01:34:40 +00:00 |
|
zhujinyong
|
4f8d2791ed
|
* Reset cookie.
|
2022-04-12 09:12:07 +08:00 |
|
zhengrunyu
|
f46d469050
|
* Finish task 52558.
|
2022-04-12 09:01:17 +08:00 |
|
zhengrunyu
|
94fa7866c9
|
* Delete blank.
|
2022-04-12 08:58:08 +08:00 |
|
zhengrunyu
|
fba6ac6a0e
|
* Conversion budget unit.
|
2022-04-12 08:56:26 +08:00 |
|
sunjun
|
c36f432e1a
|
*Fixbug_sunjun_21618
|
2022-04-12 08:35:31 +08:00 |
|
李玉春
|
bf520a0fce
|
Merge branch 'devops25_52069' into 'master'
Fix bug#21331
See merge request easycorp/zentaopms!2867
|
2022-04-12 00:16:02 +00:00 |
|