Commit Graph
44495 Commits
Author SHA1 Message Date
tanghucheng cfbd772ccf * Fix bug for group. 2023-04-20 11:07:37 +08:00
tanghucheng f83301bb91 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-20 11:05:43 +08:00
朱金勇 93aa3e307b * Format zentao.sql. 2023-04-20 02:17:53 +00:00
tanghucheng 8bf4bbccf0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-20 09:50:22 +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
朱金勇 027c3260c4 * Fix bug#34386. 2023-04-19 08:18:26 +00:00
caoyanyi 658b918897 * Modify api view page style. 2023-04-19 16:16:30 +08:00
朱金勇 0e619ba796 * Fix bug#34401. 2023-04-19 08:08:11 +00:00
朱金勇 97d9e06807 * Fix bug#34391. 2023-04-19 08:05:12 +00:00
王怡栋 86c1dc4280 Merge branch 'fix_bug_qxz' into 'master'
* Fix bug#33386.

See merge request easycorp/zentaopms!7480
2023-04-19 07:51:27 +00:00
兰宗俊 0eb07c822f Merge branch 'zentaoipd_lanzongjun' into 'zentaoipd'
Zentaoipd lanzongjun

See merge request easycorp/zentaopms!7481
2023-04-19 07:50:40 +00:00
Zongjun Lan 9f120d2823 + Add story action. 2023-04-19 15:50:12 +08:00
王怡栋 01c8d5d893 Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7474
2023-04-19 07:49:35 +00:00
qixinzhi e90cf399c7 * Fix bug#33386. 2023-04-19 07:42:36 +00:00
tianshujie 18cba3006d * Modified create Project library page style. 2023-04-19 15:34:59 +08:00
Yagami e9c6b5b9ed Merge branch 'zentaoipd' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-19 15:30:12 +08:00
Yagami 62a2b9bebd * Fix bug #33791. 2023-04-19 15:29:54 +08:00
guofeilong 4bd8a0b917 * Code for adjust style in drop. 2023-04-19 15:27:30 +08:00
guofeilong 70fd734b93 * Adjust code for add active to dropdown . 2023-04-19 15:27:07 +08:00
朱金勇 71b74c0a60 * Refactor insert privs. 2023-04-19 07:24:01 +00:00
wangyidong 4e05f5d566 * fix bug. 2023-04-19 15:15:25 +08:00
wangyidong d9e21d706a * fix bug #34362,34365,34361. 2023-04-19 14:50:43 +08:00
Zongjun Lan 88fbd70b9f * Modify roadmap view drop list. 2023-04-19 14:49:37 +08:00
tianshujie eb31e77d09 * Change the width of the create page control. 2023-04-19 14:32:44 +08:00
tianshujie 08b771ac3a * Fixed my spatial directory tree highlighting problem. 2023-04-19 14:18:27 +08:00
caoyanyi ce12f91dfa * Modify icon size. 2023-04-19 14:18:13 +08:00
tianshujie 07ed9034a8 * Fixed a problem with the left module tree style. 2023-04-19 14:18:08 +08:00
王怡栋 200a0c6635 Merge branch 'fixbug/liumengyi_20185' into 'master'
* Fix bug #20185.

See merge request easycorp/zentaopms!7473
2023-04-19 05:59:52 +00:00