 lanzongjun
|
0a492b61fa
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun
|
2022-12-13 09:08:08 +08:00 |
|
|
lanzongjun
|
6da0c6ea01
|
* Finish Task #79670
|
2022-12-13 09:06:53 +08:00 |
|
|
lanzongjun
|
d2cb9938b5
|
* Finish Task #79670
|
2022-12-12 17:34:43 +08:00 |
|
|
zenggang
|
ee78bb255b
|
* Resolve feedback#1692
|
2022-12-12 02:53:26 +00:00 |
|
|
孙广明
|
8fa7675188
|
Merge branch 'master' into 'master_xieqiyu_78690'
# Conflicts:
# module/productplan/model.php
|
2022-12-09 08:58:14 +00:00 |
|
|
xieqiyu
|
7405efe5c7
|
* Code for task#78690.
|
2022-12-09 15:39:55 +08:00 |
|
|
lanzongjun
|
980b2998ad
|
* Fix Bug #78688
|
2022-12-09 13:58:10 +08:00 |
|
|
孙广明
|
31ef3e0260
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Bug #30480
See merge request easycorp/zentaopms!6498
|
2022-12-08 06:05:50 +00:00 |
|
|
Yagami
|
fd0b180d71
|
* Finish task #78676.
|
2022-12-08 13:15:48 +08:00 |
|
|
lanzongjun
|
d6f9976aae
|
* Finish Bug #30480
|
2022-12-08 11:06:04 +08:00 |
|
|
lanzongjun
|
5f3444278b
|
* Finish Task #78688
|
2022-12-07 14:22:27 +08:00 |
|
|
Yagami
|
ac2a798661
|
* Finish task #78689.
|
2022-12-05 14:16:02 +08:00 |
|
|
lanzongjun
|
a835220fe1
|
resolve conflict master
|
2022-12-02 10:28:31 +08:00 |
|
|
liuyongkai
|
80bd2c745c
|
* Resolve feedback #1461.
|
2022-12-01 14:25:21 +08:00 |
|
|
lanzongjun
|
315dc16980
|
master branch only relation master plan
|
2022-12-01 14:04:26 +08:00 |
|
|
lanzongjun
|
2a75393953
|
* Finish Task #77806
|
2022-11-30 15:57:08 +08:00 |
|
|
lanzongjun
|
00877a531d
|
code meeting fix
|
2022-11-30 09:05:23 +08:00 |
|
|
lanzongjun
|
9077e9b4a3
|
* Fix Task #77798
|
2022-11-29 14:35:07 +08:00 |
|
|
zenggang
|
9b63267e10
|
* Fix bug#30309
|
2022-11-29 03:01:45 +00:00 |
|
|
孙广明
|
6356683483
|
Merge branch 'master' into 256
|
2022-11-28 13:36:48 +08:00 |
|
|
孙广明
|
c40b00d760
|
Merge branch 'master_xieqiyu_30186' into 'master'
* Fix bug#30186.
See merge request easycorp/zentaopms!6382
|
2022-11-25 05:24:38 +00:00 |
|
|
xieqiyu
|
03705737f7
|
* Fix bug#30186.
|
2022-11-25 13:20:07 +08:00 |
|
|
王怡栋
|
e90baa91f9
|
Merge branch 'znetaopms_263_bug#30265' into 'master'
* Fix bug #30265.
See merge request easycorp/zentaopms!6381
|
2022-11-25 05:02:58 +00:00 |
|
|
wangyuting
|
a4cc3fd11a
|
* Fix bug #30265.
|
2022-11-25 03:25:52 +00:00 |
|
|
孙广明
|
1d9b2ce11c
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Bug #30028#30240#30245
See merge request easycorp/zentaopms!6376
|
2022-11-25 03:09:48 +00:00 |
|
|
lanzongjun
|
4223c7a7f1
|
* Fix Bug #30235
|
2022-11-25 08:49:01 +08:00 |
|
|
王怡栋
|
eb84b76b2c
|
* fix bug.
|
2022-11-25 08:35:00 +08:00 |
|
|
王怡栋
|
994015ade9
|
* fix bug #30229.
|
2022-11-25 08:34:59 +08:00 |
|
|
xieqiyu
|
657eb39302
|
* Fix bug#30203.
|
2022-11-24 14:52:47 +08:00 |
|
|
liuhong
|
c0852057c5
|
* Adjust code.
|
2022-11-24 06:38:23 +00:00 |
|
|
liuhong
|
2204d0e30c
|
* Adjust code #30172.
|
2022-11-24 06:34:11 +00:00 |
|
|
liuhong
|
b928b40f02
|
* Adjust code..
|
2022-11-24 06:25:19 +00:00 |
|
|
liuhong
|
c91024ecf3
|
* Fix bug #30172 #30178.
|
2022-11-24 06:19:48 +00:00 |
|
|
孙广明
|
86aa6ec66c
|
Merge branch 'master_xieqiyu_77253' into 'master'
* Fix bug#30032.
See merge request easycorp/zentaopms!6338
|
2022-11-23 08:45:38 +00:00 |
|
|
王怡栋
|
c2c238ecc1
|
Merge branch 'master_bug_23269' into 'master'
* Fix bug #30162.
See merge request easycorp/zentaopms!6339
|
2022-11-23 08:31:05 +00:00 |
|
|
liuhong
|
9b70804cfd
|
* Fix bug #30162.
|
2022-11-23 08:23:51 +00:00 |
|
|
xieqiyu
|
e6e37d4b20
|
* Fix bug#30032.
|
2022-11-23 16:17:01 +08:00 |
|
|
王怡栋
|
2cd292eedf
|
Merge branch 'zentaopms_263_bug#29641' into 'master'
* Fix bug #29641.
See merge request easycorp/zentaopms!6321
|
2022-11-23 05:45:06 +00:00 |
|
|
王怡栋
|
d98c9413f0
|
* fix bug #30074.
|
2022-11-23 11:09:47 +08:00 |
|
|
wangyuting
|
c2887ff921
|
* Fix bug #29641.
|
2022-11-23 03:02:07 +00:00 |
|
|
王怡栋
|
cc0fb8eeef
|
Merge branch 'master_bug_23269' into 'master'
* Fix bug #23269.
See merge request easycorp/zentaopms!6306
|
2022-11-23 01:55:01 +00:00 |
|
|
liuhong
|
6f272700be
|
* Fix bug #23269.
|
2022-11-23 00:48:31 +00:00 |
|
|
lanzongjun
|
284b748e7a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-11-22 15:45:19 +08:00 |
|
|
lanzongjun
|
a3f8f5f437
|
* Fix Task #77278
|
2022-11-22 14:23:01 +08:00 |
|
|
王怡栋
|
18d88bad03
|
Merge branch 'tianshujie_fixbug' into 'master'
* Fixed pager jump error in the use case list.
See merge request easycorp/zentaopms!6294
|
2022-11-22 06:01:41 +00:00 |
|
|
孙广明
|
f29f4aede8
|
Merge branch 'master_xieqiyu_77250' into 'master'
* Fix bug#30050.
See merge request easycorp/zentaopms!6295
|
2022-11-22 05:38:46 +00:00 |
|
|
xieqiyu
|
95b35e03a2
|
* Fix bug#30050.
|
2022-11-22 13:21:38 +08:00 |
|
|
tianshujie
|
672bbadffe
|
* Removes the type prompt on the project list page name under the product.
|
2022-11-22 13:18:49 +08:00 |
|
|
mayue
|
1654280bbf
|
* Fix bug #30031.
|
2022-11-22 11:07:10 +08:00 |
|
|
xieqiyu
|
46879558bb
|
* Fix bug#30027.
|
2022-11-22 09:52:08 +08:00 |
|