Commit Graph
3601 Commits
Author SHA1 Message Date
tanghucheng 517fd4b79e * Fix bug for gantt menu. 2022-08-15 15:44:47 +08:00
tanghucheng 2bc6e7a1e8 * Sort execution and project gantt menu . 2022-08-15 14:28:31 +08:00
wangyidong 9a3513a15c * change for change table engine. 2022-08-12 16:11:35 +08:00
leiyong 489fa70400 * Fix single sign-on. 2022-08-11 01:54:32 +00:00
tanghucheng 824b9219d9 * Code for gantt. 2022-08-10 13:34:57 +08:00
tianshujie 93d0a62707 * Finish task #63692. 2022-08-09 11:47:27 +08:00
孙广明 fe0f69fc77 Merge branch 'lyk_64217' into 'master'
* Finish task #64217

See merge request easycorp/zentaopms!4844
2022-08-08 08:59:22 +00:00
王怡栋 22bf2d8058 Merge branch 'sprint/hufangzhou_62965' into 'master'
* Finish task #62965. Fix bug #26130, #26129, #26120.

See merge request easycorp/zentaopms!4843
2022-08-08 08:47:08 +00:00
王怡栋 9e6111ad6c Merge branch 'master' into 'sprint/devplat_30'
# Conflicts:
#   db/update17.4.sql
2022-08-08 08:44:25 +00:00
liuyongkai da82407e9d * Finish task #64217 2022-08-08 08:37:53 +00:00
hufangzhou b44ed94231 * Finish task #62965. Fix bug #26130, #26129, #26120. 2022-08-08 16:31:20 +08:00
王怡栋 3cc4c75950 Merge branch 'sprint/221_tianshujie_issue' into 'master'
Sprint/221 tianshujie issue

See merge request easycorp/zentaopms!4810
2022-08-05 02:34:09 +00:00
王怡栋 7cbbcc9cad Merge branch 'lyk_25879' into 'master'
* Fix bug 25879.

See merge request easycorp/zentaopms!4792
2022-08-05 02:25:35 +00:00
tianshujie e6ddd61174 * Finish task #62948. 2022-08-05 09:36:56 +08:00
wangyuting2 9021138b70 * Adjust featurebar sort to config. 2022-08-05 09:01:31 +08:00
lanzongjun fa254f518e resolve conflict 2022-08-05 08:49:49 +08:00
lanzongjun f241846903 resolve conflict 2022-08-05 08:43:09 +08:00
wangyuting2 5bc8123a58 * Add note. 2022-08-03 17:06:56 +08:00
wangyuting2 afba28db68 * Add project execution approval menu. 2022-08-03 16:48:10 +08:00
wangyuting2 731e5a4161 * Fix warring. 2022-08-03 14:35:54 +08:00
wangyuting2 84c6278274 * Finish task #63288. 2022-08-03 13:32:41 +08:00
liuyongkai c45499b497 * Fix bug 25879. 2022-08-02 06:33:56 +00:00
liuyongkai d1c2928233 * Fix bug #25879. 2022-08-02 01:04:58 +00:00
lanzongjun 5f5d893546 add plugins 2022-08-02 08:33:50 +08:00
zenggang dfae2ec61f * Fix bug#23205 2022-07-28 06:55:51 +00:00
lanzongjun f866342fd2 * upgrade 2022-07-28 13:26:09 +08:00
tianshujie cac6216a09 * Finish task #61967. 2022-07-26 10:50:16 +08:00
tianshujie 0c9f532ee0 * Finish task #61970,61969,61968,61966. 2022-07-25 10:40:09 +08:00
tianshujie e0537276bd * Delete useless code. 2022-07-21 09:30:35 +08:00
wangyidong 2cf2c96ebd Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-20 17:25:00 +08:00
wangyidong ab6ee566e7 * code for task #61191. 2022-07-20 16:14:55 +08:00
王怡栋 d3c3973346 Merge branch 'sprint/hufangzhou_doc' into 'master'
* Finish task #59750.

See merge request easycorp/zentaopms!4608
2022-07-20 06:27:44 +00:00
hufangzhou fab8fedf10 * Adjust the judgment condition to a configuration item. 2022-07-20 14:15:43 +08:00
wangyidong bbb79d5f94 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-20 10:59:50 +08:00
wangyidong 7542c26998 * code for task #61483. 2022-07-20 10:58:57 +08:00
hufangzhou 1dcf2dcb2c * Code for task #59750. 2022-07-20 10:13:21 +08:00
王怡栋 1e14279144 Merge branch 'cyy_mr' into 'master'
Cyy mr

See merge request easycorp/zentaopms!4601
2022-07-20 01:16:22 +00:00
tianshujie e19b245d2a * Finish task #61177. 2022-07-20 08:56:53 +08:00
caoyanyi 07465a327d * Modify merge request view. 2022-07-19 17:04:12 +08:00
tianshujie 7791a30013 * Finish task #61177. 2022-07-19 13:32:03 +08:00
caoyanyi 8163199cf1 * Modify merge request for gitea. 2022-07-19 10:56:04 +08:00
孙广明 d5c7586a47 * Fix menu bug. 2022-07-15 10:33:58 +08:00
wangyidong 1fcfdf2972 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-15 10:06:00 +08:00
wangyidong c4af3c24b6 * fix bug #25346. 2022-07-15 10:05:43 +08:00
Wenrui LI bcaaf11dfc * fix double header covering main in zentaoclient. 2022-07-15 08:52:25 +08:00
王怡栋 c1a012bb91 Merge branch 'sprint/hufangzhou_25281' into 'master'
* Fix bug #25281.

See merge request easycorp/zentaopms!4551
2022-07-14 08:23:43 +00:00
王怡栋 d282c902de Merge branch 'liugang_fixbug' into 'master'
* Fix bug of print kanban.

See merge request easycorp/zentaopms!4549
2022-07-14 08:22:53 +00:00
tianshujie dee593663b * Fix bug #25309. 2022-07-14 16:19:14 +08:00
hufangzhou 8c62376d05 * Fix bug #25281. 2022-07-14 15:49:55 +08:00
liugang a53697f342 * Fix bug of print kanban. 2022-07-14 15:36:10 +08:00