Merge branch 'sprint/209_hufangzhou_package' into 'master'

* Add the new version.

See merge request easycorp/zentaopms!4207
This commit is contained in:
朱金勇
2022-06-29 05:29:10 +00:00
20 changed files with 3994 additions and 4 deletions
+1 -1
View File
@@ -1 +1 @@
17.1
17.2
+1 -1
View File
@@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}}
if(!function_exists('getWebRoot')){function getWebRoot(){}}
/* 基本设置。Basic settings. */
$config->version = '17.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->version = '17.2'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->liteVersion = '1.2'; // 迅捷版版本。 The version of Lite.
$config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
$config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time.
File diff suppressed because it is too large Load Diff
+2 -1
View File
@@ -780,7 +780,7 @@ CREATE TABLE `zt_kanban` (
`status` enum('active','closed') NOT NULL default 'active',
`order` mediumint(8) NOT NULL DEFAULT '0',
`displayCards` smallint(6) NOT NULL default '0',
`showWIP` smallint(6) NOT NULL default '1',
`showWIP` enum('0','1') NOT NULL DEFAULT '1',
`fluidBoard` enum('0','1') NOT NULL DEFAULT '0',
`object` varchar(255) NOT NULL,
`alignment` varchar(10) NOT NULL default 'center',
@@ -8495,6 +8495,7 @@ CREATE TABLE IF NOT EXISTS `zt_workflow` (
`desc` text NOT NULL,
`version` varchar(10) NOT NULL DEFAULT '1.0',
`status` varchar(10) NOT NULL DEFAULT 'wait',
`approval` enum('enabled', 'disabled') NOT NULL DEFAULT 'disabled',
`createdBy` varchar(30) NOT NULL,
`createdDate` datetime NOT NULL,
`editedBy` varchar(30) NOT NULL,
+137
View File
@@ -1,3 +1,140 @@
2022-06-29 17.2
完成的需求
12709 创建某一类型的待办时,若无指派给我的内容列表提示用户
13054 待办优先级的定义和其他地方保持一致
27050 多选的下拉菜单中支持多选、全选、取消全选功能
29151 文档库下拉菜单增加文档数量显示
29703 已关闭、已暂停、已取消任务的截止日期不用红色的提示色
29870 Windows一键安装包升级至最新版本
30087 组织动态筛选条件中增加执行下拉菜单宽度
31348 去掉用例步骤数列的省略号
31479 在迭代列表底部的编辑按钮右侧增加选中迭代数量提醒
31481 在问题列表底部的导入问题库按钮右侧增加选中问题数量提醒
31482 在风险列表底部的导入风险库按钮右侧增加选中风险数量提醒
31483 在项目集列表底部的编辑按钮右侧增加选中项目数量提醒
31487 在干系人列表底部的移除按钮右侧增加选中干系人数量提醒
32990 待处理的日程列表中勾选完成后增加已完成的状态提示
33056 地盘欢迎总览区块视觉调整
33057 地盘敏捷项目统计区块排版调整
33058 地盘流程图角色名称颜色调整
33059 地盘近期项目区块滚动条调整
33061 我的待办区块日程勾选完成后增加已完成的状态提示
33112 地盘中的执行列表中“指派给我”改名为“我的任务”
33149 地盘日志列表中,多选后批量编辑按钮颜色修改
33167 读取飞书部门列表时支持选择全部部门或者单个部门
33183 地盘日程列表批量修改日期操作优化
33310 创建和编辑计划时父计划下拉菜单中计划按ID倒序排列
33410 执行批量创建任务中,修改查看图标
33429 执行研发需求列表中,检索标签位置调整
33430 修改执行研发需求列表和看板的切换方式
33433 执行研发需求看板中关联需求操作按钮样式优化
33436 执行研发需求估算中,页面排版规范化
33452 测试报告详情中,排版规范调整
33487 执行任务报表中统计列表视觉调整
33488 执行树状图中的任务详情排版调整
33490 执行日志中,日期切换按钮位置调整
33491 地盘日程日历中,日期切换按钮位置调整
33494 执行概况最新动态展示形式优化
33533 动态列表展示样式调整
26894 文档库增加排序功能
28506 测试单测试类型支持自定义
28879 测试单详情页面的二级导航中增加测试单切换控件
29220 国际版安装页优化文案
30070 需求发起评审后在需求详情页的操作栏中增加撤销评审操作
30194 需求列表操作按钮在不可用时增加原因提示
31484 在产品列表底部的编辑按钮右侧增加选中产品数量提醒
32172 项目集的项目列表中增加状态检索标签
32711 产品库中文档增加搜索功能
32712 项目库中文档增加搜索功能
32713 执行库中文档增加搜索功能
32714 接口库中文档增加搜索功能
32715 自定义库中文档增加搜索功能
32717 产品中文档增加搜索功能
32718 项目中文档增加搜索功能
32719 执行中文档增加搜索功能
32775 sonar扫描结果发送到喧喧
33025 更新接口库中禅道API文档
33109 项目集列表中负责人信息弹窗排版优化
33110 地盘仪表盘日程页面删除日志信息
33123 项目卡片列表视觉调整
33205 项目管理分组权限中在可管理项目右侧增加全选操作
33334 禅道登录过期后用户点击相应应用或功能时直接跳转到登录页面
33338 敏捷项目概况区块中增加任务统计信息
33339 敏捷项目概况区块中将“工时信息”合并至“投入”下方
33422 执行任务页面中,进度字段表头和内容右对齐
33485 实现通过邮箱重置密码功能
33486 后台系统安全中增加自助重置密码开关功能
33610 调整我的地盘项目页面中预算和负责人列之间的间距
33612 我的地盘贡献任务页面中,指派给字段改为居左显示
33618 项目管理员权限分组中组内用户增加多选功能
33619 项目管理员权限分组中增加项目集的权限管理
33620 项目管理员权限分组中增加产品的权限管理
33621 项目管理员权限分组中增加执行的权限管理
33643 调整Bug指派人的指派规则
33748 看板设置增加是否显示WIP的选项
33749 看板列标题充分利用空间
33751 将看板的设置合并为一个页面
33752 修改看板导入功能的文案提示
33754 看板列增加对齐方式设置
33755 关联需求到迭代时,先记录关联到项目的动态
33776 导入测试用例页面性能优化
33787 项目集中投入人员列表按职位类型进行默认分组排序
33791 测试用例列表的用例可以批量导入到用例库
33794 任务列表中可以同时向团队中的多人展示并行的任务
33826 项目发布日期不做限制
33829 用例可以在用例详情页中导入用例库
33882 地盘仪表盘日志页面删除日程信息
33884 项目集投入人员页面中交换角色和人员名称字段的位置
33900 优化项目集创建和编辑页面中日期错误提示文案
33901 优化项目创建和编辑页面中日期错误提示文案
33912 任务列表中多人并行的任务指派给展示团队
33937 产品列表展开/收起状态可以记录
33938 产品列表的拖动排序和项目集的拖动排序保持一致
修复的Bug
23276 用例开启强制评审后,创建用例显示不需要评审勾选框
23345 经典模式项目看板导入bug时日期控件样式问题
23623 禅道登录页面显示蓝屏
23625 转入任务成功后,任务列表底部的操作
23630 3.1版本在项目测试的BUG列表中点击某一个BUG,会跳转到测试BUG页面
23638 编辑需求去掉所属计划,需求的阶段还是已计划
23691 其他用户的私有套件当前用户可以看到
23765 当不给用户产品视图时,无法在执行下查看需求详情
23773 设置管理员密码时,没有对密码进行检验
23796 免密登录,提示401无效token
23859 提交Bug时选择了环节,编辑页面和详情页面都没有环节字段
23860 通用看板卡片的历史记录显示为用户名
23867 自定义文档库中创建自定义权限文档白名单选择时选不全
23890 用例库的用例修改了前置条件,不会触发同步提示
23930 看板设置为延期时,字段名称换行
23956 创建空间添加联系人列表弹窗下有个白条
23980 产品详情页有字段换行
23982 产品库创建富文本文档默认类型没有选择公开
24023 转入任务时,列出了已删除的未关闭的执行
24025 查看需求页面按钮操作栏未居中
24036 地盘仪表盘项目统计区块样式优化
24037 迅捷界面地盘仪表盘中的欢迎区块未进行优化调整
24042 执行下的研发需求看板中关联研发需求页面返回的链接不对
24043 修改看板任务状态,有错误提示
24192 飞书未绑定ip时页面上没有提示
24199 飞书选择部门页面德语和法语的语言项缺失
24201 子级部门取消勾选后父级部门还是选中状态
24202 父级部门选中状态样式不一致
24204 飞书选择同步部门页面建议修改提示信息
24218 选择部门时,快速点击部门重复
24228 项目管理分组权限--项目全选或取消后,右侧滚动条未出现
24275 执行研发需求估算弹窗页面建议优化页面布局
24277 人员多选下拉,显示closed选项
24279 编辑测试单页面负责人下拉宽度太窄
24284 强制评审人员下拉全选,需要点击空白处才能再次打开下拉列表
24285 地盘创建联系人页面用户全选后取消全选按显示不出来
24294 创建发布页面抄送给下拉中复选框和姓名有部分重叠
24296 新建文档,白名单和分组没有改为picker组件
24304 设置空间,白名单数据多时,下拉列表的全选按钮被遮挡
24315 选择部门后无法取消选择
24316 项目管理员维护页面添加法语德语语言项
24328 选择部门后添加第二个分组成员只能从第一个分组成员中选择
24332 添加一个分组选择全部会继承上一个分组
2022-06-16 17.1
完成的需求
33060 Scrum看板中增加搜索功能
+1
View File
@@ -134,6 +134,7 @@ $lang->execution->sortColumn = 'Kanban Card Sorting';
$lang->execution->batchCreateStory = "Batch create {$lang->SRCommon}";
$lang->execution->batchCreateTask = 'Batch create task';
$lang->execution->kanbanNoLinkProduct = "Kanban not linked {$lang->productCommon}";
$lang->execution->myTask = "My Task";
$lang->execution->list = "{$lang->executionCommon} List";
/* Fields of zt_team. */
+1
View File
@@ -134,6 +134,7 @@ $lang->execution->sortColumn = 'Kanban Card Sorting';
$lang->execution->batchCreateStory = "Batch create {$lang->SRCommon}";
$lang->execution->batchCreateTask = 'Batch create task';
$lang->execution->kanbanNoLinkProduct = "Kanban not linked {$lang->productCommon}";
$lang->execution->myTask = "My Task";
$lang->execution->list = "{$lang->executionCommon} List";
/* Fields of zt_team. */
+4
View File
@@ -202,6 +202,7 @@ $lang->kanban->fullScreen = 'Full Screen';
$lang->kanban->setting = 'Setting';
$lang->kanban->my = 'My';
$lang->kanban->other = 'Other';
$lang->kanban->showWIP = 'Show WIP';
$lang->kanban->error = new stdclass();
$lang->kanban->error->mustBeInt = 'The WIPs must be positive integer.';
@@ -221,6 +222,9 @@ $lang->kanban->importObjectList['builds'] = 'Build';
$lang->kanban->importObjectList['executions'] = 'Execution';
$lang->kanban->importObjectList['cards'] = 'Other Kanban Cards';
$lang->kanban->showWIPList[1] = 'Show';
$lang->kanban->showWIPList[0] = 'Hide';
$lang->kanban->defaultColumn = array();
$lang->kanban->defaultColumn['wait'] = 'wait';
$lang->kanban->defaultColumn['doing'] = 'doing';
+1
View File
@@ -202,6 +202,7 @@ $lang->kanban->fullScreen = 'Full Screen';
$lang->kanban->setting = 'Setting';
$lang->kanban->my = 'My';
$lang->kanban->other = 'Other';
$lang->kanban->showWIP = 'Show WIP';
$lang->kanban->error = new stdclass();
$lang->kanban->error->mustBeInt = 'The WIPs must be positive integer.';
+4
View File
@@ -202,6 +202,7 @@ $lang->kanban->fullScreen = 'Full Screen';
$lang->kanban->setting = 'Setting';
$lang->kanban->my = 'My';
$lang->kanban->other = 'Other';
$lang->kanban->showWIP = 'Show WIP';
$lang->kanban->error = new stdclass();
$lang->kanban->error->mustBeInt = 'The WIPs must be positive integer.';
@@ -221,6 +222,9 @@ $lang->kanban->importObjectList['builds'] = 'Build';
$lang->kanban->importObjectList['executions'] = 'Execution';
$lang->kanban->importObjectList['cards'] = 'Other Kanban Cards';
$lang->kanban->showWIPList[1] = 'Show';
$lang->kanban->showWIPList[0] = 'Hide';
$lang->kanban->defaultColumn = array();
$lang->kanban->defaultColumn['wait'] = 'wait';
$lang->kanban->defaultColumn['doing'] = 'doing';
+2
View File
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc = '<p>ZenTao 15.0+ a new "Youth Blue" theme
$lang->misc->feature->visionsDesc = "<p>The concept of interface has been added since 16.5. Users can deal with R & D affairs in <span style='color: #0c60e1'>[R&D]</span> and daily office affairs in <span style='color: #0c60e1'>[Lite]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
$lang->misc->feature->visionsImage = 'theme/default/images/main/visions_en.png';
$lang->misc->releaseDate['17.2'] = '2022-06-29';
$lang->misc->releaseDate['17.1'] = '2022-06-16';
$lang->misc->releaseDate['17.0'] = '2022-06-02';
$lang->misc->releaseDate['17.0.beta2'] = '2022-05-26';
@@ -183,6 +184,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
$lang->misc->feature->all['17.2'][] = array('title' => "Adjust the display of agile project block; optimize the UI of programs, projects and tests; optimize the detailed experience. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.1'][] = array('title' => "Modify the interaction problem of execution, project module. Complete customer's high priority requirements. The detail experience is optimized, fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.0'][] = array('title' => 'The detail experience is optimized, fix bugs.', 'desc' => '');
$lang->misc->feature->all['17.0.beta2'][] = array('title' => 'The detail experience is optimized, fix bugs.', 'desc' => '');
+2
View File
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc = '<p>ZenTao 15.0+ a new "Youth Blue" theme
$lang->misc->feature->visionsDesc = "<p>The concept of interface has been added since 16.5. Users can deal with R & D affairs in <span style='color: #0c60e1'>[R&D]</span> and daily office affairs in <span style='color: #0c60e1'>[Lite]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
$lang->misc->feature->visionsImage = 'theme/default/images/main/visions_en.png';
$lang->misc->releaseDate['17.2'] = '2022-06-29';
$lang->misc->releaseDate['17.1'] = '2022-06-16';
$lang->misc->releaseDate['17.0'] = '2022-06-02';
$lang->misc->releaseDate['17.0.beta2'] = '2022-05-26';
@@ -183,6 +184,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
$lang->misc->feature->all['17.2'][] = array('title' => "Adjust the display of agile project block; optimize the UI of programs, projects and tests; optimize the detailed experience. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.1'][] = array('title' => "Modify the interaction problem of execution, project module. Complete customer's high priority requirements. The detail experience is optimized, fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.0'][] = array('title' => 'The detail experience is optimized, fix bugs.', 'desc' => '');
$lang->misc->feature->all['17.0.beta2'][] = array('title' => 'The detail experience is optimized, fix bugs.', 'desc' => '');
+2
View File
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc = '<p>ZenTao 15.0+ a new "Youth Blue" theme
$lang->misc->feature->visionsDesc = "<p>The concept of interface has been added since 16.5. Users can deal with R & D affairs in <span style='color: #0c60e1'>[R&D]</span> and daily office affairs in <span style='color: #0c60e1'>[Lite]</span>.</p><p>You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.</p>";
$lang->misc->feature->visionsImage = 'theme/default/images/main/visions_en.png';
$lang->misc->releaseDate['17.2'] = '2022-06-29';
$lang->misc->releaseDate['17.1'] = '2022-06-16';
$lang->misc->releaseDate['17.0'] = '2022-06-02';
$lang->misc->releaseDate['17.0.beta2'] = '2022-05-26';
@@ -183,6 +184,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
$lang->misc->feature->all['17.2'][] = array('title' => "Adjust the display of agile project block; optimize the UI of programs, projects and tests; optimize the detailed experience. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.1'][] = array('title' => "Modify the interaction problem of execution, project module. Complete customer's high priority requirements. The detail experience is optimized, fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.0'][] = array('title' => 'The detail experience is optimized, fix bugs.', 'desc' => '');
$lang->misc->feature->all['17.0.beta2'][] = array('title' => 'The detail experience is optimized, fix bugs.', 'desc' => '');
+2
View File
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc = "<p>禅道15系列上线了全新的“
$lang->misc->feature->visionsDesc = "<p>从16.5开始增加了界面概念,用户可以在<span style='color:#0c60e1'>[研发综合界面]</span>中处理研发事务、在<span style='color:#0c60e1'>[迅捷界面]</span>处理日常办公事务。</p><p>在头像右侧即可查看当前所处界面,点击当前界面名称可查看和切换其他的界面。</p>";
$lang->misc->feature->visionsImage = 'theme/default/images/main/visions.png';
$lang->misc->releaseDate['17.2'] = '2022-06-29';
$lang->misc->releaseDate['17.1'] = '2022-06-16';
$lang->misc->releaseDate['17.0'] = '2022-06-02';
$lang->misc->releaseDate['17.0.beta2'] = '2022-05-26';
@@ -183,6 +184,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
$lang->misc->feature->all['17.2'][] = array('title' => '调整敏捷项目区块的展示,项目集、项目和测试相关UI优化,细节体验优化。修复Bug。', 'desc' => '');
$lang->misc->feature->all['17.1'][] = array('title' => '修改执行、项目模块的交互问题,完成客户巴高优先级需求,细节体验优化。修复Bug。', 'desc' => '');
$lang->misc->feature->all['17.0'][] = array('title' => '细节体验优化。修复Bug。', 'desc' => '');
$lang->misc->feature->all['17.0.beta2'][] = array('title' => '细节体验优化。修复Bug。', 'desc' => '');
+1 -1
View File
@@ -107,7 +107,7 @@ $lang->program->closeErrorMessage = 'There are subprograms or projects that are
$lang->program->hasChildren = 'It has child programs or projects. You cannot delete it.';
$lang->program->hasProduct = 'It has products. You cannot delete it.';
$lang->program->confirmDelete = "Do you want to delete it?";
$lang->program->unlinkStakeholder = 'Voulez - vous retirer les intervenants?';
$lang->program->confirmUnlink = 'Voulez - vous retirer les intervenants?';
$lang->program->readjustTime = 'Change the program begin&end date.';
$lang->program->accessDenied = 'You have no access to the program.';
$lang->program->beyondParentBudget = 'The remaining budget of the owned program has been exceeded.';
+1
View File
@@ -36,6 +36,7 @@ $lang->todo->cycleConfig = "Wiederkehrend setzen";
$lang->todo->project = "Project";
$lang->todo->product = "Product";
$lang->todo->execution = $lang->executionCommon;
$lang->todo->changeDate = "Change Date";
$lang->todo->reasonList['story'] = "Story übertragen";
$lang->todo->reasonList['task'] = "Aufgabe übertragen";
+1
View File
@@ -36,6 +36,7 @@ $lang->todo->cycleConfig = "Récurrence";
$lang->todo->project = "Project";
$lang->todo->product = "Product";
$lang->todo->execution = $lang->executionCommon;
$lang->todo->changeDate = "Change Date";
$lang->todo->reasonList['story'] = "Convertir en Story";
$lang->todo->reasonList['task'] = "Convertir en Tâche";
+2
View File
@@ -19,6 +19,7 @@ $config->upgrade->maxVersion['max3_1_beta1'] = '17_0_beta1';
$config->upgrade->maxVersion['max3_1_beta2'] = '17_0_beta2';
$config->upgrade->maxVersion['max3_1'] = '17_0';
$config->upgrade->maxVersion['max3_2'] = '17_1';
$config->upgrade->maxVersion['max3_3'] = '17_2';
$config->upgrade->bizVersion = array();
$config->upgrade->bizVersion['biz1_0'] = '9_5_1';
@@ -76,6 +77,7 @@ $config->upgrade->bizVersion['biz7_0_beta1'] = '17_0_beta1';
$config->upgrade->bizVersion['biz7_0_beta2'] = '17_0_beta2';
$config->upgrade->bizVersion['biz7_0'] = '17_0';
$config->upgrade->bizVersion['biz7_1'] = '17_1';
$config->upgrade->bizVersion['biz7_2'] = '17_2';
$config->upgrade->proVersion = array();
$config->upgrade->proVersion['pro1_0'] = '3_1';
+3
View File
@@ -160,6 +160,7 @@ $lang->upgrade->fromVersions['17_0_beta1'] = '17.0.beta1';
$lang->upgrade->fromVersions['17_0_beta2'] = '17.0.beta2';
$lang->upgrade->fromVersions['17_0'] = '17.0';
$lang->upgrade->fromVersions['17_1'] = '17.1';
$lang->upgrade->fromVersions['17_2'] = '17.2';
global $config;
/* Lite. */
@@ -324,6 +325,7 @@ $lang->upgrade->fromVersions['biz7_0_beta1'] = 'Biz7.0.beta1';
$lang->upgrade->fromVersions['biz7_0_beta2'] = 'Biz7.0.beta2';
$lang->upgrade->fromVersions['biz7_0'] = 'Biz7.0';
$lang->upgrade->fromVersions['biz7_1'] = 'Biz7.1';
$lang->upgrade->fromVersions['biz7_2'] = 'Biz7.2';
/* Max. */
$lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4';
@@ -344,3 +346,4 @@ $lang->upgrade->fromVersions['max3_0'] = 'Max3.0';
$lang->upgrade->fromVersions['max3_1_beta1'] = 'Max3.1.beta1';
$lang->upgrade->fromVersions['max3_1_beta2'] = 'Max3.1.beta2';
$lang->upgrade->fromVersions['max3_1'] = 'Max3.1';
$lang->upgrade->fromVersions['max3_2'] = 'Max3.2';
+1
View File
@@ -956,6 +956,7 @@ class upgradeModel extends model
case '17_0_beta1': $confirmContent .= file_get_contents($this->getUpgradeFile('17.0.beta1'));
case '17_0_beta2': $confirmContent .= file_get_contents($this->getUpgradeFile('17.0.beta2'));
case '17_0': $confirmContent .= file_get_contents($this->getUpgradeFile('17.0'));
case '17_1': $confirmContent .= file_get_contents($this->getUpgradeFile('17.1'));
}
return $confirmContent;