Commit Graph
2211 Commits
Author SHA1 Message Date
孙广明 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
孙广明 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 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
liumengyi 6520a56bee * Fix bug of browse gantt. 2023-02-20 02:04:33 +00:00
hufangzhou 75b5b2562c * Finish task #84583. 2023-02-18 16:04:53 +00:00
wangyidong 7bc1b0da56 * fix bug #32203. 2023-02-17 09:25:07 +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 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
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
Yagami fd399560f9 * Code for task #83209. 2023-01-31 08:54:50 +08:00
liumengyi 5e179c8b05 * Finish task #83215, #83210. 2023-01-30 15:39:20 +08:00
liuyongkai 3c02bddefd * Fix project's teamCount displayed incorrectly. 2023-01-29 10:33:41 +08:00
liuhong 7bbeded716 * Adjust code. 2023-01-09 05:22:53 +00:00
liuhong 913a8d8470 * Fix bug #31537. 2023-01-06 06:04:38 +00: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
孙广明 137953e0ae Merge branch 'zentaopms_277' 2022-12-30 08:45:34 +08:00
xieqiyu 4f56a74c60 * Code for task#81190. 2022-12-28 15:07:40 +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 0369dba360 * adjust for execution field width for project build page. 2022-12-22 19:24:49 +08:00
wangyidong 164cca5ffe * code task #80451. 2022-12-21 10:31:46 +08:00
王怡栋 6fe7f03e7e Merge branch 'feedback_1576' into 'master'
* Resolve feedback#1576

See merge request easycorp/zentaopms!6530
2022-12-15 06:53:08 +00:00
wangyidong c7e2ac395d * fix bug #30769. 2022-12-14 11:04:44 +08:00
zenggang d926fe817d * Resolve feedback#1576 2022-12-13 03:07:29 +00:00
Yagami 27b73d7dcd * Code for function review. 2022-12-12 16:16:51 +08:00
Yagami b70f00842f * Finish task #79462. 2022-12-12 10:01:40 +08:00
wangyidong 81d3403a20 * code for task #79279. 2022-12-09 16:54:17 +08:00
孙广明 8981507e80 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30637#30662#78695#78688

See merge request easycorp/zentaopms!6515
2022-12-09 06:48:13 +00:00
wangyidong f1b27ca35a * fix bug #30745. 2022-12-09 12:23:09 +08:00
lanzongjun dd2160fde3 * Finish Bug #30662 2022-12-09 11:53:58 +08:00