Commit Graph
1767 Commits
Author SHA1 Message Date
hufangzhou 025aa5dc4b * Add the new version. 2023-02-08 02:44:44 +00:00
王怡栋 fd92f0e6ae Merge branch 'zenops_61' into 'master'
Zenops 61

See merge request easycorp/zentaopms!6876
2023-02-08 01:55:38 +00:00
wangyuting2 3915c2c1d1 * Fix bug #24665. 2023-02-08 09:39:28 +08:00
zhaoke a31485ec89 Merge branch 'master' into zenops_61 2023-02-07 02:04:56 +00:00
zhaoke ffcc487808 * Finish task #83362. 2023-02-02 09:16:09 +00:00
王怡栋 3f9c3e40e1 Merge branch 'zentaopms284_bug#31889' into 'master'
* Fix bug #31889.

See merge request easycorp/zentaopms!6846
2023-02-02 08:57:17 +00:00
hufangzhou c27e0ae9a6 * Add the mark for auto pack, and integrate the table creation statement. 2023-02-02 08:48:58 +00:00
wangyuting2 40e5f5bdde * Fix bug #31889. 2023-02-02 16:37:46 +08:00
zenggang 597b77af82 * Edit snapshot 2023-02-02 08:31:06 +00:00
zhaoke 2e21fef01e * Add lost sql. 2023-01-31 02:29:51 +00:00
孙广明 7c7a95ccaa * Code for api db. 2023-01-05 10:43:28 +08:00
Yagami ed3e779cd8 * Rewrite api. 2023-01-04 16:16:50 +08:00
Yagami 94e5990cbb * Fix api module file. 2023-01-04 16:07:14 +08:00
Yagami d9da8b3f91 * Rewrite module file. 2023-01-03 16:52:28 +08:00
liugang 68dc8d2fc7 * Replace the english semicolon with chinese one. 2023-01-03 15:04:04 +08:00
hufangzhou b5859c7dc3 * Add the new version. 2023-01-03 13:56:27 +08:00
tanghucheng 584754a7f8 Merge branch 'master' into zenops_46 2023-01-03 11:04:33 +08:00
tanghucheng 6374437b91 * Fix bug #31360. 2023-01-03 11:02:00 +08:00
liugang 6c16d840d5 * Optimize the display label of story of the program statistic. 2022-12-30 15:41:10 +08:00
liugang de8f9e6372 * Update the count of closed projects of each year. 2022-12-30 14:08:25 +08:00
liugang e172271882 * Display chinese month label on x-axis. 2022-12-30 11:26:14 +08:00
tanghucheng 7ca5883d60 * Fix merge issue. 2022-12-30 10:18:13 +08:00
tanghucheng 1e6e94753b * Fix bug. 2022-12-30 09:57:03 +08:00
tanghucheng 4ce729067c Merge branch 'master' into zenops_46 2022-12-30 09:49:34 +08:00
tanghucheng 62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
liugang 7ebad95bcd * Remove the tooltip of pie circle chart. 2022-12-30 09:31:27 +08:00
孙广明 137953e0ae Merge branch 'zentaopms_277' 2022-12-30 08:45:34 +08:00
liugang 3c157f01c4 * Update the builtin screens. 2022-12-28 17:48:55 +08:00
liugang 9c46441f98 * Update the builtin charts and screens. 2022-12-28 16:03:30 +08:00
liuhong 36d1fdef10 * Fix bug. 2022-12-27 08:01:51 +00:00
liugang 115877723a * Update the builtin charts and screens. 2022-12-27 15:39:35 +08:00
liugang e13de50d7b * Fix bug of the company-dynamic report. 2022-12-27 14:35:44 +08:00
孙广明 bfc802bc42 * Code for task #81185. 2022-12-27 13:31:54 +08:00
孙广明 7af9dc0d83 * Merge code. 2022-12-27 13:22:35 +08:00
liuhong c018475249 * Fix bug for sql. 2022-12-27 02:24:17 +00:00
hufangzhou 3a51b751ef * Add the new Version. 2022-12-27 00:54:30 +00:00
liugang 1401333297 * Update the builtin charts and screens. 2022-12-27 08:37:59 +08:00
liugang d66a961b00 * Update sql. 2022-12-26 16:38:51 +08:00
liugang 5c2da929f6 * Add the builtin field. 2022-12-26 15:53:39 +08:00
liugang 0d4f0f34ab * Rename update sql. 2022-12-26 08:54:02 +08:00
liugang 8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
liugang dbc8fd2c7c * Add zt_dataview when install. 2022-12-23 14:41:23 +08:00
liugang d04fc1fe4a * Move the screen module to open source. 2022-12-23 14:39:01 +08:00
孙广明 3e9aee30f5 Merge branch 'sprint_bug' into 'zentaopms_277'
* Fix bug #31141 #31140.

See merge request easycorp/zentaopms!6620
2022-12-23 02:24:19 +00:00
liuhong 469bd86d34 * Fix bug #31141 #31140. 2022-12-22 07:58:47 +00:00
孙广明 32fbcfaabf * Fix bug #31129. 2022-12-22 15:22:11 +08:00
孙广明 19d93a07d6 * Add ticket api. 2022-12-22 14:30:12 +08:00
liuhong fca70f5855 * Code for task #80849. 2022-12-22 01:33:04 +00:00
liuhong f1baa412b1 * Finish task #80489. 2022-12-22 00:51:38 +00:00
caoyanyi 4e8d0c1515 * Modify sql. 2022-12-21 14:15:42 +08:00