Commit Graph
5029 Commits
Author SHA1 Message Date
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
wangyuting2 afaa89f8fd * Fix bug #27242. 2023-02-08 16:03:35 +08:00
Yagami c2724b9f57 Merge branch 'zentaopms_281' 2023-02-08 15:31:13 +08:00
liumengyi 6c775d69ba * Finish task #83957. 2023-02-08 15:09:34 +08:00
xieqiyu e260ad29a0 * Code for bug#31948. 2023-02-07 14:43:20 +08:00
Yagami 3e1b5be66e * Code for execution list table style. 2023-02-07 08:50:47 +08:00
孙广明 57dbacf882 * Code for task #83937. 2023-02-06 19:03:55 +08:00
Yagami cf5c7a2fbc * Code for project required field. 2023-02-03 13:17:12 +08:00
wangyidong 1f1e8b0836 * fix bug #31519. 2023-02-03 08:48:18 +08:00
Yagami 7f6892bf38 * Fix edit waterfall project bug. 2023-02-02 16:39:57 +08:00
liumengyi 4b8bc1add9 * Fix bug #31873, #31875. 2023-02-02 13:37:10 +08:00
liumengyi ce32033cb7 * Fix bug #31861. 2023-02-02 09:52:28 +08:00
tianshujie 43978561eb * Fix bug #30004. 2023-02-01 13:15:24 +08:00
liumengyi fc1f049f23 * Fix bug for create agileplus project. 2023-01-31 16:22:15 +08:00
Yagami 6c97562b57 * Code for agile plus project. 2023-01-31 09:49:58 +08:00
liuhong 40ca0b3f77 * Adjust code logic for 30389. 2023-01-31 01:38:33 +00:00
Yagami fd399560f9 * Code for task #83209. 2023-01-31 08:54:50 +08:00
liumengyi 55a2a8b9a9 * Modify css of task #83210. 2023-01-30 16:00:43 +08:00
liumengyi 5e179c8b05 * Finish task #83215, #83210. 2023-01-30 15:39:20 +08:00