Commit Graph
49221 Commits
Author SHA1 Message Date
王怡栋 0a551cdc98 Merge branch 'bug_26051' into 'master'
* Fix bug#26051

See merge request easycorp/zentaopms!6622
2022-12-26 03:02:10 +00:00
王怡栋 c7396478aa Merge branch 'sprint/scx_screen' into 'master'
* Filter execution status.

See merge request easycorp/zentaopms!6628
2022-12-26 03:01:03 +00:00
宋辰轩 03591f4e00 * Filter execution status. 2022-12-26 10:57:06 +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
zhujinyong f6c4838800 + Add cover for screen. 2022-12-26 08:40:47 +08:00
liugang 469702357b * Remove useless codes. 2022-12-23 15:02:58 +08:00
liugang 9f5d1c3b32 * Update the screen module from zentaobiz. 2022-12-23 14:59:47 +08:00
liugang 0257517d94 * Add privilege control of screen. 2022-12-23 14:53:28 +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
wangyidong f0b1d7fbd2 * fix bug #29812. 2022-12-23 13:58:08 +08:00
wangyidong f40926eed2 * fix bug #29852. 2022-12-23 12:04:57 +08:00
wangyidong 177dcb534f * fix bug #29951. 2022-12-23 11:53:02 +08:00
zhujinyong c6630243cb + Add static files. 2022-12-23 11:09:27 +08:00
宋辰轩 c0933cea53 * Fix execution view burn. 2022-12-23 10:57:52 +08:00
zenggang f58530fcd8 * Fix bug#26051 2022-12-23 02:56:21 +00:00
宋辰轩 c0f84b7f29 * Modify burn chart . 2022-12-23 10:49:21 +08: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
朱金勇 92d3c36a9a Merge branch 'fix_user_doccomment' into 'master'
* Fix doc comment for user module.

See merge request easycorp/zentaopms!6621
2022-12-22 09:05:20 +00:00
Lufei b19ce38241 * Fix doc comment for user module. 2022-12-22 16:27:40 +08:00
王怡栋 747579cb2b Merge branch 'sprint/feedback1799' into 'master'
Sprint/feedback1799

See merge request easycorp/zentaopms!6616
2022-12-22 07:17:39 +00:00
孙广明 d93c194410 Merge branch 'zhouxin_feedback_1807' into 'master'
* Fix bug for feedback 1807.

See merge request easycorp/zentaopms!6618
2022-12-22 06:41:56 +00:00
zhouxin 14f967733f * Fix bug for feedback 1807. 2022-12-22 06:31:58 +00:00
chaideqing b72e6e2d0c * Fix feedback 1799. 2022-12-22 12:13:52 +08:00
chaideqing 435852fd14 * Fix feedback 1799 . 2022-12-22 11:53:20 +08:00
wangyidong e6eddbb075 * fix bug #30242. 2022-12-21 17:31:08 +08:00
wangyidong d24441491c * fix bug #30591. 2022-12-21 16:48:09 +08:00
孙广明 a712a8df5a Merge branch 'zhouxin_feedback_1807' into 'master'
* Resolve feedback #1807.

See merge request easycorp/zentaopms!6612
2022-12-21 08:26:12 +00:00
wangyidong b8b0affbee * fix bug #30994. 2022-12-21 16:19:29 +08:00
zhouxin e56ac56ca3 * Resolve feedback #1807. 2022-12-21 07:58:28 +00:00
wangyidong bc02660990 * code for task #80451. 2022-12-21 15:50:17 +08:00
wangyidong 034c750da5 * code for task #80457. 2022-12-21 15:15:28 +08:00
wangyidong 164cca5ffe * code task #80451. 2022-12-21 10:31:46 +08:00
孙广明 dd6992d4bc Merge branch 'zhouxin_feedback_172' into 'master'
* Resolve feedback #172.

See merge request easycorp/zentaopms!6604
2022-12-20 07:43:46 +00:00
zhouxin d741dfd154 * Resolve feedback #172. 2022-12-20 07:29:13 +00:00
wangyidong ac9e876101 * code task #80452. 2022-12-20 13:53:37 +08:00
wangyidong 58efe7b011 * code task #80458,80463. 2022-12-20 11:31:15 +08:00
王怡栋 ffe0b359e9 Merge branch 'sprint/feedback1752' into 'master'
Sprint/feedback1752

See merge request easycorp/zentaopms!6599
2022-12-20 02:43:23 +00:00
chaideqing b670a052de * Fix feedback1752. 2022-12-20 10:10:33 +08:00
wangyidong d28ea77f0d * code for task #80461. 2022-12-20 09:24:07 +08:00
wangyidong c093724f9d * fix bug #80463. 2022-12-20 09:24:06 +08:00
王怡栋 6b4135e66f Merge branch 'bug_30798' into 'master'
* Fix bug#30798

See merge request easycorp/zentaopms!6595
2022-12-20 00:15:29 +00:00
朱金勇 4fc76fe596 Merge branch 'fix_execution_view' into 'master'
* Fix search style error in execution view page.

See merge request easycorp/zentaopms!6596
2022-12-19 08:39:18 +00:00
Lufei c3244b958f * Fix search style error in execution view page. 2022-12-19 16:36:14 +08:00
zenggang 14dc7079d1 * Fix bug#30798 2022-12-19 08:17:56 +00:00
孙广明 137ba608bd Merge branch 'sprint/hufangzhou_xuantag' into 'master'
* Adjust the xuan tag.

See merge request easycorp/zentaopms!6592
zentaopms_18.0.beta2
2022-12-19 03:22:34 +00:00