Commit Graph
310 Commits
Author SHA1 Message Date
dingguodong c6ea565c1b * Fix typo. 2024-06-12 10:10:46 +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
liumengyi 3f113f9ae9 * Fix bug #48712, parent stage is unaccessible. 2024-04-30 11:22:44 +08:00
dingguodong 926744bf4f - Remove vi.php. 2024-04-17 09:11:48 +08:00
tianshujie 33a97f6da5 * Fix bug #42692. 2024-04-07 09:59:34 +08:00
tanghucheng e49fb5658c * Merge 18.x #4cb8b2f01e39abe80a15a47292d4f6b6801b2ece. 2024-03-08 11:11:09 +08:00
liumengyi c340f19b57 * Fix bug #42692, modify language item. 2024-02-22 11:11:01 +08:00
liumengyi e36325e9a2 * Fix bug #45168, modify language items after creating an execution. 2024-02-20 13:48:53 +08:00
tianshujie 0d882a8a4c * Add quotes. 2024-01-29 16:29:40 +08:00
tianshujie 570f4c8dcf * Fix bug #44967. 2024-01-29 10:34:41 +08:00
wangyidong f71e242895 * Fix bug #44495. 2024-01-22 14:36:08 +08:00
wangyidong 7c4900f1e9 * Code for execution create page. 2024-01-18 13:17:05 +08:00
caoyanyi 8e17266f28 * Update commit link info. 2023-12-06 13:42:44 +08:00
caoyanyi a33ad4ad71 * Update copyright year. 2023-12-05 13:32:52 +08:00
tianshujie 24eb5ca157 * Merge code. 2023-11-08 10:24:30 +08:00
tianshujie 2d3d9ee1a0 * Fix bug #40206. 2023-11-08 10:22:59 +08:00
liumengyi 9173c8e107 * Fix bug #40206, replace ' with " to wrap \n. 2023-11-08 09:15:57 +08:00
tianshujie b050fa67e9 * Modify the team list account column config. 2023-10-13 10:39:09 +08:00
朱金勇 bde6af1d93 * Migrate changes of 18.x to master. 2023-10-12 01:16:07 +00:00
dingguodong 48fb8f9a77 * Rename typo teamname to teamName. 2023-09-08 11:10:29 +08:00
dingguodong 041c3d7f6e * Fix typo, replace 'letter' to 'lesser'. 2023-09-04 11:23:58 +08:00
tianshujie 62f7564fe0 * Change the tip of the progress. 2023-08-03 16:49:26 +08:00
tianshujie 4a19ff2d46 + Add tip of the project view. 2023-08-03 16:46:48 +08:00
tianshujie a0f36c541a * Refactor work hours information. 2023-08-03 15:16:40 +08:00
caoyanyi e7949c3fc8 + Add language. 2023-08-03 15:06:50 +08:00
caoyanyi 224fed5653 + Add language. 2023-08-03 13:45:58 +08:00
sunguangming 20fddf39e0 * Code for grouptask style. 2023-08-03 09:29:52 +08:00
caoyanyi f815ad3cbf + Add language. 2023-08-01 14:12:09 +08:00
tianshujie 0ebcfdd124 * Refactor burn page of the execution. 2023-07-03 09:50:37 +08:00
sunguangming cea135ac23 * Code for task #96129. 2023-06-29 12:58:26 +08:00
tianshujie 199396f8ec * Refactor create execution page. 2023-06-27 15:28:23 +08:00
tianshujie 7f6b5cd153 * Refactor of the manage member. 2023-06-25 16:31:50 +08:00
caoyanyi cb206799dd + Add featureBar language for bug to task. 2023-06-25 14:09:29 +08:00
caoyanyi de9ece92ed + Add language. 2023-06-19 13:40:48 +08:00
tianshujie 23abef2727 * Code for task #95216. 2023-06-12 16:23:43 +08:00
caoyanyi 943927eeb9 + Add feature bar language for import task page. 2023-06-09 10:07:11 +08:00
liumengyi b1d8c456a4 - Delete the privilege of execution-burnData. 2023-04-13 14:56:02 +08:00
liumengyi d6887ed43d * Finish task #91013. 2023-04-11 13:43:14 +08:00
wangyidong 7e78d0e54a * fix bug #32156. 2023-03-16 10:40:58 +08:00
tianshujie e49090d03a * Fix bug 32911. 2023-03-15 09:43:54 +08:00
tianshujie 23f362cd59 * Fixed language item issues. 2023-03-13 15:30:24 +08:00
孙广明 806e3a4742 Merge branch 'sprint/295_liumengyi_86258' into 'master'
* Finish task #86281 86258.

See merge request easycorp/zentaopms!7166
2023-03-09 08:07:59 +00:00
tianshujie d650f56116 * Restore code. 2023-03-08 08:49:47 +08:00
tianshujie 66e6e8f48e * Added custom filter tag language entries. 2023-03-07 08:57:37 +08:00
tianshujie cd7d8f4ff6 * Modify language item for product common. 2023-03-06 15:27:45 +08:00
liumengyi 3f63404953 * Finish task #86258. 2023-03-06 06:09:13 +00:00
tianshujie e1b6e852af * Unified filter label format. 2023-03-06 14:02:09 +08:00
caoyanyi 86c6968243 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-03 08:48:41 +08:00
liumengyi 17bc1bfacc * Fix bug #32592. 2023-03-02 07:47:56 +00:00
tianshujie 0233152d1e * Change the project to a variable. 2023-03-01 13:45:52 +08:00