 孙广明
|
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 |
|
|
王怡栋
|
3dd409514c
|
Merge branch 'zentaopms_263_wangyuting2' into 'master'
* Optimize project build css.
See merge request easycorp/zentaopms!6315
|
2022-11-23 05:43:50 +00: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
|
63a249eeca
|
* Fix bug #30045.
|
2022-11-23 01:29:34 +00:00 |
|
|
王怡栋
|
c8abe9f23a
|
Merge branch 'zentaopms_263_task#77140' into 'master'
* Finish task #77140.
See merge request easycorp/zentaopms!6297
|
2022-11-22 06:39:17 +00:00 |
|
|
Yagami
|
e4a80e800d
|
* Finish task #76953.
|
2022-11-22 14:27:38 +08: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 |
|
|
孙广明
|
62f0dddafb
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix bug #30034
See merge request easycorp/zentaopms!6277
|
2022-11-22 00:36:58 +00:00 |
|
|
Yagami
|
07b30d1f7c
|
* Finish task #76953.
|
2022-11-21 14:22:42 +08:00 |
|
|
王怡栋
|
7a47096356
|
* fix bug #30007.
|
2022-11-21 14:10:53 +08:00 |
|
|
lanzongjun
|
968ba89c77
|
* Fix bug #30034
|
2022-11-21 14:09:30 +08:00 |
|
|
王怡栋
|
2fb3ed6fd9
|
Merge branch 'zentaopms_263_bug_subprogram' into 'master'
* Display all products of the top program.
See merge request easycorp/zentaopms!6265
|
2022-11-21 05:26:07 +00:00 |
|
|
王怡栋
|
d9e22f5976
|
* fix bug #29670.
|
2022-11-21 10:48:07 +08:00 |
|
|
daitingting
|
84b1383820
|
* Display all products of the top program.
|
2022-11-21 02:12:42 +00: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 |
|
|
王怡栋
|
c291211ac9
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76459
See merge request easycorp/zentaopms!6246
|
2022-11-18 07:19:36 +00:00 |
|
|
lanzongjun
|
0b2bb1a273
|
* Fix bug #29442#29695
|
2022-11-18 15:18:57 +08:00 |
|
|
王怡栋
|
6164fa0c69
|
Merge branch 'zentaopms_258_bug#29959' into 'master'
* Fix bug #29959.
See merge request easycorp/zentaopms!6243
|
2022-11-18 07:18:30 +00:00 |
|
|
lanzongjun
|
da5f7e860b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-11-18 14:07:23 +08:00 |
|
|
xieqiyu
|
22499f1f96
|
* Fix bug#29990.
|
2022-11-18 11:22:09 +08:00 |
|
|
lanzongjun
|
a105dc7845
|
* Fix task #76459
|
2022-11-18 11:17:09 +08:00 |
|
|
wangyuting
|
5df0b941b1
|
* Fix bug #29959.
|
2022-11-18 02:51:50 +00:00 |
|
|
daitingting
|
6743a6e779
|
* Fix bug #29931.
|
2022-11-18 02:40:02 +00:00 |
|
|
王怡栋
|
9d7b30f699
|
Merge branch 'zentaopms_258_task#76434' into 'master'
* Finish task #76434.
See merge request easycorp/zentaopms!6231
|
2022-11-17 08:47:11 +00:00 |
|
|
孙广明
|
9e573b74d7
|
Merge branch 'master_xieqiyu_76423' into 'master'
* Fix bug#29430.
See merge request easycorp/zentaopms!6218
|
2022-11-17 08:09:01 +00:00 |
|
|
wangyuting
|
532bef39f3
|
* Finish task #76434.
|
2022-11-17 08:03:03 +00:00 |
|
|
王怡栋
|
6d2f954054
|
Merge branch 'sprint/zentaopms262_mayue_bug#29468' into 'master'
* Fix bug #29468.
See merge request easycorp/zentaopms!6221
|
2022-11-17 06:50:51 +00:00 |
|
|
王怡栋
|
93a772e01e
|
* fix bug #29834.
|
2022-11-17 14:01:33 +08:00 |
|
|
mayue
|
0d50c31c0c
|
* Fix bug #29468.
|
2022-11-17 13:04:52 +08:00 |
|
|
xieqiyu
|
4a7b338bad
|
* Fix bug#29430.
|
2022-11-17 10:36:25 +08:00 |
|
|
王怡栋
|
468ae934f4
|
Merge branch 'master_xieqiyu_code' into 'master'
* Fallback code for bug#29896.
See merge request easycorp/zentaopms!6207
|
2022-11-17 02:00:50 +00:00 |
|
|
王怡栋
|
734837ad2e
|
Merge branch 'sprint/zentaopms262_mayue_bug#29817' into 'master'
* Fix bug #29817.
See merge request easycorp/zentaopms!6212
|
2022-11-17 01:58:10 +00:00 |
|
|
mayue
|
5de7f12729
|
* Fix bug #29817.
|
2022-11-17 09:57:15 +08:00 |
|
|
王怡栋
|
6425496407
|
Merge branch 'zentaopms261_wyd'
|
2022-11-17 09:55:27 +08:00 |
|
|
xieqiyu
|
679f2641aa
|
* Fallback code for bug#29896.
|
2022-11-16 17:19:43 +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 |
|
|
xieqiyu
|
2a7493ac78
|
* Fix bug#29896.
|
2022-11-16 15:48:18 +08:00 |
|
|
王怡栋
|
8848d5c462
|
Merge branch 'sprint/tianshujie_css' into 'master'
* Adjust plan box of create project pager.
See merge request easycorp/zentaopms!6198
|
2022-11-16 07:29:38 +00:00 |
|
|
王怡栋
|
6cc66fad4f
|
Merge branch 'sprint/180beta1_hufangzhou_newVersion' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!6197
|
2022-11-16 07:29:23 +00:00 |
|
|
王怡栋
|
e969873a84
|
Merge branch 'zentaopms_258_bug#29692' into 'master'
* Fix bug #29692.
See merge request easycorp/zentaopms!6190
|
2022-11-16 07:26:48 +00:00 |
|