diff --git a/VERSION b/VERSION index 9341e7602b..b82244ff8c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.0.stable +10.1.stable diff --git a/config/config.php b/config/config.php index 037ff1caec..b8e9bcd87a 100644 --- a/config/config.php +++ b/config/config.php @@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}} if(!function_exists('getWebRoot')){function getWebRoot(){}} /* 基本设置。Basic settings. */ -$config->version = '10.0'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '10.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. $config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP. $config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time. $config->timezone = 'Asia/Shanghai'; // 时区设置。 The time zone setting, for more see http://www.php.net/manual/en/timezones.php. diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 19ea984146..2f1386f4d9 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,158 @@ +2018-07-11 10.1 +完成的需求 +3068 需求关联相关需求字段时，选择需求后页面没有及时刷新。 +3067 项目需求列表页面调整创建需求和关联需求按钮的位置。 +3066 项目任务列表可以直接点击进入 +3065 优化各个视图首页区块中滚动条的位置和样式 +3064 调整编辑器和详情页面P标签的行距，精简，保持一致。 +3058 检查zt_webhookdatas表是否还需要，如果不需要，去掉 +3037 多人任务只能线性执行 +3036 调整待办列表中操作按钮 +3035 调整首页指派给我区块中待办的查询逻辑 +3034 父任务删除，子任务一起删除 +3033 父任务的起止日期根据子任务的起止日期变化 +3031 后台自定义必填项，如果是系统原来默认的必填项，不出现在编辑的下拉列表里，即不允许编辑 +3027 创建需求列出的计划规则修改 +3025 数据库表索引再过一遍，有些加了没用上 +3015 导出设置，选中某个已存模板，下方模板名称不显示。点删除时，不大清楚删除的是哪个模板 +3012 创建任务，如果是多人类型的任务，设置团队的时候目前只能设置6个，考虑增加添加按钮，排序换成拖拽的 +2935 文档库和文档的权限分开进行检查 +2910 下个版本升级时把项目状态是done的改为closed +2857 需求和bug的所属模块改为后台可以去掉必填 +2835 导出用例结果的时候，不管状态。有实际情况数据就导出。 +2820 子任务详情，标题中的父任务，做成链接。 +2818 把任务列表自定义显示字段中的“完成”改成“完成日期” + +修复的Bug +1990 需求以重复原因关闭之后，再修改关闭原因无法将重复需求字段置空 +1989 测试单关联用例页面，搜索，选择搜索字段，搜索框数据没有变化 +1988 操作栏存在换行显示的问题 +1987 登录后跳转的网址不对 +1986 发信功能，收到的邮件，邮件标题跳转链接错误 +1984 所有产品和所有项目页面，对产品和项目排序不生效 +1981 组织-权限 有一个没有对号的汉字展示 +1978 部分模块拖动排序显示有问题 +1977 添加待办不填写待办名称，没有提示必填项 +1975 批量添加bug多项录入卡死 +1971 文档模块下面富文本编辑器选择SQL会变形 +1966 产品的模块显示位置错误 +1965 创建任务，抄送给下拉显示不完整 +1964 项目按计划关联需求时会把草稿状态的需求关联进来 +1963 markdown无法正常录入数据 +1962 富文本编辑器的图片空间功能异常 +1961 测试单-关联用例 缺少 按照bug关联 用例的功能 +1958 项目主页任务统计与实际不符 +1951 10.0.beta产品计划关联缺陷列表，不能按查询条件过滤数据 +1950 长名称的产品，需要优化测试单首页样式 +1948 任务管理模式下，文档里产品相关内容需要隐藏 +1944 产品需求里生成报表，下拉时会出现所有表头的表格 +1942 项目-任务，按分组查看任务时，父子任务会统计负责任务工时总和 +1941 创建周期性待办，新建的待办和周期待办的创建人不一致 +1935 bug标题过长时，点击解决bug，会遮挡下方信息 +1924 文档库创建文档链接跳转不对 +1921 多人任务创建后点击编辑然后保存无法保存 +1920 产品-项目：项目过多，加一个总数给用户预知 +1919 产品-概况：最新动态模块中，对重要信息待处理（以蓝色的点重点突出） +1918 文档-产品：文档的产品详情页有页码行 +1917 文档-文档主页：在左边的文档导航部分，产品名过长 +1913 组织-权限，视图维护设置可以访问的产品或项目无效 +1908 修改日志无法滚动 +1903 产品批量编辑与概况显示不一致 +1884 任务列表工时统计显示不友好 +1873 需求单独分解任务 列表页面的任务数不会变化 +1870 文档同时编辑没有提示 +1846 详情页面，先删除再取消，再点击编辑，然后点返回，谷歌和safari浏览器会提醒是否要删除该任务 +1829 燃尽图模块的图例，位置有一点挤 +1575 测试-bug 简单表格自定义字段比较多的时候排版有问题 +1561 单独创建用户的时候对邮件地址没有进行验证 +1560 用例步骤和预期高度样式显示不友好 +1559 测试报告中点击用例标题显示最新用例版本内容，不是测试单执行的用例版本内容 +1558 多人任务任务点完成时，会自动添加一条工时记录 +1557 套件关联用例问题 +1555 使用markdown创建文档时>会被过滤 +1554 附件名称长显示不美观 +1548 测试单模块显示错误 +1542 访问控制分组白名单显示优化 +1541 项目-版本 关联需求显示阶段不一致 +1540 10.0版本批量创建任务和需求，页面加载慢。 +1532 项目-版本，编辑已上传的附件名称，历史记录显示超出浏览器页面 +1985 任务标题过长，完成、关闭、激活任务页面标题会遮挡下方信息 +1983 在安装禅道，生成配置文件，检查requestType是否可以使用PATH_INFO方式的时候，检查不起作用 +1982 计划列表的描述没有换行 +1980 产品类型为多平台或多分支类型，产品下的需求所属阶段信息显示不出来 +1979 组织-用户列表 职位栏换行 +1976 升级成功页面，然之协同logo显示不全 +1973 优化名字很长时的文档页面 +1972 保存提交操作没有增加防止重复点击的设置 +1970 一键安装包zbox.php代码问题 +1968 我的地盘，欢迎总览区块，任务已延期数量统计不准确 +1967 非强制评审用户，对草稿状态的需求进行变更，需求状态还是显示为草稿 +1960 需求阶段规则完善 +1957 测试用例导入csv文件，预期和步骤以英文引号结尾无法导入 +1956 产品创建方法代码优化 +1955 创建项目时如果关联计划，项目能创建成功但是页面没有跳转，并且计划没有关联上 +1954 统计-测试-bug创建表，数据没有正常显示 +1947 集成然之，自动跳回然之功能打开，用例执行失败转bug，用例步骤不会自动带到bug中 +1943 需求变更确认按钮点击无反应 +1940 测试用例导出csv文件，实际情况字段内容没有导出 +1939 创建多人任务时不维护预计工时，用户点击完成，任务状态会变为已完成 +1938 测试-bug，编辑bug，选择所属项目后，解决版本只能选择这个项目下的版本 +1936 修改config/config.php文件后缀名白名单，pcblib格式文件上传后后缀名重复 +1930 测试-bug，按抄送给字段进行搜索，没有数据 +1929 需求查看功能异常 +1927 需求分组子任务工时重复计算 +1926 项目-需求 无法关联需求 +1925 维护产品线页面点击返回无效 +1923 需求标题列表和详情页面显示不一致 +1922 附件上传目录只读时ajaxForm无法正常提交 +1916 文档的视图切换按钮只在搜索结果页出现，其他页面没有 +1915 文档-项目：Google浏览器中，点击“项目”，文档左边的导航部分会消失 +1912 10.0 bug列表自定义字段无法设置 +1911 bug详情页面无法显示完整长版本名称 +1910 module/project/control.php代码错误 +1909 我的地盘项目状态与详情页面不一致 +1907 修复这里面的安全漏洞 +1897 项目-团队中，受限用户选择是，用户还是可以创建任务 +1895 邮件中设置的发信人和收到邮件时的发信人不一致 +1894 产品-概况页面，历史记录记录的是最新动态中的信息 +1893 测试-测试单删除后，还可以搜索到 +1892 周期待办编辑保存后会创建不符合要求的待办 +1891 任务分解子任务，不填写任务名称也可以保存 +1890 添加子任务没有必填项提醒 +1889 计划关联bug默认进来的未关联bug数量显示不对 +1888 组织-权限，权限维护，取消产品计划-关联需求权限，产品-计划下需求无法排序 +1887 点击模块不显示子任务 +1880 子任务收起会被勾选 +1874 批量修改需求阶段不生效 +1872 多人任务第二个人员无法记录工时 +1871 优化创建用户页面密码验证失败的提示 +1585 升级成功的页面，然之协同的logo显示不完整 +1582 待办关闭后，指派人还是之前指派的用户 +1581 zbox服务不能正常重启 +1556 看板上拖动任务没有按预期工作 +1553 调整任务指派时剩余工时字段的逻辑 +1552 关联需求，搜索是否需要显示删除的需求。 +1551 国际版绑定禅道官网逻辑错误 +1547 批量添加用户，职位显示为必填，实际职位非必填字段 +1546 英文版文档首页%s +1544 周期待办的创建人会显示所有成员中的一个 +1534 项目-概况的 关联计划 无法修改 +1533 钉钉机器人中发的链接点击无法访问 +1530 测试报告（测试管理工具）提示需要关联项目 +1528 平台页面无法切换产品 +1527 用户源码包安装检测的session目录读写权限不准 +1526 禅道更新到 9.8.x后速度变慢cpu占用率增高 +1522 禅道附件图片无法下载预览 +1521 受限用户可以删除任何能看到的附件 +1520 列表页面排序功能异常 +1519 所有项目排序功能异常 +1512 新建产品，维护产品线，点刷新显示为维护模块 +1506 升级结果页面，然之协同的logo没显示完整 +1501 项目关联的产品多，显示样式需优化。 +1496 员工负载表显示错位 +1492 创建项目页面关联计划，计划下的需求不会关联到项目中 +1491 任务列表，点击表头进行排序，对子任务不起作用 + 2018-04-03 9.8.3.stable 完成的需求 2872 把用户的入职日期属性展示出来 diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php index 8e6b3303bc..c813bb19ec 100644 --- a/module/install/lang/zh-cn.php +++ b/module/install/lang/zh-cn.php @@ -35,6 +35,7 @@ $lang->install->links = <<http://www.zentao.net/ask/ 新浪微博：http://weibo.com/easysoft + 您现在正在安装的版本是 %s。 EOT; diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php index e3e441e2d5..f111342644 100644 --- a/module/install/lang/zh-tw.php +++ b/module/install/lang/zh-tw.php @@ -35,6 +35,7 @@ $lang->install->links = <<http://www.zentao.net/ask/ 新浪微博：http://weibo.com/easysoft + 您現在正在安裝的版本是 %s。 EOT; diff --git a/module/project/lang/zh-tw.php b/module/project/lang/zh-tw.php index dfb52799c1..8e5e866b80 100644 --- a/module/project/lang/zh-tw.php +++ b/module/project/lang/zh-tw.php @@ -209,6 +209,7 @@ $lang->project->batchWBS = "批量分解"; $lang->project->howToUpdateBurn = "幫助 "; $lang->project->whyNoStories = "看起來沒有需求可以關聯。請檢查下{$lang->projectCommon}關聯的{$lang->productCommon}中有沒有需求，而且要確保它們已經審核通過。"; $lang->project->productStories = "{$lang->projectCommon}關聯的需求是{$lang->productCommon}需求的子集，並且只有評審通過的需求才能關聯。請關聯需求。"; +$lang->project->haveDraft = "有%s條草稿狀態的需求無法關聯到該{$lang->projectCommon}"; $lang->project->doneProjects = '已結束'; $lang->project->selectDept = '選擇部門'; $lang->project->selectDeptTitle = '選擇一個部門的成員'; diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index 00a2b531cc..1747063b1b 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -45,95 +45,4 @@ $lang->upgrade->sureExecute = 'Execute'; $lang->upgrade->forbiddenExt = 'Extension is not compatible with the upgraded version. It has been deactivated:'; $lang->upgrade->updateFile = 'Attachment information has to be updated.'; -$lang->upgrade->fromVersions['0_3beta'] = '0.3 BETA'; -$lang->upgrade->fromVersions['0_4beta'] = '0.4 BETA'; -$lang->upgrade->fromVersions['0_5beta'] = '0.5 BETA'; -$lang->upgrade->fromVersions['0_6beta'] = '0.6 BETA'; -$lang->upgrade->fromVersions['1_0beta'] = '1.0 BETA'; -$lang->upgrade->fromVersions['1_0rc1'] = '1.0 RC1'; -$lang->upgrade->fromVersions['1_0rc2'] = '1.0 RC2'; -$lang->upgrade->fromVersions['1_0'] = '1.0 STABLE'; -$lang->upgrade->fromVersions['1_0_1'] = '1.0.1'; -$lang->upgrade->fromVersions['1_1'] = '1.1'; -$lang->upgrade->fromVersions['1_2'] = '1.2'; -$lang->upgrade->fromVersions['1_3'] = '1.3'; -$lang->upgrade->fromVersions['1_4'] = '1.4'; -$lang->upgrade->fromVersions['1_5'] = '1.5'; -$lang->upgrade->fromVersions['2_0'] = '2.0'; -$lang->upgrade->fromVersions['2_1'] = '2.1'; -$lang->upgrade->fromVersions['2_2'] = '2.2'; -$lang->upgrade->fromVersions['2_3'] = '2.3'; -$lang->upgrade->fromVersions['2_4'] = '2.4'; -$lang->upgrade->fromVersions['3_0_beta1'] = '3.0 BETA1'; -$lang->upgrade->fromVersions['3_0_beta2'] = '3.0 BETA2'; -$lang->upgrade->fromVersions['3_0'] = '3.0 STABLE'; -$lang->upgrade->fromVersions['3_1'] = '3.1'; -$lang->upgrade->fromVersions['3_2'] = '3.2'; -$lang->upgrade->fromVersions['3_2_1'] = '3.2.1'; -$lang->upgrade->fromVersions['3_3'] = '3.3'; -$lang->upgrade->fromVersions['4_0_beta1'] = '4.0 BETA1'; -$lang->upgrade->fromVersions['4_0_beta2'] = '4.0 BETA2'; -$lang->upgrade->fromVersions['4_0'] = '4.0'; -$lang->upgrade->fromVersions['4_0_1'] = '4.0.1'; -$lang->upgrade->fromVersions['4_1'] = '4.1'; -$lang->upgrade->fromVersions['4_2_beta'] = '4.2.beta'; -$lang->upgrade->fromVersions['4_3_beta'] = '4.3.beta'; -$lang->upgrade->fromVersions['5_0_beta1'] = '5.0.beta1'; -$lang->upgrade->fromVersions['5_0_beta2'] = '5.0.beta2'; -$lang->upgrade->fromVersions['5_0'] = '5.0'; -$lang->upgrade->fromVersions['5_1'] = '5.1'; -$lang->upgrade->fromVersions['5_2'] = '5.2'; -$lang->upgrade->fromVersions['5_2_1'] = '5.2.1'; -$lang->upgrade->fromVersions['5_3'] = '5.3'; -$lang->upgrade->fromVersions['6_0_beta1'] = '6.0.beta1'; -$lang->upgrade->fromVersions['6_0'] = '6.0'; -$lang->upgrade->fromVersions['6_1'] = '6.1'; -$lang->upgrade->fromVersions['6_2'] = '6.2'; -$lang->upgrade->fromVersions['6_3'] = '6.3'; -$lang->upgrade->fromVersions['6_4'] = '6.4'; -$lang->upgrade->fromVersions['7_0'] = '7.0'; -$lang->upgrade->fromVersions['7_1'] = '7.1'; -$lang->upgrade->fromVersions['7_2'] = '7.2'; -$lang->upgrade->fromVersions['7_2_4'] = '7.2.4'; -$lang->upgrade->fromVersions['7_2_5'] = '7.2.5'; -$lang->upgrade->fromVersions['7_3'] = '7.3'; -$lang->upgrade->fromVersions['7_4_beta'] = '7.4.beta'; -$lang->upgrade->fromVersions['8_0'] = '8.0'; -$lang->upgrade->fromVersions['8_0_1'] = '8.0.1'; -$lang->upgrade->fromVersions['8_1'] = '8.1'; -$lang->upgrade->fromVersions['8_1_3'] = '8.1.3'; -$lang->upgrade->fromVersions['8_2_beta'] = '8.2.beta'; -$lang->upgrade->fromVersions['8_2'] = '8.2'; -$lang->upgrade->fromVersions['8_2_1'] = '8.2.1'; -$lang->upgrade->fromVersions['8_2_2'] = '8.2.2'; -$lang->upgrade->fromVersions['8_2_3'] = '8.2.3'; -$lang->upgrade->fromVersions['8_2_4'] = '8.2.4'; -$lang->upgrade->fromVersions['8_2_5'] = '8.2.5'; -$lang->upgrade->fromVersions['8_2_6'] = '8.2.6'; -$lang->upgrade->fromVersions['8_3'] = '8.3'; -$lang->upgrade->fromVersions['8_3_1'] = '8.3.1'; -$lang->upgrade->fromVersions['8_4'] = '8.4'; -$lang->upgrade->fromVersions['8_4_1'] = '8.4.1'; -$lang->upgrade->fromVersions['9_0_beta'] = '9.0.beta'; -$lang->upgrade->fromVersions['9_0'] = '9.0'; -$lang->upgrade->fromVersions['9_0_1'] = '9.0.1'; -$lang->upgrade->fromVersions['9_1'] = '9.1'; -$lang->upgrade->fromVersions['9_1_1'] = '9.1.1'; -$lang->upgrade->fromVersions['9_1_2'] = '9.1.2'; -$lang->upgrade->fromVersions['9_2'] = '9.2'; -$lang->upgrade->fromVersions['9_2_1'] = '9.2.1'; -$lang->upgrade->fromVersions['9_3_beta'] = '9.3.beta'; -$lang->upgrade->fromVersions['9_4'] = '9.4'; -$lang->upgrade->fromVersions['9_5'] = '9.5'; -$lang->upgrade->fromVersions['9_5_1'] = '9.5.1'; -$lang->upgrade->fromVersions['9_6'] = '9.6'; -$lang->upgrade->fromVersions['9_6_1'] = '9.6.1'; -$lang->upgrade->fromVersions['9_6_2'] = '9.6.2'; -$lang->upgrade->fromVersions['9_6_3'] = '9.6.3'; -$lang->upgrade->fromVersions['9_7'] = '9.7'; -$lang->upgrade->fromVersions['9_8'] = '9.8'; -$lang->upgrade->fromVersions['9_8_1'] = '9.8.1'; -$lang->upgrade->fromVersions['9_8_2'] = '9.8.2'; -$lang->upgrade->fromVersions['9_8_3'] = '9.8.3'; -$lang->upgrade->fromVersions['10_0_alpha'] = '10.0.alpha'; -$lang->upgrade->fromVersions['10_0_beta'] = '10.0.beta'; +include dirname(__FILE__) . '/version.php'; diff --git a/module/upgrade/lang/version.php b/module/upgrade/lang/version.php new file mode 100644 index 0000000000..4023753f0f --- /dev/null +++ b/module/upgrade/lang/version.php @@ -0,0 +1,94 @@ +upgrade->fromVersions['0_3beta'] = '0.3 BETA'; +$lang->upgrade->fromVersions['0_4beta'] = '0.4 BETA'; +$lang->upgrade->fromVersions['0_5beta'] = '0.5 BETA'; +$lang->upgrade->fromVersions['0_6beta'] = '0.6 BETA'; +$lang->upgrade->fromVersions['1_0beta'] = '1.0 BETA'; +$lang->upgrade->fromVersions['1_0rc1'] = '1.0 RC1'; +$lang->upgrade->fromVersions['1_0rc2'] = '1.0 RC2'; +$lang->upgrade->fromVersions['1_0'] = '1.0 STABLE'; +$lang->upgrade->fromVersions['1_0_1'] = '1.0.1'; +$lang->upgrade->fromVersions['1_1'] = '1.1'; +$lang->upgrade->fromVersions['1_2'] = '1.2'; +$lang->upgrade->fromVersions['1_3'] = '1.3'; +$lang->upgrade->fromVersions['1_4'] = '1.4'; +$lang->upgrade->fromVersions['1_5'] = '1.5'; +$lang->upgrade->fromVersions['2_0'] = '2.0'; +$lang->upgrade->fromVersions['2_1'] = '2.1'; +$lang->upgrade->fromVersions['2_2'] = '2.2'; +$lang->upgrade->fromVersions['2_3'] = '2.3'; +$lang->upgrade->fromVersions['2_4'] = '2.4'; +$lang->upgrade->fromVersions['3_0_beta1'] = '3.0 BETA1'; +$lang->upgrade->fromVersions['3_0_beta2'] = '3.0 BETA2'; +$lang->upgrade->fromVersions['3_0'] = '3.0 STABLE'; +$lang->upgrade->fromVersions['3_1'] = '3.1'; +$lang->upgrade->fromVersions['3_2'] = '3.2'; +$lang->upgrade->fromVersions['3_2_1'] = '3.2.1'; +$lang->upgrade->fromVersions['3_3'] = '3.3'; +$lang->upgrade->fromVersions['4_0_beta1'] = '4.0 BETA1'; +$lang->upgrade->fromVersions['4_0_beta2'] = '4.0 BETA2'; +$lang->upgrade->fromVersions['4_0'] = '4.0'; +$lang->upgrade->fromVersions['4_0_1'] = '4.0.1'; +$lang->upgrade->fromVersions['4_1'] = '4.1'; +$lang->upgrade->fromVersions['4_2_beta'] = '4.2.beta'; +$lang->upgrade->fromVersions['4_3_beta'] = '4.3.beta'; +$lang->upgrade->fromVersions['5_0_beta1'] = '5.0.beta1'; +$lang->upgrade->fromVersions['5_0_beta2'] = '5.0.beta2'; +$lang->upgrade->fromVersions['5_0'] = '5.0'; +$lang->upgrade->fromVersions['5_1'] = '5.1'; +$lang->upgrade->fromVersions['5_2'] = '5.2'; +$lang->upgrade->fromVersions['5_2_1'] = '5.2.1'; +$lang->upgrade->fromVersions['5_3'] = '5.3'; +$lang->upgrade->fromVersions['6_0_beta1'] = '6.0.beta1'; +$lang->upgrade->fromVersions['6_0'] = '6.0'; +$lang->upgrade->fromVersions['6_1'] = '6.1'; +$lang->upgrade->fromVersions['6_2'] = '6.2'; +$lang->upgrade->fromVersions['6_3'] = '6.3'; +$lang->upgrade->fromVersions['6_4'] = '6.4'; +$lang->upgrade->fromVersions['7_0'] = '7.0'; +$lang->upgrade->fromVersions['7_1'] = '7.1'; +$lang->upgrade->fromVersions['7_2'] = '7.2'; +$lang->upgrade->fromVersions['7_2_4'] = '7.2.4'; +$lang->upgrade->fromVersions['7_2_5'] = '7.2.5'; +$lang->upgrade->fromVersions['7_3'] = '7.3'; +$lang->upgrade->fromVersions['7_4_beta'] = '7.4.beta'; +$lang->upgrade->fromVersions['8_0'] = '8.0'; +$lang->upgrade->fromVersions['8_0_1'] = '8.0.1'; +$lang->upgrade->fromVersions['8_1'] = '8.1'; +$lang->upgrade->fromVersions['8_1_3'] = '8.1.3'; +$lang->upgrade->fromVersions['8_2_beta'] = '8.2.beta'; +$lang->upgrade->fromVersions['8_2'] = '8.2'; +$lang->upgrade->fromVersions['8_2_1'] = '8.2.1'; +$lang->upgrade->fromVersions['8_2_2'] = '8.2.2'; +$lang->upgrade->fromVersions['8_2_3'] = '8.2.3'; +$lang->upgrade->fromVersions['8_2_4'] = '8.2.4'; +$lang->upgrade->fromVersions['8_2_5'] = '8.2.5'; +$lang->upgrade->fromVersions['8_2_6'] = '8.2.6'; +$lang->upgrade->fromVersions['8_3'] = '8.3'; +$lang->upgrade->fromVersions['8_3_1'] = '8.3.1'; +$lang->upgrade->fromVersions['8_4'] = '8.4'; +$lang->upgrade->fromVersions['8_4_1'] = '8.4.1'; +$lang->upgrade->fromVersions['9_0_beta'] = '9.0.beta'; +$lang->upgrade->fromVersions['9_0'] = '9.0'; +$lang->upgrade->fromVersions['9_0_1'] = '9.0.1'; +$lang->upgrade->fromVersions['9_1'] = '9.1'; +$lang->upgrade->fromVersions['9_1_1'] = '9.1.1'; +$lang->upgrade->fromVersions['9_1_2'] = '9.1.2'; +$lang->upgrade->fromVersions['9_2'] = '9.2'; +$lang->upgrade->fromVersions['9_2_1'] = '9.2.1'; +$lang->upgrade->fromVersions['9_3_beta'] = '9.3.beta'; +$lang->upgrade->fromVersions['9_4'] = '9.4'; +$lang->upgrade->fromVersions['9_5'] = '9.5'; +$lang->upgrade->fromVersions['9_5_1'] = '9.5.1'; +$lang->upgrade->fromVersions['9_6'] = '9.6'; +$lang->upgrade->fromVersions['9_6_1'] = '9.6.1'; +$lang->upgrade->fromVersions['9_6_2'] = '9.6.2'; +$lang->upgrade->fromVersions['9_6_3'] = '9.6.3'; +$lang->upgrade->fromVersions['9_7'] = '9.7'; +$lang->upgrade->fromVersions['9_8'] = '9.8'; +$lang->upgrade->fromVersions['9_8_1'] = '9.8.1'; +$lang->upgrade->fromVersions['9_8_2'] = '9.8.2'; +$lang->upgrade->fromVersions['9_8_3'] = '9.8.3'; +$lang->upgrade->fromVersions['10_0_alpha'] = '10.0.alpha'; +$lang->upgrade->fromVersions['10_0_beta'] = '10.0.beta'; +$lang->upgrade->fromVersions['10_0'] = '10.0'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index f7c6fdf6a0..3797703d94 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -45,95 +45,4 @@ $lang->upgrade->sureExecute = '确认执行'; $lang->upgrade->forbiddenExt = '以下插件与新版本不兼容，已经自动禁用：'; $lang->upgrade->updateFile = '需要更新附件信息。'; -$lang->upgrade->fromVersions['0_3beta'] = '0.3 BETA'; -$lang->upgrade->fromVersions['0_4beta'] = '0.4 BETA'; -$lang->upgrade->fromVersions['0_5beta'] = '0.5 BETA'; -$lang->upgrade->fromVersions['0_6beta'] = '0.6 BETA'; -$lang->upgrade->fromVersions['1_0beta'] = '1.0 BETA'; -$lang->upgrade->fromVersions['1_0rc1'] = '1.0 RC1'; -$lang->upgrade->fromVersions['1_0rc2'] = '1.0 RC2'; -$lang->upgrade->fromVersions['1_0'] = '1.0 STABLE'; -$lang->upgrade->fromVersions['1_0_1'] = '1.0.1'; -$lang->upgrade->fromVersions['1_1'] = '1.1'; -$lang->upgrade->fromVersions['1_2'] = '1.2'; -$lang->upgrade->fromVersions['1_3'] = '1.3'; -$lang->upgrade->fromVersions['1_4'] = '1.4'; -$lang->upgrade->fromVersions['1_5'] = '1.5'; -$lang->upgrade->fromVersions['2_0'] = '2.0'; -$lang->upgrade->fromVersions['2_1'] = '2.1'; -$lang->upgrade->fromVersions['2_2'] = '2.2'; -$lang->upgrade->fromVersions['2_3'] = '2.3'; -$lang->upgrade->fromVersions['2_4'] = '2.4'; -$lang->upgrade->fromVersions['3_0_beta1'] = '3.0 BETA1'; -$lang->upgrade->fromVersions['3_0_beta2'] = '3.0 BETA2'; -$lang->upgrade->fromVersions['3_0'] = '3.0 STABLE'; -$lang->upgrade->fromVersions['3_1'] = '3.1'; -$lang->upgrade->fromVersions['3_2'] = '3.2'; -$lang->upgrade->fromVersions['3_2_1'] = '3.2.1'; -$lang->upgrade->fromVersions['3_3'] = '3.3'; -$lang->upgrade->fromVersions['4_0_beta1'] = '4.0 BETA1'; -$lang->upgrade->fromVersions['4_0_beta2'] = '4.0 BETA2'; -$lang->upgrade->fromVersions['4_0'] = '4.0'; -$lang->upgrade->fromVersions['4_0_1'] = '4.0.1'; -$lang->upgrade->fromVersions['4_1'] = '4.1'; -$lang->upgrade->fromVersions['4_2_beta'] = '4.2.beta'; -$lang->upgrade->fromVersions['4_3_beta'] = '4.3.beta'; -$lang->upgrade->fromVersions['5_0_beta1'] = '5.0.beta1'; -$lang->upgrade->fromVersions['5_0_beta2'] = '5.0.beta2'; -$lang->upgrade->fromVersions['5_0'] = '5.0'; -$lang->upgrade->fromVersions['5_1'] = '5.1'; -$lang->upgrade->fromVersions['5_2'] = '5.2'; -$lang->upgrade->fromVersions['5_2_1'] = '5.2.1'; -$lang->upgrade->fromVersions['5_3'] = '5.3'; -$lang->upgrade->fromVersions['6_0_beta1'] = '6.0.beta1'; -$lang->upgrade->fromVersions['6_0'] = '6.0'; -$lang->upgrade->fromVersions['6_1'] = '6.1'; -$lang->upgrade->fromVersions['6_2'] = '6.2'; -$lang->upgrade->fromVersions['6_3'] = '6.3'; -$lang->upgrade->fromVersions['6_4'] = '6.4'; -$lang->upgrade->fromVersions['7_0'] = '7.0'; -$lang->upgrade->fromVersions['7_1'] = '7.1'; -$lang->upgrade->fromVersions['7_2'] = '7.2'; -$lang->upgrade->fromVersions['7_2_4'] = '7.2.4'; -$lang->upgrade->fromVersions['7_2_5'] = '7.2.5'; -$lang->upgrade->fromVersions['7_3'] = '7.3'; -$lang->upgrade->fromVersions['7_4_beta'] = '7.4.beta'; -$lang->upgrade->fromVersions['8_0'] = '8.0'; -$lang->upgrade->fromVersions['8_0_1'] = '8.0.1'; -$lang->upgrade->fromVersions['8_1'] = '8.1'; -$lang->upgrade->fromVersions['8_1_3'] = '8.1.3'; -$lang->upgrade->fromVersions['8_2_beta'] = '8.2.beta'; -$lang->upgrade->fromVersions['8_2'] = '8.2'; -$lang->upgrade->fromVersions['8_2_1'] = '8.2.1'; -$lang->upgrade->fromVersions['8_2_2'] = '8.2.2'; -$lang->upgrade->fromVersions['8_2_3'] = '8.2.3'; -$lang->upgrade->fromVersions['8_2_4'] = '8.2.4'; -$lang->upgrade->fromVersions['8_2_5'] = '8.2.5'; -$lang->upgrade->fromVersions['8_2_6'] = '8.2.6'; -$lang->upgrade->fromVersions['8_3'] = '8.3'; -$lang->upgrade->fromVersions['8_3_1'] = '8.3.1'; -$lang->upgrade->fromVersions['8_4'] = '8.4'; -$lang->upgrade->fromVersions['8_4_1'] = '8.4.1'; -$lang->upgrade->fromVersions['9_0_beta'] = '9.0.beta'; -$lang->upgrade->fromVersions['9_0'] = '9.0'; -$lang->upgrade->fromVersions['9_0_1'] = '9.0.1'; -$lang->upgrade->fromVersions['9_1'] = '9.1'; -$lang->upgrade->fromVersions['9_1_1'] = '9.1.1'; -$lang->upgrade->fromVersions['9_1_2'] = '9.1.2'; -$lang->upgrade->fromVersions['9_2'] = '9.2'; -$lang->upgrade->fromVersions['9_2_1'] = '9.2.1'; -$lang->upgrade->fromVersions['9_3_beta'] = '9.3.beta'; -$lang->upgrade->fromVersions['9_4'] = '9.4'; -$lang->upgrade->fromVersions['9_5'] = '9.5'; -$lang->upgrade->fromVersions['9_5_1'] = '9.5.1'; -$lang->upgrade->fromVersions['9_6'] = '9.6'; -$lang->upgrade->fromVersions['9_6_1'] = '9.6.1'; -$lang->upgrade->fromVersions['9_6_2'] = '9.6.2'; -$lang->upgrade->fromVersions['9_6_3'] = '9.6.3'; -$lang->upgrade->fromVersions['9_7'] = '9.7'; -$lang->upgrade->fromVersions['9_8'] = '9.8'; -$lang->upgrade->fromVersions['9_8_1'] = '9.8.1'; -$lang->upgrade->fromVersions['9_8_2'] = '9.8.2'; -$lang->upgrade->fromVersions['9_8_3'] = '9.8.3'; -$lang->upgrade->fromVersions['10_0_alpha'] = '10.0.alpha'; -$lang->upgrade->fromVersions['10_0_beta'] = '10.0.beta'; +include dirname(__FILE__) . '/version.php'; diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php index 9a614f7a4d..f0e38d8e7c 100644 --- a/module/upgrade/lang/zh-tw.php +++ b/module/upgrade/lang/zh-tw.php @@ -45,95 +45,4 @@ $lang->upgrade->sureExecute = '確認執行'; $lang->upgrade->forbiddenExt = '以下插件與新版本不兼容，已經自動禁用：'; $lang->upgrade->updateFile = '需要更新附件信息。'; -$lang->upgrade->fromVersions['0_3beta'] = '0.3 BETA'; -$lang->upgrade->fromVersions['0_4beta'] = '0.4 BETA'; -$lang->upgrade->fromVersions['0_5beta'] = '0.5 BETA'; -$lang->upgrade->fromVersions['0_6beta'] = '0.6 BETA'; -$lang->upgrade->fromVersions['1_0beta'] = '1.0 BETA'; -$lang->upgrade->fromVersions['1_0rc1'] = '1.0 RC1'; -$lang->upgrade->fromVersions['1_0rc2'] = '1.0 RC2'; -$lang->upgrade->fromVersions['1_0'] = '1.0 STABLE'; -$lang->upgrade->fromVersions['1_0_1'] = '1.0.1'; -$lang->upgrade->fromVersions['1_1'] = '1.1'; -$lang->upgrade->fromVersions['1_2'] = '1.2'; -$lang->upgrade->fromVersions['1_3'] = '1.3'; -$lang->upgrade->fromVersions['1_4'] = '1.4'; -$lang->upgrade->fromVersions['1_5'] = '1.5'; -$lang->upgrade->fromVersions['2_0'] = '2.0'; -$lang->upgrade->fromVersions['2_1'] = '2.1'; -$lang->upgrade->fromVersions['2_2'] = '2.2'; -$lang->upgrade->fromVersions['2_3'] = '2.3'; -$lang->upgrade->fromVersions['2_4'] = '2.4'; -$lang->upgrade->fromVersions['3_0_beta1'] = '3.0 BETA1'; -$lang->upgrade->fromVersions['3_0_beta2'] = '3.0 BETA2'; -$lang->upgrade->fromVersions['3_0'] = '3.0 STABLE'; -$lang->upgrade->fromVersions['3_1'] = '3.1'; -$lang->upgrade->fromVersions['3_2'] = '3.2'; -$lang->upgrade->fromVersions['3_2_1'] = '3.2.1'; -$lang->upgrade->fromVersions['3_3'] = '3.3'; -$lang->upgrade->fromVersions['4_0_beta1'] = '4.0 BETA1'; -$lang->upgrade->fromVersions['4_0_beta2'] = '4.0 BETA2'; -$lang->upgrade->fromVersions['4_0'] = '4.0'; -$lang->upgrade->fromVersions['4_0_1'] = '4.0.1'; -$lang->upgrade->fromVersions['4_1'] = '4.1'; -$lang->upgrade->fromVersions['4_2_beta'] = '4.2.beta'; -$lang->upgrade->fromVersions['4_3_beta'] = '4.3.beta'; -$lang->upgrade->fromVersions['5_0_beta1'] = '5.0.beta1'; -$lang->upgrade->fromVersions['5_0_beta2'] = '5.0.beta2'; -$lang->upgrade->fromVersions['5_0'] = '5.0'; -$lang->upgrade->fromVersions['5_1'] = '5.1'; -$lang->upgrade->fromVersions['5_2'] = '5.2'; -$lang->upgrade->fromVersions['5_2_1'] = '5.2.1'; -$lang->upgrade->fromVersions['5_3'] = '5.3'; -$lang->upgrade->fromVersions['6_0_beta1'] = '6.0.beta1'; -$lang->upgrade->fromVersions['6_0'] = '6.0'; -$lang->upgrade->fromVersions['6_1'] = '6.1'; -$lang->upgrade->fromVersions['6_2'] = '6.2'; -$lang->upgrade->fromVersions['6_3'] = '6.3'; -$lang->upgrade->fromVersions['6_4'] = '6.4'; -$lang->upgrade->fromVersions['7_0'] = '7.0'; -$lang->upgrade->fromVersions['7_1'] = '7.1'; -$lang->upgrade->fromVersions['7_2'] = '7.2'; -$lang->upgrade->fromVersions['7_2_4'] = '7.2.4'; -$lang->upgrade->fromVersions['7_2_5'] = '7.2.5'; -$lang->upgrade->fromVersions['7_3'] = '7.3'; -$lang->upgrade->fromVersions['7_4_beta'] = '7.4.beta'; -$lang->upgrade->fromVersions['8_0'] = '8.0'; -$lang->upgrade->fromVersions['8_0_1'] = '8.0.1'; -$lang->upgrade->fromVersions['8_1'] = '8.1'; -$lang->upgrade->fromVersions['8_1_3'] = '8.1.3'; -$lang->upgrade->fromVersions['8_2_beta'] = '8.2.beta'; -$lang->upgrade->fromVersions['8_2'] = '8.2'; -$lang->upgrade->fromVersions['8_2_1'] = '8.2.1'; -$lang->upgrade->fromVersions['8_2_2'] = '8.2.2'; -$lang->upgrade->fromVersions['8_2_3'] = '8.2.3'; -$lang->upgrade->fromVersions['8_2_4'] = '8.2.4'; -$lang->upgrade->fromVersions['8_2_5'] = '8.2.5'; -$lang->upgrade->fromVersions['8_2_6'] = '8.2.6'; -$lang->upgrade->fromVersions['8_3'] = '8.3'; -$lang->upgrade->fromVersions['8_3_1'] = '8.3.1'; -$lang->upgrade->fromVersions['8_4'] = '8.4'; -$lang->upgrade->fromVersions['8_4_1'] = '8.4.1'; -$lang->upgrade->fromVersions['9_0_beta'] = '9.0.beta'; -$lang->upgrade->fromVersions['9_0'] = '9.0'; -$lang->upgrade->fromVersions['9_0_1'] = '9.0.1'; -$lang->upgrade->fromVersions['9_1'] = '9.1'; -$lang->upgrade->fromVersions['9_1_1'] = '9.1.1'; -$lang->upgrade->fromVersions['9_1_2'] = '9.1.2'; -$lang->upgrade->fromVersions['9_2'] = '9.2'; -$lang->upgrade->fromVersions['9_2_1'] = '9.2.1'; -$lang->upgrade->fromVersions['9_3_beta'] = '9.3.beta'; -$lang->upgrade->fromVersions['9_4'] = '9.4'; -$lang->upgrade->fromVersions['9_5'] = '9.5'; -$lang->upgrade->fromVersions['9_5_1'] = '9.5.1'; -$lang->upgrade->fromVersions['9_6'] = '9.6'; -$lang->upgrade->fromVersions['9_6_1'] = '9.6.1'; -$lang->upgrade->fromVersions['9_6_2'] = '9.6.2'; -$lang->upgrade->fromVersions['9_6_3'] = '9.6.3'; -$lang->upgrade->fromVersions['9_7'] = '9.7'; -$lang->upgrade->fromVersions['9_8'] = '9.8'; -$lang->upgrade->fromVersions['9_8_1'] = '9.8.1'; -$lang->upgrade->fromVersions['9_8_2'] = '9.8.2'; -$lang->upgrade->fromVersions['9_8_3'] = '9.8.3'; -$lang->upgrade->fromVersions['10_0_alpha'] = '10.0.alpha'; -$lang->upgrade->fromVersions['10_0_beta'] = '10.0.beta'; +include dirname(__FILE__) . '/version.php';