 王怡栋
|
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 |
|
|
tianshujie
|
7360831837
|
* Adjust plan box of create project pager.
|
2022-11-16 15:23:18 +08:00 |
|
|
hufangzhou
|
3dae19302b
|
* Add the new version.
|
2022-11-16 06:34:29 +00:00 |
|
|
王怡栋
|
5db92a2dad
|
* fix bug #29648.
|
2022-11-16 13:51:46 +08:00 |
|
|
wangyuting
|
eb8f8bac5e
|
* Fix bug #29692.
|
2022-11-16 05:29:40 +00: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 |
|
|
王怡栋
|
f2acb4f648
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #76394#76402
See merge request easycorp/zentaopms!6181
|
2022-11-16 03:16:58 +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 |
|
|
lanzongjun
|
bbee9eedca
|
* finish task #76394
|
2022-11-16 10:26:10 +08:00 |
|
|
孙广明
|
e656871dcf
|
Merge branch 'master_xieqiyu_29860' into 'master'
* Fix bug#29860.
See merge request easycorp/zentaopms!6180
|
2022-11-16 02:21:28 +00:00 |
|
|
xieqiyu
|
930e378c0a
|
* Fix bug#29860.
|
2022-11-16 10:18:25 +08:00 |
|
|
王怡栋
|
b328b219e5
|
Merge branch 'cyy_bug_29839' into 'master'
* Fix bug #29839.
See merge request easycorp/zentaopms!6175
|
2022-11-16 02:02:46 +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 |
|
|
caoyanyi
|
b2adb6ab92
|
* Fix bug #29839.
|
2022-11-16 09:32:02 +08:00 |
|
|
tanghucheng
|
d626bfbaef
|
* Fix bug #29820.
|
2022-11-16 08:49:31 +08:00 |
|
|
王怡栋
|
6fc2d1bd23
|
Merge branch 'master_feedback_1422' into 'master'
* Resolved feedback #1422.
See merge request easycorp/zentaopms!6160
|
2022-11-15 08:31:10 +00:00 |
|
|
王怡栋
|
6e844601d1
|
Merge branch 'zentaopms_261_bug_#29623' into 'master'
* Fix bug #29623.
See merge request easycorp/zentaopms!6162
|
2022-11-15 08:22:28 +00:00 |
|
|
王怡栋
|
f950d1fa82
|
* fix bug #76334.
|
2022-11-15 15:03:32 +08:00 |
|
|
daitingting
|
37caf86461
|
* Fix bug #29665.
|
2022-11-15 06:58:54 +00: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 |
|
|
王怡栋
|
019a41668b
|
Merge branch 'zentaopms_261_bug_#29621' into 'master'
* Fix bug #29621.
See merge request easycorp/zentaopms!6155
|
2022-11-15 05:26:03 +00:00 |
|
|
daitingting
|
7693217115
|
* Fix bug #29621.
|
2022-11-15 05:20:17 +00:00 |
|
|
tanghucheng
|
9835f45987
|
* Fix bug #29749.
|
2022-11-15 13:09:44 +08:00 |
|
|
王怡栋
|
66be15c00f
|
* fix bug #29736.
|
2022-11-15 11:13:04 +08:00 |
|
|
liuhong
|
d7f9d55863
|
* Resolved feedback #1422.
|
2022-11-15 02:15:12 +00:00 |
|
|
Yagami
|
7da90a3b7b
|
* Finish task #76106.
|
2022-11-15 09:12:11 +08:00 |
|
|
Yagami
|
8e481418df
|
* Finish task #76107.
|
2022-11-14 16:20:32 +08:00 |
|
|
xieqiyu
|
5ee8a7e1ac
|
* Fix bug#29441.
|
2022-11-14 14:46:19 +08:00 |
|
|
lanzongjun
|
0d07d33818
|
* finish bug #29404
|
2022-11-11 14:04:25 +08:00 |
|
|
daitingting
|
be40637a66
|
* Rename config->custom->feature.
|
2022-11-11 02:52:58 +00:00 |
|
|
王怡栋
|
3c83b8dbcb
|
Merge branch 'fixbug' into 'master'
* Add gantt icon.
See merge request easycorp/zentaopms!6109
|
2022-11-11 01:57:19 +00:00 |
|
|
王怡栋
|
77280a9aad
|
Merge branch 'zentaopms_258_task#75237' into 'master'
Zentaopms 258 task#75237
See merge request easycorp/zentaopms!6110
|
2022-11-10 08:31:34 +00:00 |
|
|
tanghucheng
|
f017fddb67
|
* Add gantt icon.
|
2022-11-10 15:37:08 +08:00 |
|
|
wangyuting
|
59fe4826ca
|
* Finish task #75237.
|
2022-11-10 07:36:35 +00:00 |
|
|
Yagami
|
a97b9ea972
|
* Finish task #75355.
|
2022-11-10 15:25:40 +08:00 |
|
|
Yagami
|
7bd15c19ce
|
* Fix bug #75356.
|
2022-11-10 09:46:25 +08:00 |
|
|
王怡栋
|
d8b1b0ba39
|
Merge branch 'zentaopms_258_task#75248' into 'master'
* Finish task #75248.
See merge request easycorp/zentaopms!6082
|
2022-11-09 08:00:04 +00:00 |
|
|
wangyidong
|
b32f2af9b7
|
* code for task #75236.
|
2022-11-09 10:30:30 +08:00 |
|