Commit Graph
867 Commits
Author SHA1 Message Date
tanghucheng 29dd5a9e97 Merge branch 'main' into feature/demand 2024-07-16 10:24:42 +08:00
zhaixiaojian c4f5cd1355 * [story#60132,done,4h,0h] historical records display values before and after changes. 2024-07-16 09:08:48 +08:00
tanghucheng bcf489fee6 * [task#122676,done,1h,0h] The stage of recalculating OR requirements and business research requirements when restoring deleted requirements. 2024-07-15 15:01:36 +08:00
sunguangming e4b1adfaf7 * [unittest] fix unittest. 2024-07-08 10:27:21 +08:00
dingguodong 4bd9a60b69 * [task#121513] Hide the comment for adjustvol. 2024-07-03 14:27:20 +08:00
dingguodong 896819c2d2 * [task#121513] Add the action type for instance. 2024-07-03 12:12:09 +08:00
sunguangming a068f48237 * [bug#51736,done,0.5h] fix bug. 2024-07-01 08:51:14 +08:00
liugang a4d2de38f0 * [misc] replace COUNT(*) with COUNT(1) in sql. 2024-06-27 14:07:27 +08:00
dingguodong 4e5ef6395b + [task#121512] Remove the comments of some action for the instance. 2024-06-26 16:25:51 +08:00
dingguodong 31cce64e13 * [misc] Remove the named parameters. 2024-06-26 09:24:39 +08:00
dingguodong bce2d75347 * [task#121512] Show the action for adjusting cpu and mem. 2024-06-26 09:24:39 +08:00
sunguangming f83f00f61f Merge branch 'main' into feature/epic 2024-06-20 07:04:51 +00:00
liumengyi dcb4a5737f * [bug#51409,done,0.3h] get action's key. 2024-06-19 16:13:18 +08:00
daitingting 6e56219971 * [bug#45824,done,1h] Get actions include noMultiple execution. 2024-06-18 10:47:10 +08:00
caoyanyi cb616fa91f * [refac,0.1h] Merge this if statement with the enclosing one. 2024-06-12 10:31:25 +08:00
dingguodong 5fa678969b * [task#116512] Load the lang of this model(use cached model). 2024-06-12 10:17:02 +08:00
sunguangming a15d296336 Merge branch 'release20.1' into epic 2024-05-30 17:15:26 +08:00
Lufei 9180896b31 * Ignore boardlayer table cache. 2024-05-30 16:54:08 +08:00
Lufei e64af618ab * Ignore boardlayer table cache. 2024-05-30 10:49:32 +08:00
sunguangming c459e08f1f Merge branch 'master' into story 2024-05-29 15:44:14 +08:00
tianshujie 6b504460fe * Fix bug #50291. 2024-05-29 10:46:46 +08:00
tianshujie 4abfdc3ab8 * Fix bug #50291. 2024-05-29 10:39:19 +08:00
sunguangming 4782853a88 * Fix bug #49663. 2024-05-22 13:32:50 +08:00
sunguangming 24d3d7fb0a Merge branch 'master' into story 2024-05-22 11:27:49 +08:00
sunguangming 8a8c6e0cea * Fix bug #49647. 2024-05-20 16:48:00 +08:00
Lufei 688b29c893 * Fix bug #49856. 2024-05-20 13:53:10 +08:00
Lufei a2a54a47ac * Fix demand action log for board. 2024-05-17 09:44:50 +08:00
sunguangming 1cfbf7d74b Merge branch 'master' into story 2024-05-15 15:04:13 +08:00
Lufei 7801f279ea + Add board files.
Co-authored-by: Lufei <lufei@easycorp.ltd>
Co-committed-by: Lufei <lufei@easycorp.ltd>
2024-05-15 09:40:47 +08:00
liumengyi 2d4ab3b9dc * Optimize code for bug#49078. 2024-05-11 16:51:20 +08:00
liumengyi 2266a87a3c * Fix bug #49078. 2024-05-11 16:49:22 +08:00
liumengyi 87bae25430 * Rename isLibDoc to isLibObject. 2024-05-11 16:46:44 +08:00
liumengyi 0c8ded5e10 * Fix bug #49078, set object link for the max doc. 2024-05-11 16:44:22 +08:00
wangyuting 1b5dd94f89 * Adjust printAction params. 2024-05-10 10:42:46 +08:00
sunguangming 28b2b78698 Merge branch 'master' into story 2024-05-09 15:04:07 +08:00
caoyanyi b593afff62 * Adjust sql for trash get. 2024-05-06 14:17:07 +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
daitingting 6b90c998e5 * Fix bug #48681. 2024-04-30 09:32:14 +00:00
daitingting 4d4206b5de * Fix bug #48614. 2024-04-29 03:02:51 +00:00
daitingting 0f47f06b0c * Fix bug #48479. 2024-04-26 09:15:42 +00:00
daitingting 797e3f545e * Fix bug #48479. 2024-04-26 02:45:41 +00:00
daitingting c7291650c6 * Fix bug #48115. 2024-04-23 02:46:59 +00:00
tianshujie a6c147a702 * Fix bug #48057. 2024-04-18 16:21:20 +08:00
sunguangming cc76c3514e * Add linkrelatedstory/unlinkrelatedstory action transfer. 2024-04-09 17:30:00 +08:00
liumengyi 7167df40e6 * Change function access from private to protected in the actionModel, fix bug in extension. 2024-03-29 14:40:51 +08:00
songchenxuan d83dcc198c * Fix api bug. 2024-03-11 16:51:43 +08:00
tanghucheng 9c0a36ce3d * Merge 18.x #2da70bd3712d86fea74b06283f36e0723dec8a8d. 2024-03-08 10:57:30 +08:00
sunguangming 64e77b6ab6 * Fix bug #46694. 2024-03-08 08:53:24 +08:00
sunguangming a72d9790fd * Code for story action bug. 2024-03-07 09:57:05 +08:00
caoyanyi c1a1e52413 * Adjust zanode action content. 2024-03-05 10:22:39 +08:00