Commit Graph

1238 Commits

Author SHA1 Message Date
liumengyi
bcae665178 * Fix bug #32337. 2023-02-22 08:56:31 +00:00
孔令茂
3e7b0daf91 * Resove feedback f2188, change privilege by modulue error. 2023-02-22 10:08:22 +08:00
孙广明
6c1ed365ab Merge branch 'sprint/292_liumengyi_85038' into 'master'
* Finish task #85038, #85039, #85040.

See merge request easycorp/zentaopms!7010
2023-02-21 05:50:04 +00:00
liumengyi
95e3978fb0 * Finish task #85038, #85039. 2023-02-21 01:05:24 +00:00
tianshujie
d6266bc607 * Code for finish task #85047. 2023-02-20 14:47:10 +08:00
hufangzhou
75b5b2562c * Finish task #84583. 2023-02-18 16:04:53 +00:00
tianshujie
13be8ec1a7 * Modify the language entry of the execution permission. 2023-02-17 14:04:54 +08:00
tianshujie
e6fa9625d5 * Fix bug #32224. 2023-02-16 15:59:03 +08:00
tianshujie
2a388d06a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-16 09:00:16 +08:00
hufangzhou
f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
tianshujie
bd95b1eb84 * Code for finish task #83733. 2023-02-09 11:54:01 +08:00
caoyanyi
03ed75a2d3 * Code for task #83742. 2023-02-08 12:44:50 +08:00
tianshujie
c29df55df8 * Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-08 10:39:45 +08:00
tianshujie
52568a67be * Code for finish task #83722. 2023-02-07 16:29:02 +08:00
zhaoke
a31485ec89 Merge branch 'master' into zenops_61 2023-02-07 02:04:56 +00:00
tianshujie
1a1f8d3a07 * Put holiday permissions in the open source edition. 2023-02-06 17:05:37 +08:00
tianshujie
5b6978ed8b * Finish task #83744. 2023-02-06 12:02:31 +08:00
tianshujie
a1aa671bb2 * Finish task #83745. 2023-02-06 10:35:12 +08:00
zenggang
97fcb6263e * Delete snapshot 2023-02-03 05:19:53 +00:00
zenggang
597b77af82 * Edit snapshot 2023-02-02 08:31:06 +00:00
songpeiyan
bdd962fe94 * Fix bug #30856 2023-02-02 08:43:27 +08:00
songpeiyan
b1927d4cd2 *Fix bug #30856 2023-02-01 16:46:42 +08:00
tanghucheng
0d4ae4ba95 * Fix language. 2023-01-03 13:42:04 +08:00
tanghucheng
d837ce9ac4 * Fix code style. 2022-12-30 14:09:00 +08:00
tanghucheng
720365e1e2 Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46 2022-12-30 14:03:21 +08:00
zhaoke
e095b605f5 * Fix bug. 2022-12-30 05:54:20 +00:00
tanghucheng
62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
tanghucheng
e1162e3582 * Fix bug . 2022-12-29 15:37:36 +08:00
田淑杰
866b4086e8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272 2022-12-29 15:22:13 +08:00
tanghucheng
fa37b1a503 * Add start and close pri. 2022-12-29 13:59:02 +08:00
田淑杰
f18c9b655e * Fix bug #29041. 2022-12-26 10:27:25 +08:00
liugang
8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
liugang
0257517d94 * Add privilege control of screen. 2022-12-23 14:53:28 +08:00
tanghucheng
85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
tanghucheng
a454682370 * Finish task #78643. 2022-12-14 14:16:49 +08:00
孙广明
81d54c790e * Finish task #79664. 2022-12-13 13:43:24 +08:00
tanghucheng
e11ec7993c Merge branch 'zenops_46' into sprint/220 2022-12-09 13:49:30 +08:00
tanghucheng
185d280025 * Code for task #78645. 2022-12-06 17:25:03 +08:00
孙广明
d4f5170391 Merge branch 'zenops_46_zhaoke_74993' into 'zenops_46'
Zenops 46 zhaoke 74993

See merge request easycorp/zentaopms!6395
2022-11-28 06:58:42 +00:00
孙广明
6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
caoyanyi
7272593f0b Merge branch 'master' into sprint/220 2022-11-25 13:52:26 +08:00
liugang
da3e57db0f * Display all reports by report-preview function. 2022-11-24 13:23:37 +08:00
caoyanyi
4361cb4182 Merge branch 'master' into zenops_46 2022-11-24 13:01:30 +08:00
zenggang
a0bda0eaa0 * Adjust code 2022-11-23 02:56:57 +00:00
zenggang
748323efe0 * Fix bug#27991 and adjust code 2022-11-23 02:55:03 +00:00
zhaoke
c2b0f0a656 * Update zanode name 2022-11-23 02:44:27 +00:00
caoyanyi
0d81c7f4fe Merge branch 'master' into zenops_46 2022-11-22 15:39:59 +08:00
wangyuting
532bef39f3 * Finish task #76434. 2022-11-17 08:03:03 +00:00
caoyanyi
e60b21e1b6 Merge branch 'master' into zenops_46 2022-11-16 13:00:45 +08:00
zenggang
1c69f30793 * Adjust code 2022-11-16 02:08:00 +00:00