Commit Graph
44448 Commits
Author SHA1 Message Date
tianshujie cf7cf423a3 * Limit header length. 2023-04-20 13:19:54 +08:00
朱金勇 b239aba280 * Fix bug#34420. 2023-04-20 05:11:26 +00:00
刘刚 f4c9bc22b3 Merge branch 'cyy_api' into 'master'
* Modify locate.

See merge request easycorp/zentaopms!7494
2023-04-20 04:41:49 +00:00
朱金勇 7de8f305c0 * Fix bug#34389. 2023-04-20 04:10:07 +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
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
刘刚 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
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
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
tianshujie 557061330d * Change the color of the document name in the document list. 2023-04-20 10:41:26 +08:00
caoyanyi 89fa7d85de * Modify link style. 2023-04-20 10:30: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
朱金勇 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
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
朱金勇 f10b648f46 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-20 01:32:36 +00:00
朱金勇 5f1709a8b4 * Fix bug#34399. 2023-04-20 01:30:08 +00:00
刘刚 379bddf08c Merge branch 'daitingting_upgrade' into 'master'
* Fix bug for upgrading.

See merge request easycorp/zentaopms!7492
2023-04-20 01:24:46 +00:00
wangyidong 7904c894f4 * remove export btn in api view page. 2023-04-20 09:21:54 +08:00
王怡栋 27bcdacb34 Merge branch 'master' into 'dev/gfl_fixbug'
# Conflicts:
#   module/doc/css/view.css
2023-04-20 01:16:43 +00:00
caoyanyi ffac4c9567 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-20 09:12:48 +08:00
caoyanyi 3f64a5d2dd * Modify api view page icon. 2023-04-20 09:11:24 +08:00
caoyanyi e569f98b48 * Modify tree set style. 2023-04-20 09:03:23 +08:00
guofeilong fa65768e1c * Code for bug #34267 . 2023-04-20 08:58:30 +08:00
daitingting d4ae238ed9 * Remove note. 2023-04-19 17:49:23 +08:00
daitingting 5c746f6757 * Fix bug for upgrading. 2023-04-19 17:46:43 +08:00
tianshujie 0f2a2b7bc3 * Fixed the interface details style problem. 2023-04-19 17:14:32 +08:00
caoyanyi 0409894d62 * Modify cookie set. 2023-04-19 17:04:23 +08:00
wangyidong df01ad51ec * fix bug. 2023-04-19 17:03:49 +08:00
caoyanyi ae153705d2 * Modify view style. 2023-04-19 16:57:07 +08:00
tianshujie 44794fcd43 * Change button color. 2023-04-19 16:49:29 +08:00
guofeilong 938821853c * Adjust code for task#91379 . 2023-04-19 16:47:13 +08:00
宋辰轩 53597c136a * Add en lang. 2023-04-19 16:43:00 +08:00
宋辰轩 4a17fc7e7a *Modify chart group. 2023-04-19 16:41:28 +08:00
guofeilong 418a6a5ff9 * Code for task #91379 . 2023-04-19 16:29:06 +08:00
guofeilong a9db84f2c6 * Code for adjust padding-x in drop . 2023-04-19 16:28:29 +08:00
wangyuting2 0261dbccee * Show builtin chart. 2023-04-19 16:26:06 +08:00
caoyanyi 7d0207ac87 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-19 16:21:15 +08:00