Commit Graph
5004 Commits
Author SHA1 Message Date
liumengyi b9ae54ede7 * Fix bug of task #84592. 2023-02-15 08:58:18 +00: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
王怡栋 dcc2392506 Merge branch 'master_bug_30389' into 'master'
* Fix bug #30389.

See merge request easycorp/zentaopms!6787
2023-01-29 05:08:18 +00:00
liuhong 14679274a3 * Fix bug #30389. 2023-01-29 03:08:37 +00:00
liuyongkai 3c02bddefd * Fix project's teamCount displayed incorrectly. 2023-01-29 10:33:41 +08:00
xieqiyu 1a12607799 * Fix bug#25663. 2023-01-19 11:47:54 +08:00
caoyanyi 5035c4a462 * Add test case and modify function name. 2023-01-13 14:11:01 +08:00
liuhong 7bbeded716 * Adjust code. 2023-01-09 05:22:53 +00:00
liuhong 3641ffc165 * Adjust position for required label. 2023-01-06 08:30:00 +00:00
liuhong 913a8d8470 * Fix bug #31537. 2023-01-06 06:04:38 +00:00
孙广明 c29776bbfe Merge branch 'sprint/tsj_fixbug' into 'master'
Sprint/tsj fixbug

See merge request easycorp/zentaopms!6667
2023-01-03 05:54:09 +00:00
tianshujie b2142bed14 * Fix bug #30169. 2023-01-03 09:45:11 +08:00
tianshujie c7aaedcd8b * Fix bug #30284. 2023-01-03 09:28:03 +08:00
tianshujie 12b925779c * Fix bug #30285. 2023-01-03 09:13:36 +08:00
wangyidong ccec9bcc16 Merge branch 'zentaopms279' 2023-01-03 08:39:33 +08:00
tanghucheng 62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
孙广明 137953e0ae Merge branch 'zentaopms_277' 2022-12-30 08:45:34 +08:00
tanghucheng ad83873794 * Fix issue for gantt icon. 2022-12-29 14:22:59 +08:00
xieqiyu 4f56a74c60 * Code for task#81190. 2022-12-28 15:07:40 +08:00
wangyidong 56c5cac759 * code for task #81410. 2022-12-28 14:32:22 +08:00
xieqiyu 2664a0c85e * Finish task#81190. 2022-12-27 13:49:08 +08:00
zenggang f58530fcd8 * Fix bug#26051 2022-12-23 02:56:21 +00:00
wangyidong a65844d582 * fix bug #30008. 2022-12-23 10:48:15 +08:00
wangyidong 0a3df6b5ec * fix bug #30254. 2022-12-23 10:21:12 +08:00
wangyidong 13e8ae5728 * adjust code. 2022-12-23 08:11:36 +08:00
wangyidong 0369dba360 * adjust for execution field width for project build page. 2022-12-22 19:24:49 +08:00
caoyanyi 71bc8ac80a Merge branch 'master' into zenops_46 2022-12-21 13:56:27 +08:00