 Yagami
|
97c421c5b4
|
* Fix bug #32374.
|
2023-03-01 14:48:12 +08:00 |
|
|
王怡栋
|
23d4e4d11e
|
Merge branch 'daitingting_bug_#32503' into 'master'
* Fix bug #32503.
See merge request easycorp/zentaopms!7094
|
2023-03-01 00:31:59 +00:00 |
|
|
孙广明
|
c9a7c22553
|
Merge branch 'sprint/294_liumengyi_fixbug' into 'master'
* Fix bug 32493 32502 32495 32494 32491.
See merge request easycorp/zentaopms!7092
|
2023-02-28 09:12:43 +00:00 |
|
|
Yagami
|
1efa245724
|
* Code for program progress bug.
|
2023-02-28 17:10:36 +08:00 |
|
|
liumengyi
|
241c923453
|
* Fix bug #32491.
|
2023-02-28 08:55:37 +00:00 |
|
|
daitingting
|
2271e5bd70
|
* Fix bug #32503.
|
2023-02-28 08:38:00 +00:00 |
|
|
孙广明
|
cde3ff49f3
|
Merge branch 'master' into 'sprint/294_liumengyi_fixbug'
# Conflicts:
# module/project/js/execution.js
|
2023-02-28 07:16:39 +00:00 |
|
|
孙广明
|
54c3641625
|
Merge branch 'fixbug_liumengyi' into 'master'
* Optimize code, fix bug 32456 32457 32463 32464 32477 32480.
See merge request easycorp/zentaopms!7086
|
2023-02-28 07:15:20 +00:00 |
|
|
liumengyi
|
e96d7b0e00
|
* Fix bug #32455.
|
2023-02-28 06:25:07 +00:00 |
|
|
Yagami
|
0f38f55480
|
* Fix bug #32450.
|
2023-02-28 14:22:49 +08:00 |
|
|
liumengyi
|
5daf06d2f1
|
* Fix bug #32480.
|
2023-02-28 06:03:03 +00:00 |
|
|
孙广明
|
31ccf58fce
|
Merge branch 'mayue_resolve_feedback#2132' into 'master'
* Resolve feedback #2132.
See merge request easycorp/zentaopms!7055
|
2023-02-24 03:22:40 +00:00 |
|
|
mayue
|
772ec30c37
|
* Resolve feedback #2132.
|
2023-02-23 06:46:06 +00:00 |
|
|
liumengyi
|
9283507b20
|
* Finish task #85434.
|
2023-02-23 02:11:30 +00:00 |
|
|
孙广明
|
25fa088422
|
Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!7033
|
2023-02-22 07:55:34 +00:00 |
|
|
liumengyi
|
5ed6406041
|
* Fix issue #754, #751, and adjust width of create project guide.
|
2023-02-22 07:50:21 +00:00 |
|
|
tianshujie
|
af76befb02
|
* Resolve issue #756.
|
2023-02-22 15:15:34 +08:00 |
|
|
hufangzhou
|
98a5efb31c
|
* Recovery code.
|
2023-02-22 01:34:50 +00:00 |
|
|
zhujinyong
|
6b241f1d06
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-21 15:56:50 +08:00 |
|
|
zhujinyong
|
39b2773e77
|
* Fix bug #32332.
|
2023-02-21 15:55:33 +08:00 |
|
|
hufangzhou
|
b997124e9c
|
* Finish task #85050.
|
2023-02-21 05:52:28 +00:00 |
|
|
孙广明
|
777b20ebdc
|
Merge branch 'sprint/tsj_task' into 'master'
Sprint/tsj task
See merge request easycorp/zentaopms!7009
|
2023-02-21 05:47:26 +00:00 |
|
|
zhujinyong
|
6ae6909717
|
* Fix merge bug.
|
2023-02-21 10:28:55 +08:00 |
|
|
zhujinyong
|
5551177931
|
+ Add error of different type.
|
2023-02-21 10:24:00 +08:00 |
|
|
hufangzhou
|
f3800e9e38
|
* Code for task #85049.
|
2023-02-21 01:38:01 +00:00 |
|
|
wangyidong
|
36150659f7
|
* adjst code.
|
2023-02-21 09:35:47 +08:00 |
|
|
hufangzhou
|
d4701a82f3
|
* Fix bug for project-execution feature bar active.
|
2023-02-20 09:14:32 +00:00 |
|
|
孙广明
|
a2dd5323ca
|
Merge branch 'sprint/hufangzhou_task_85049' into 'master'
* Finish task #85049.
See merge request easycorp/zentaopms!7003
|
2023-02-20 08:26:46 +00:00 |
|
|
王怡栋
|
27bebb66a8
|
Merge branch 'ticket_389' into 'master'
* Resolved feedback 2099
See merge request easycorp/zentaopms!6998
|
2023-02-20 07:25:51 +00:00 |
|
|
hufangzhou
|
2c1995d4a9
|
* Finish task #85049.
|
2023-02-20 07:23:49 +00:00 |
|
|
tianshujie
|
d6266bc607
|
* Code for finish task #85047.
|
2023-02-20 14:47:10 +08:00 |
|
|
liuhong
|
bdac3f1ffa
|
* Resolved feedback 2099
|
2023-02-20 02:27:03 +00:00 |
|
|
liumengyi
|
6520a56bee
|
* Fix bug of browse gantt.
|
2023-02-20 02:04:33 +00:00 |
|
|
王怡栋
|
c004967af9
|
Merge branch 'sprint/290_liumengyi_32244' into 'master'
* Fix bug #32244, #32245, #32249, #32251, #32255, #32179, @32167.
See merge request easycorp/zentaopms!6989
|
2023-02-20 01:16:52 +00:00 |
|
|
hufangzhou
|
75b5b2562c
|
* Finish task #84583.
|
2023-02-18 16:04:53 +00:00 |
|
|
liumengyi
|
c28161fb0d
|
* Fix bug of create project.
|
2023-02-18 09:15:04 +00:00 |
|
|
wangyidong
|
7bc1b0da56
|
* fix bug #32203.
|
2023-02-17 09:25:07 +08:00 |
|
|
Yagami
|
f6dfccc9cd
|
Merge branch 'zentaopms_284'
|
2023-02-16 17:22:15 +08:00 |
|
|
Yagami
|
7616c02f17
|
* Redirect old project to new project.
|
2023-02-16 15:35:30 +08:00 |
|
|
chaideqing
|
b3eeb70b26
|
* Fix feedback feedback2204.
|
2023-02-16 11:59:17 +08:00 |
|
|
tianshujie
|
484f34396c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-16 08:59:00 +08:00 |
|
|
hufangzhou
|
f3cd2e7d4d
|
* Change the Easy Soft to ZenTao Software.
|
2023-02-15 17:01:22 +08:00 |
|
|
liumengyi
|
b9ae54ede7
|
* Fix bug of task #84592.
|
2023-02-15 08:58:18 +00:00 |
|
|
mayue
|
a681b0d23b
|
* Fix bug #32147.
|
2023-02-15 11:24:38 +08:00 |
|
|
liumengyi
|
7ea51e54b5
|
* Finish task #84584.
|
2023-02-14 13:13:46 +08:00 |
|
|
liumengyi
|
bc4c383fa5
|
* Finish task #84582.
|
2023-02-13 16:12:24 +08:00 |
|
|
liumengyi
|
2379ab313a
|
* Finish task #84582.
|
2023-02-13 15:36:41 +08:00 |
|
|
tianshujie
|
ec0078c708
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-13 14:03:58 +08:00 |
|
|
王怡栋
|
9331b9856a
|
Merge branch 'master' into 'zentaopms_wangyuting'
# Conflicts:
# module/programplan/view/gantt.html.php
|
2023-02-08 08:30:14 +00:00 |
|
|
wangyuting2
|
ab16894c06
|
* Optimize page css.
|
2023-02-08 16:17:16 +08:00 |
|