Commit Graph
54720 Commits
Author SHA1 Message Date
liumengyi dc82cdf5e0 * Fix bug of undefined module privs. 2023-04-20 14:10:07 +08:00
liumengyi 52f7f86e80 * Fix bug #34459. 2023-04-20 13:38:42 +08:00
liumengyi bd1a462e6a * Remove debugger. 2023-04-20 13:25:35 +08:00
liumengyi ecc9176aff * Fix bug #34468. 2023-04-20 13:24:44 +08:00
hufangzhou 29df999796 * Hide the priv package privs. 2023-04-20 13:14:15 +08:00
hufangzhou e18b37128f Merge branch 'master' into zentaopms_304 2023-04-20 13:03:30 +08:00
刘刚 f4c9bc22b3 Merge branch 'cyy_api' into 'master'
* Modify locate.

See merge request easycorp/zentaopms!7494
2023-04-20 04:41:49 +00:00
朱金勇 4b4da1021f * Fix bug#34453. 2023-04-20 04:30:44 +00:00
hufangzhou 434ef6ef89 * Set traincourse's parent to traincourse view. 2023-04-20 12:22:15 +08:00
朱金勇 d125177bcf * Fix bug#34425. 2023-04-20 04:14:08 +00:00
朱金勇 7de8f305c0 * Fix bug#34389. 2023-04-20 04:10:07 +00:00
hufangzhou 6eba099d6a * Hide the manage privpackage entry. 2023-04-20 12:04:58 +08:00
朱金勇 366699d74d * Fix bug#34424. 2023-04-20 03:59:12 +00:00
朱金勇 bd3e9172c2 * Fix bug#34427. 2023-04-20 03:56:25 +00:00
朱金勇 532ff84269 * Fix bug#34446. 2023-04-20 03:50:25 +00:00
朱金勇 f91b05b309 * Fix bug#34444. 2023-04-20 03:44:43 +00:00
tianshujie 2059a74de0 * Fix bug #34461. 2023-04-20 11:32:34 +08:00
朱金勇 119e6fe3f1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-20 03:26:46 +00:00
朱金勇 a475e8575c * Fix bug#34396. 2023-04-20 03:26:36 +00:00
tianshujie 1a90f75ffe Merge branch 'cyy_api' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_api 2023-04-20 11:26:08 +08:00
tianshujie 9cfaf694ec * Replace favorites button. 2023-04-20 11:25:46 +08:00
wangyidong 107265a099 * fix bug for init js var. 2023-04-20 11:25:23 +08:00
朱金勇 f3989ee08c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-20 03:18:20 +00:00
朱金勇 d2f7cdbad8 * Fix bug#34411. 2023-04-20 03:18:11 +00:00
liumengyi 3b1cb2158c * Fix bug #34468. 2023-04-20 11:18:08 +08:00
刘刚 72671bbd67 Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Add bi builtin config.

See merge request easycorp/zentaopms!7498
2023-04-20 03:18:00 +00:00
liugang 8a17f4d65f * Enclose MySQL keywords in backticks 2023-04-20 03:15:13 +00:00
wangyuting2 9e88925e14 * Add bi builtin config. 2023-04-20 11:14:54 +08:00
刘刚 668d9689b1 Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Fix chart browse bug.

See merge request easycorp/zentaopms!7497
2023-04-20 03:14:39 +00:00
刘刚 7fcfc0a769 Merge branch 'fix_bug_qxz' into 'master'
* Fix bug#33355.

See merge request easycorp/zentaopms!7496
2023-04-20 03:14:32 +00:00
刘刚 75b14759b2 Merge branch 'sprint/scx_updategroup' into 'master'
* Add finish_project_effort_deviation to group.

See merge request easycorp/zentaopms!7495
2023-04-20 03:14:25 +00:00
wangyuting2 e3818f2999 * Fix chart browse bug. 2023-04-20 11:13:04 +08:00
宋辰轩 7d3c84fb73 * Add finish_project_effort_deviation to group. 2023-04-20 11:08:50 +08:00
朱金勇 cb2c15ac07 * Fix bug#34447. 2023-04-20 03:05:35 +00:00
qixinzhi 2dad2fab89 * Fix bug#33355. 2023-04-20 03:04:29 +00:00
caoyanyi 2f5b21ed76 * Modify page style. 2023-04-20 11:02:05 +08:00
liumengyi 155a692359 * Fix bug of show related privs. 2023-04-20 10:56:53 +08:00
tianshujie 557061330d * Change the color of the document name in the document list. 2023-04-20 10:41:26 +08:00
朱金勇 ba630dcbff * Fix typo. 2023-04-20 02:35:33 +00:00
caoyanyi 89fa7d85de * Modify link style. 2023-04-20 10:30:49 +08:00
hufangzhou 3af9d0d631 * Put the priv sql to zentao.sql. 2023-04-20 10:27:49 +08:00
caoyanyi f276767617 Merge branch 'cyy_api' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_api 2023-04-20 10:27:04 +08:00
caoyanyi 0a277e85e5 * Modify doc index style. 2023-04-20 10:26:45 +08:00
liumengyi bb05cdfa70 * Fix bug of get related privs. 2023-04-20 10:24:47 +08:00
朱金勇 ca30397678 * Reset commit. 2023-04-20 02:18:40 +00:00
朱金勇 93aa3e307b * Format zentao.sql. 2023-04-20 02:17:53 +00:00
tianshujie 3b777c1517 * Modify the document statistics block style. 2023-04-20 10:13:22 +08:00
hufangzhou 9e8c4e657b * Fix bug #34457. 2023-04-20 10:12:55 +08:00
tianshujie 397a50c798 * Fixed search button language item issue. 2023-04-20 09:45:48 +08:00
caoyanyi 17d96b9e54 * Modify locate. 2023-04-20 09:43:30 +08:00