Commit Graph
80084 Commits
Author SHA1 Message Date
tianshujie 5f0807e4f0 * Judge the copy project for the max version. 2024-05-06 16:32:21 +08:00
liumengyi 9a47111bb7 * Fix bug #48888, get checkedItems from cookie. 2024-05-06 16:12:31 +08:00
宋辰轩 809f34ded1 * Fix bug #48815. 2024-05-06 15:32:38 +08:00
dingguodong 43cbfccc8f + Add the property for quick reference. 2024-05-06 15:31:28 +08:00
dingguodong 7a166e7381 + Allow to edit MR by API. 2024-05-06 15:31:27 +08:00
dingguodong 1a4f6c6d17 * Fix the unmatched parameter type. 2024-05-06 15:31:27 +08:00
dingguodong 5e8187bb2f * Change the type hint for return. 2024-05-06 15:31:27 +08:00
陈建宇 198385303a Merge pull request '20.0-ai-chat' (#93) from 20.0-ai-chat into master
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/93
2024-05-06 15:21:46 +08:00
Chenjianyu cb998965aa * add ai assistant update sql. 2024-05-06 15:05:34 +08:00
Chenjianyu 16dff50550 Merge branch 'refs/heads/master' into 20.0-ai-chat
# Conflicts:
#	module/action/lang/de.php
#	module/action/lang/en.php
#	module/action/lang/fr.php
#	module/action/lang/vi.php
#	module/action/lang/zh-cn.php
2024-05-06 15:05:25 +08:00
liumengyi 24b684bd2b * Set private for todo::edit. 2024-05-06 14:36:39 +08:00
王怡栋 ac60db4c61 * Fix bug #48245. 2024-05-06 14:19:42 +08:00
caoyanyi b593afff62 * Adjust sql for trash get. 2024-05-06 14:17:07 +08:00
liumengyi c6f1eb0c82 + Fix bug #48826, check whether the file is uploaded. 2024-05-06 14:15:43 +08:00
hufangzhou c40f76c329 * Fix bug #48841. 2024-05-06 14:12:31 +08:00
liumengyi 604598af45 * Fix bug when the product id is zero. 2024-05-06 13:54:46 +08:00
liumengyi 1c3104e445 * Fix bug #48647, disable selected products. 2024-05-06 13:49:41 +08:00
caoyanyi 70900595e8 * Adjust code review page locate url. 2024-05-06 10:36:28 +08:00
wangyuting 982ce909f3 * Fix assigntome block menu css. 2024-05-06 09:42:59 +08:00
caoyanyi d5ba2472ef * Adjust code end script. 2024-05-06 09:27:27 +08:00
caoyanyi acc26ba24d Merge remote-tracking branch 'remotes/origin/release-20.0'
# Conflicts:
#	db/update20.0.beta2.sql
#	lib/zin/func.php
#	lib/zin/wg/fileselector/v1.php
#	lib/zin/wg/upload/v1.php
#	module/action/model.php
#	module/backup/js/index.ui.js
#	module/block/lang/vi.php
#	module/block/ui/recentprojectblock.html.php
#	module/block/zen.php
#	module/common/lang/vi.php
#	module/custom/lang/vi.php
#	module/execution/js/kanban.ui.js
#	module/execution/ui/story.html.php
#	module/kanban/js/view.ui.js
#	module/metric/test/calc/project/hour/ac_of_weekly_all_in_waterfall.php
#	module/metric/test/calc/project/rate/cv_in_waterfall.php
#	module/metric/test/calc/project/rate/cv_weekly_in_waterfall.php
#	module/mr/control.php
#	module/mr/ui/browsebyexecution.html.php
#	module/product/zen.php
#	module/programplan/zen.php
#	module/project/model.php
#	module/repo/lang/de.php
#	module/repo/lang/en.php
#	module/repo/lang/fr.php
#	module/repo/lang/zh-cn.php
#	module/space/ui/createapplication.html.php
#	module/testcase/ui/view.html.php
#	module/upgrade/model.php
#	www/js/zui3/zen-editor/p-0aaccc7e.js
#	www/js/zui3/zen-editor/p-276dd30f.js
#	www/js/zui3/zen-editor/p-2b13cc9a.js
#	www/js/zui3/zen-editor/p-38d18c5d.js
#	www/js/zui3/zen-editor/p-3f6cad83.js
#	www/js/zui3/zen-editor/p-51e3a048.js
#	www/js/zui3/zen-editor/p-617d463f.js
#	www/js/zui3/zen-editor/p-62c0132e.js
#	www/js/zui3/zen-editor/p-6d22490c.js
#	www/js/zui3/zen-editor/p-a563f50b.js
#	www/js/zui3/zen-editor/p-bf31230c.js
#	www/js/zui3/zen-editor/p-c6c95773.js
#	www/js/zui3/zen-editor/p-d83dd3f0.js
#	www/js/zui3/zen-editor/p-d8bedd14.js
#	www/js/zui3/zen-editor/p-eaaa4129.js
#	www/js/zui3/zen-editor/zen-editor.esm.js
#	www/js/zui3/zui.zentao.css
#	www/js/zui3/zui.zentao.js
2024-05-06 09:17:49 +08:00
wangyuting 990c4fc177 * Fix welcome block link. 2024-05-06 08:41:09 +08:00
sunhao b2fe3fb03e * zui: update zui3 lib. zentaopms_20.0.0_20240430 2024-04-30 17:42:57 +08:00
sunhao d4f4b39278 * block: optimize dashboard UI. 2024-04-30 17:42:57 +08:00
daitingting 6b90c998e5 * Fix bug #48681. 2024-04-30 09:32:14 +00:00
qixinzhi 9e246cecfa * Refactor. 2024-04-30 09:29:00 +00:00
宋辰轩 900a13dd51 * Fix bug for metric use dropmenu. 2024-04-30 16:54:46 +08:00
sunhao e2a6f549c0 * block: disable only load visible in dashboard. 2024-04-30 16:51:55 +08:00
sunhao 1fa44ef545 * zui: update zui3 lib. 2024-04-30 16:51:55 +08:00
zhouxin c3efc2fe44 * Fix error of zin\dropmenu::buildDropmenu. 2024-04-30 16:49:55 +08:00
sunhao 1dd65c2188 * index: set app background. 2024-04-30 16:37:39 +08:00
wangyuting 03b3099f28 * Adjust my task to toggle modal. 2024-04-30 16:24:32 +08:00
zhouxin 21be75ee4f * Fix unit test of metric. 2024-04-30 16:24:11 +08:00
sunhao de42e70a5a * block: fix cursor on picker in execution statistic block. 2024-04-30 16:23:08 +08:00
Zhangyu 93e60a17b1 * zin: modify thinknode params. 2024-04-30 08:09:46 +00:00
Zhangyu a7c1ffc057 * zin: format code of thinkStepDetail. 2024-04-30 08:08:51 +00:00
zhouxin 3b6937d032 * Fix unit test of metric calc. 2024-04-30 15:58:05 +08:00
sunhao 9c60246037 * zin: optimize UI of doc menu. 2024-04-30 15:52:14 +08:00
liumengyi d4f6c71d85 * Fix bug #48712. 2024-04-30 15:49:56 +08:00
sunhao 15428749d1 * zui: update zui3 lib. 2024-04-30 15:43:53 +08:00
sunhao 6bec564be2 * zin: add lines style to tree editor. 2024-04-30 15:43:53 +08:00
liumengyi 914c5be725 * Fix bug #48793, update products before updateProductStage. 2024-04-30 15:38:43 +08:00
sunhao 90eb9263a2 * zin: apply lines style to module menu tree. 2024-04-30 15:38:13 +08:00
sunhao 2b6bbd1031 * zin: refactor. 2024-04-30 15:38:13 +08:00
tianshujie 03039f37e2 * Fix bug #48784. 2024-04-30 15:37:44 +08:00
qixinzhi bb7fb61db6 * Refactor. 2024-04-30 07:35:29 +00:00
qixinzhi 6a058168ef * Add support single query to metric. 2024-04-30 07:35:29 +00:00
qixinzhi a5dd2cb795 * Add support single query. 2024-04-30 07:35:29 +00:00
qixinzhi 2c1de59802 * Remove query to use dao cache. 2024-04-30 07:35:29 +00:00
daitingting be96fbf975 * Fix bug #48792. 2024-04-30 07:25:15 +00:00