Commit Graph
131 Commits
Author SHA1 Message Date
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
liugang 1c13a31e99 * Rename $lang->colon to $lang->hyphen. 2024-04-28 14:35:26 +08:00
liyang 354c300c86 * Modify unit test directory structure and data generation method. 2024-04-22 14:25:50 +08:00
dingguodong 926744bf4f - Remove vi.php. 2024-04-17 09:11:48 +08:00
caoyanyi 1de446f6ce * Merge for release branch. 2024-03-15 14:59:57 +08:00
wangyuting f379d371a7 * Add confirm icon to delete modal. bug #45154. 2024-02-21 14:02:32 +08:00
liumengyi 324d9cb5ed * Write the change function in a new way, and optimize code for entry::edit. 2024-02-01 15:17:29 +08:00
liumengyi 1aa2ee188f * Fix bug #44970, modify style of entry::create. 2024-02-01 14:54:56 +08:00
leiyong 7ff6f65bd1 * Fix bug #45084. 2024-01-31 08:45:14 +00:00
wangyuting 290841828e * Fix entry module unit test bug. 2023-12-29 15:44:53 +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
xieqiyu 1c3dc7675b * Add the test file for the module of entry. 2023-12-05 13:14:00 +08:00
xieqiyu a320b0f956 * Refactor the module of entry. 2023-12-04 16:21:53 +08:00
xieqiyu 4c16fdd708 * Code for task#107073,#107074,#107075. 2023-12-04 15:45:30 +08:00
xieqiyu d894553959 * Code for task#107072. 2023-12-04 13:35:49 +08:00
xieqiyu c5d34056aa * Code for task#107071. 2023-12-04 10:56:38 +08:00
liumengyi 68108053e7 * Remove , at the end of row in the lastest children in entry::create. 2023-11-14 09:18:45 +08:00
wangyidong c791fd5774 * Adjust for error. 2023-11-07 13:23:32 +08:00
daitingting a219ff6086 * Format codes. 2023-11-07 02:51:34 +00:00
wangxuepeng 67186be42f * Fixed the effects between unit tests. 2023-10-25 13:56:48 +08:00
wangxuepeng f2a975a616 * Fixed the error of entryModel::update. 2023-10-25 13:49:24 +08:00
wangxuepeng 1c00a61424 * Fixed the error of entryModel::getLogs. 2023-10-25 13:41:34 +08:00
wangxuepeng 74c3a032ce * Fixed the error of entryModel:getbycode. 2023-10-25 13:38:45 +08:00
wangxuepeng f8e32d3047 * Fixed the error of entryModel:create. 2023-10-25 13:35:09 +08:00
wangxuepeng b9acfb080e * Refactor the create and update method of entry. 2023-10-23 09:30:03 +08:00
tianshujie e7bef9e5ea + Add table sort to entry::browse. 2023-10-19 13:54:57 +08:00
liugang 9644df9bf7 * admin: display log page by zin. 2023-07-06 19:19:32 +08:00
liugang 9f3b706205 * entry: sort items of heading. 2023-07-06 18:20:31 +08:00
liugang 06f4c00ee6 + entry: set back url. 2023-07-06 18:19:44 +08:00
liugang 01f9a14fd0 + entry: open page in modal. 2023-07-06 18:18:37 +08:00
liumengyi 99b36a1342 * Refactor ui of entry::log. 2023-06-30 18:56:57 +08:00
liumengyi 7316df798d * Fix bug of entry deletion. 2023-06-30 16:05:57 +08:00
liumengyi 4bd64a3e87 * Refactor ui of entry::edit. 2023-06-30 15:43:56 +08:00
liumengyi b95e1702eb * Move the create button to the right. 2023-06-30 15:11:08 +08:00
liumengyi 2cd4841880 * Refactor ui of entry::create. 2023-06-26 15:37:49 +08:00
liumengyi 2be2b5b157 * Add field groups and view statistics. 2023-06-16 10:00:20 +08:00
liumengyi deee4516b4 * Refactor entry::browse. 2023-06-14 14:02:52 +08:00
zhouxin 77a2da90d9 * Batch modify quote for unit test. 2023-05-25 13:43:27 +08:00
liugang b58cda66db - Remove unused code: $this->view->position. 2023-05-22 14:43:26 +08:00
zhouxin 4efea42989 + Move unit test from test directory to each module. 2023-04-24 02:16:47 +00:00
tianshujie 2a388d06a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-16 09:00:16 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
guofeilong f578ab069b * Code for task #750 2023-02-10 10:53:31 +08:00
tianshujie 173b9ad1d2 * Modify the style of the secondary development page. 2023-02-09 14:43:06 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
liumengyi d4ee5f773a * Fix bug. 2022-04-29 11:03:01 +08:00
songchenxuan 73faff3b7d *Delete and Add langs. 2022-02-18 15:33:58 +08:00