 王怡栋
|
d1952c69b0
|
Merge branch 'zentaopms_266_wangyuting' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!6446
|
2022-12-02 02:47:20 +00:00 |
|
|
lanzongjun
|
59c7949f9a
|
change copyproject to copyProject
|
2022-12-02 09:53:03 +08:00 |
|
|
lanzongjun
|
8e1172e955
|
fix cp project js error
|
2022-12-02 08:50:07 +08:00 |
|
|
wangyuting
|
e100ad058c
|
* Fix bug.
|
2022-12-01 09:03:16 +00:00 |
|
|
wangyuting
|
2bd28233ea
|
* Fix bug #30429.
|
2022-12-01 06:28:13 +00:00 |
|
|
wangyuting
|
5c176595e4
|
* Finish task #77610.
|
2022-11-30 01:46:45 +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 |
|
|
Yagami
|
84dce924b8
|
* Code for task #30261.
|
2022-11-25 11:07:45 +08:00 |
|
|
Yagami
|
efbbaa9918
|
* Fix bug.
|
2022-11-25 09:53:17 +08:00 |
|
|
lanzongjun
|
3e2648ab5e
|
* Fix Bug #30240
|
2022-11-25 09:34:57 +08:00 |
|
|
Yagami
|
25e5b27220
|
* Finish task #77365.
|
2022-11-25 08:39:24 +08:00 |
|
|
王怡栋
|
6114d5cfbe
|
Merge branch 'zentaopms_263_bug#30216' into 'master'
* Fix bug #30216.
See merge request easycorp/zentaopms!6372
|
2022-11-24 07:57:14 +00:00 |
|
|
wangyuting
|
22f2299bfa
|
* Fix bug #30216.
|
2022-11-24 07:42:49 +00:00 |
|
|
tanghucheng
|
3ca705de9f
|
* Adjust code for bug #30011,24060.
|
2022-11-24 14:58:59 +08:00 |
|
|
Yagami
|
89d1dd2a3a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-24 13:15:40 +08:00 |
|
|
Yagami
|
9b0881dd5e
|
* Fix bug for project unlink product.
|
2022-11-24 13:15:26 +08:00 |
|
|
王怡栋
|
dc664a3e7a
|
Merge branch 'sprint/master_lanzongjun_fixbug'
|
2022-11-24 11:17:26 +08:00 |
|
|
lanzongjun
|
9f692f5b23
|
* Fix project edit width
|
2022-11-24 10:17:44 +08:00 |
|
|
lanzongjun
|
eac16b903f
|
* Fix Bug #30156
|
2022-11-23 16:54:49 +08:00 |
|
|
孙广明
|
e2571ee150
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Bug #30157
See merge request easycorp/zentaopms!6335
|
2022-11-23 08:01:46 +00:00 |
|
|
lanzongjun
|
40ee11ba30
|
* Fix Bug #30157
|
2022-11-23 15:59:21 +08:00 |
|
|
Yagami
|
307e9c5f62
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-23 13:44:25 +08:00 |
|
|
Yagami
|
49581d7ece
|
* Finish task #77252.
|
2022-11-23 13:43:06 +08:00 |
|
|
wangyuting
|
9b3e52ac3b
|
* Optimize project build css.
|
2022-11-23 02:02:13 +00:00 |
|
|
wangyuting
|
8c6753ea42
|
* Finish task #77140.
|
2022-11-22 06:03:51 +00:00 |
|
|
Yagami
|
02580a0465
|
* Cannot remove product link when story in execution.
|
2022-11-22 11:17:40 +08:00 |
|
|
孙广明
|
70eb171c39
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Task #76951
See merge request easycorp/zentaopms!6287
|
2022-11-22 02:04:54 +00:00 |
|
|
lanzongjun
|
0a5cd963cf
|
* Fix Task #76951
|
2022-11-22 08:50:39 +08:00 |
|
|
王怡栋
|
7a47096356
|
* fix bug #30007.
|
2022-11-21 14:10:53 +08:00 |
|
|
王怡栋
|
d9e22f5976
|
* fix bug #29670.
|
2022-11-21 10:48:07 +08:00 |
|
|
xieqiyu
|
bdb570c00e
|
* Fix bug#29461.
|
2022-11-21 09:43:56 +08:00 |
|
|
王怡栋
|
1db91b628a
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix bug #29442#29695
See merge request easycorp/zentaopms!6258
|
2022-11-18 08:28:55 +00:00 |
|
|
lanzongjun
|
8ef4f02bf8
|
* Fix bug #29442#29695
|
2022-11-18 15:38:59 +08:00 |
|
|
王怡栋
|
350d74575e
|
Merge branch 'master_xieqiyu_29990' into 'master'
* Fix bug#29990.
See merge request easycorp/zentaopms!6248
|
2022-11-18 07:20:08 +00:00 |
|
|
lanzongjun
|
0b2bb1a273
|
* Fix bug #29442#29695
|
2022-11-18 15:18:57 +08:00 |
|
|
xieqiyu
|
22499f1f96
|
* Fix bug#29990.
|
2022-11-18 11:22:09 +08:00 |
|
|
wangyuting
|
532bef39f3
|
* Finish task #76434.
|
2022-11-17 08:03:03 +00:00 |
|
|
mayue
|
0d50c31c0c
|
* Fix bug #29468.
|
2022-11-17 13:04:52 +08:00 |
|
|
mayue
|
5de7f12729
|
* Fix bug #29817.
|
2022-11-17 09:57:15 +08:00 |
|
|
孙广明
|
46a1701d05
|
Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
# module/project/lang/de.php
# module/project/lang/en.php
# module/project/lang/fr.php
|
2022-11-16 08:29:00 +00:00 |
|
|
lanzongjun
|
d07579f5eb
|
* fix bug #29877#29878
|
2022-11-16 15:52:08 +08:00 |
|
|
王怡栋
|
1a4d187866
|
Merge branch 'zentaopms261_wyd' into 'master'
* fix bug #29733.
See merge request easycorp/zentaopms!6187
|
2022-11-16 05:06:13 +00:00 |
|
|
王怡栋
|
e04c30fa3b
|
* fix bug #29733.
|
2022-11-16 11:00:44 +08:00 |
|
|
wangyuting
|
61438d05cb
|
* Fix bug #29705.
|
2022-11-16 02:34:34 +00:00 |
|
|
王怡栋
|
fc592d33d2
|
Merge branch 'fixbug' into 'master'
* Fix bug #29820.
See merge request easycorp/zentaopms!6169
|
2022-11-16 01:58:37 +00:00 |
|
|
tanghucheng
|
d626bfbaef
|
* Fix bug #29820.
|
2022-11-16 08:49:31 +08:00 |
|
|
daitingting
|
8e872c71e3
|
* Fix bug #29623.
|
2022-11-15 06:49:19 +00:00 |
|
|
王怡栋
|
575854c7dd
|
Merge branch 'fixbug' into 'master'
* Fix bug #29749.
See merge request easycorp/zentaopms!6153
|
2022-11-15 05:31:35 +00:00 |
|
|
tanghucheng
|
9835f45987
|
* Fix bug #29749.
|
2022-11-15 13:09:44 +08:00 |
|
|
Yagami
|
8e481418df
|
* Finish task #76107.
|
2022-11-14 16:20:32 +08:00 |
|