* merge master

This commit is contained in:
wangzemei
2022-09-23 16:51:34 +08:00
21 changed files with 4087 additions and 28 deletions
+1 -1
View File
@@ -1 +1 @@
17.6.1
17.6.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.6.1'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
$config->version = '17.6.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
+37
View File
@@ -1,3 +1,40 @@
2022-09-23 17.6.2
完成的需求
开源版:
37324 敏捷项目下的迭代列表没有任务时中,隐藏名称前的展开、收起按钮
36946 私有产品的访问权限增加项目集负责人(反馈)
32322 Bug批量导入页面中先校验必填字段再校验重复数据
36977 增加全局头像下拉菜单的点击热区面积
67327 实现禅道中文件上传组件支持选择一次性多个文件(反馈)
37262 列表中“所有”标签修改为“全部”
37866 项目集列表中名称字段样式优化
37869 删除项目集列表中项目的图标
37862 项目集列表删除“显示已关闭”的勾选按钮
37868 项目集列表操作列的更多按钮调整
37861 用例列表操作列交换开始和结果按钮的位置
37854 bug列表确认字段的内容颜色调整
37864 项目集列表中延期标签位置调整
37833 叶兰绿主题风格更新
37842 禅道蓝主题风格更新
37813 列表中优先级颜色调整
37816 列表检索标签选中样式优化
38002 多人串行任务中,团队日志页去掉操作区域
38006 多人串行任务开始任务的弹窗,总计消耗改名为我的总消耗
37997 多人串行任务,用户打开工时填写页,默认打开我的日志页
37993 工时记录页,日期、工作内容、消耗、剩余增加必填项校验(开源版不校验工作内容)
37218 调整看板区域标题栏名称的对齐方式
37207 去掉看板中选中单个产品规划的背景
37206 调整看板区域检索标签组件样式
37132 将指派他人的待办列表中“由谁指派”字段修改为“指派给”
37831 项目统计报表增加权限判断,过滤掉没有访问权限的项目
32626 产品统计报表增加权限判断,过滤掉没有访问权限的产品
37064 长期项目的概况上计划完成显示“长期”
企业版:
37221 组织日志列表增加项目字段
35025 需求导入模板增加由谁评审字段
旗舰版:
35042 旗舰版周报3个工作项列表能显示总数
2022-09-08 17.6.1
完成的需求
开源版:
+1 -1
View File
@@ -393,7 +393,7 @@
<?php if($bug->case):?>
<tr>
<th><?php echo $lang->bug->fromCase;?></th>
<td><?php echo html::a($this->createLink('testcase', 'view', "caseID=$bug->case&caseVersion=" . ($bug->testtask ? "&from=testtask&taskID={$bug->testtask}" : ''), '', true), "#$bug->case $bug->caseTitle", '', "class='iframe' data-width='80%'");?></td>
<td><?php echo html::a($this->createLink('testcase', 'view', "caseID=$bug->case&caseVersion=$bug->caseVersion", '', true), "#$bug->case $bug->caseTitle", '', "class='iframe' data-width='80%'");?></td>
</tr>
<?php endif;?>
<?php if($bug->toCases):?>
+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.6.2'] = '2022-09-23';
$lang->misc->releaseDate['17.6.1'] = '2022-09-08';
$lang->misc->releaseDate['17.6'] = '2022-08-26';
$lang->misc->releaseDate['17.5'] = '2022-08-11';
@@ -189,6 +190,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.6.2'][] = array('title' => "3 themes in ZenTao including Green, ZenTao Blue, and Young Blue are updated. At the same time, the attachments could be uploaded in bulk in ZenTao. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.6.1'][] = array('title' => "Optimized the processing logic of multi-member tasks. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.6'][] = array('title' => "The processing logic of requirements is optimized, and the permissions of user requirements and soft requirements are split. Gantt chart supports manual drag and drop to manage task relationship. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.5'][] = array('title' => "Provide efficient visual statistical tools. Optimize ZenTao performance, the database engine is adjusted from MyISAM to InnoDB. Gantt chart is optimized and upgraded, and the Copy items of the Max version can replicate more information. 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.6.2'] = '2022-09-23';
$lang->misc->releaseDate['17.6.1'] = '2022-09-08';
$lang->misc->releaseDate['17.6'] = '2022-08-26';
$lang->misc->releaseDate['17.5'] = '2022-08-11';
@@ -189,6 +190,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.6.2'][] = array('title' => "3 themes in ZenTao including Green, ZenTao Blue, and Young Blue are updated. At the same time, the attachments could be uploaded in bulk in ZenTao. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.6.1'][] = array('title' => "Optimized the processing logic of multi-member tasks. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.6'][] = array('title' => "The processing logic of requirements is optimized, and the permissions of user requirements and soft requirements are split. Gantt chart supports manual drag and drop to manage task relationship. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.5'][] = array('title' => "Provide efficient visual statistical tools. Optimize ZenTao performance, the database engine is adjusted from MyISAM to InnoDB. Gantt chart is optimized and upgraded, and the Copy items of the Max version can replicate more information. 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.6.2'] = '2022-09-23';
$lang->misc->releaseDate['17.6.1'] = '2022-09-08';
$lang->misc->releaseDate['17.6'] = '2022-08-26';
$lang->misc->releaseDate['17.5'] = '2022-08-11';
@@ -189,6 +190,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.6.2'][] = array('title' => "3 themes in ZenTao including Green, ZenTao Blue, and Young Blue are updated. At the same time, the attachments could be uploaded in bulk in ZenTao. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.6.1'][] = array('title' => "Optimized the processing logic of multi-member tasks. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.6'][] = array('title' => "The processing logic of requirements is optimized, and the permissions of user requirements and soft requirements are split. Gantt chart supports manual drag and drop to manage task relationship. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.5'][] = array('title' => "Provide efficient visual statistical tools. Optimize ZenTao performance, the database engine is adjusted from MyISAM to InnoDB. Gantt chart is optimized and upgraded, and the Copy items of the Max version can replicate more information. 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.6.2'] = '2022-09-23';
$lang->misc->releaseDate['17.6.1'] = '2022-09-08';
$lang->misc->releaseDate['17.6'] = '2022-08-26';
$lang->misc->releaseDate['17.5'] = '2022-08-11';
@@ -189,6 +190,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.6.2'][] = array('title' => '禅道更新叶兰绿、禅道蓝、青春蓝三大主题。实现附件批量上传功能。修复Bug。', 'desc' => '');
$lang->misc->feature->all['17.6.1'][] = array('title' => '优化了多人任务的处理逻辑,修复Bug。', 'desc' => '');
$lang->misc->feature->all['17.6'][] = array('title' => '优化了需求的处理逻辑,拆分了用需和软需的权限。甘特图支持手动拖拽维护任务关系。修复Bug。', 'desc' => '');
$lang->misc->feature->all['17.5'][] = array('title' => '提供高效的可视化统计工具。优化禅道性能,数据库引擎从MyISAM调整为InnoDB。甘特图优化升级,旗舰版的复制项目可以复制任务等更多信息。修复Bug。', 'desc' => '');
+11 -10
View File
@@ -9,16 +9,17 @@
* @version $Id: en.php 5080 2013-07-10 00:46:59Z wyd621@gmail.com $
* @link http://www.zentao.net
*/
$lang->report->index = 'Home';
$lang->report->list = 'Liste';
$lang->report->item = 'Eintrag';
$lang->report->value = 'Wert';
$lang->report->percent = '%';
$lang->report->undefined = 'Undefiniert';
$lang->report->query = 'Abfrage';
$lang->report->annual = 'Annual Summary';
$lang->report->project = 'Project';
$lang->report->PO = 'PO';
$lang->report->index = 'Home';
$lang->report->list = 'Liste';
$lang->report->item = 'Eintrag';
$lang->report->value = 'Wert';
$lang->report->percent = '%';
$lang->report->undefined = 'Undefiniert';
$lang->report->query = 'Abfrage';
$lang->report->annual = 'Annual Summary';
$lang->report->project = 'Project';
$lang->report->PO = 'PO';
$lang->report->viewEveryoneAnnual = 'View everyone annual summary';
$lang->report->colors[] = 'AFD8F8';
$lang->report->colors[] = 'AFD8F8';
+11 -10
View File
@@ -9,16 +9,17 @@
* @version $Id: en.php 5080 2013-07-10 00:46:59Z wyd621@gmail.com $
* @link http://www.zentao.net
*/
$lang->report->index = 'Accueil Rapports';
$lang->report->list = 'Rapports';
$lang->report->item = 'Item';
$lang->report->value = 'Valeur';
$lang->report->percent = '%';
$lang->report->undefined = 'N/D';
$lang->report->query = 'Requête';
$lang->report->annual = 'Résumé Annuel';
$lang->report->project = 'Project';
$lang->report->PO = 'PO';
$lang->report->index = 'Accueil Rapports';
$lang->report->list = 'Rapports';
$lang->report->item = 'Item';
$lang->report->value = 'Valeur';
$lang->report->percent = '%';
$lang->report->undefined = 'N/D';
$lang->report->query = 'Requête';
$lang->report->annual = 'Résumé Annuel';
$lang->report->project = 'Project';
$lang->report->PO = 'PO';
$lang->report->viewEveryoneAnnual = 'View everyone annual summary';
$lang->report->colors[] = 'AFD8F8';
$lang->report->colors[] = 'AFD8F8';
+2
View File
@@ -25,6 +25,7 @@ $config->upgrade->maxVersion['max3_5'] = '17_4';
$config->upgrade->maxVersion['max3_6'] = '17_5';
$config->upgrade->maxVersion['max3_6_1'] = '17_6';
$config->upgrade->maxVersion['max3_6_2'] = '17_6_1';
$config->upgrade->maxVersion['max3_6_3'] = '17_6_2';
$config->upgrade->bizVersion = array();
$config->upgrade->bizVersion['biz1_0'] = '9_5_1';
@@ -88,6 +89,7 @@ $config->upgrade->bizVersion['biz7_4'] = '17_4';
$config->upgrade->bizVersion['biz7_5'] = '17_5';
$config->upgrade->bizVersion['biz7_6'] = '17_6';
$config->upgrade->bizVersion['biz7_6_1'] = '17_6_1';
$config->upgrade->bizVersion['biz7_6_2'] = '17_6_2';
$config->upgrade->proVersion = array();
$config->upgrade->proVersion['pro1_0'] = '3_1';
+3
View File
@@ -166,6 +166,7 @@ $lang->upgrade->fromVersions['17_4'] = '17.4';
$lang->upgrade->fromVersions['17_5'] = '17.5';
$lang->upgrade->fromVersions['17_6'] = '17.6';
$lang->upgrade->fromVersions['17_6_1'] = '17.6.1';
$lang->upgrade->fromVersions['17_6_2'] = '17.6.2';
global $config;
/* Lite. */
@@ -336,6 +337,7 @@ $lang->upgrade->fromVersions['biz7_4'] = 'Biz7.4';
$lang->upgrade->fromVersions['biz7_5'] = 'Biz7.5';
$lang->upgrade->fromVersions['biz7_6'] = 'Biz7.6';
$lang->upgrade->fromVersions['biz7_6_1'] = 'Biz7.6.1';
$lang->upgrade->fromVersions['biz7_6_2'] = 'Biz7.6.2';
/* Max. */
$lang->upgrade->fromVersions['max2_0_beta4'] = 'Max2.0.beta4';
@@ -362,3 +364,4 @@ $lang->upgrade->fromVersions['max3_4'] = 'Max3.4';
$lang->upgrade->fromVersions['max3_5'] = 'Max3.5';
$lang->upgrade->fromVersions['max3_6'] = 'Max3.6';
$lang->upgrade->fromVersions['max3_6_1'] = 'Max3.6.1';
$lang->upgrade->fromVersions['max3_6_2'] = 'Max3.6.2';
+2
View File
@@ -1027,6 +1027,8 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('17.5'));
case '17_6':
$confirmContent .= file_get_contents($this->getUpgradeFile('17.6'));
case '17_6_1':
$confirmContent .= file_get_contents($this->getUpgradeFile('17.6.1'));
}
return $confirmContent;
+1 -1
View File
@@ -1,3 +1,3 @@
#mainContent td.projectName {white-space: nowrap; overflow-x: hidden;}
#pageNav .angle-btn:first-child a.btn {max-width: 300px; overflow: hidden;}
.totalCount {margin-top: 15px !important; font-weight: bold; text-align: right; padding: 8px 50px 8px 8px;}
.totalCount {height: 36px !important; line-height: 30px; font-weight: bold; text-align: right !important; padding: 0px 50px 0px 8px !important; width: 100%;}
+3 -3
View File
@@ -88,9 +88,9 @@
<td class='text-left'><?php echo zget($users, $task->finishedBy);?></td>
</tr>
<?php endforeach;?>
<td colspan='6' class='totalCount'><?php echo sprintf($lang->weekly->totalCount, count($finished));?></tr>
</tbody>
</table>
<div class='table totalCount'><?php echo sprintf($lang->weekly->totalCount, count($finished));?></div>
<div class='page-title'><h4><?php echo $lang->weekly->postponed;?></h4></div>
<table class='table has-sort-head table-fixed'>
@@ -121,9 +121,9 @@
<td class='text-left'><?php echo $task->progress;?>%</td>
</tr>
<?php endforeach;?>
<td colspan='7' class='totalCount'><?php echo sprintf($lang->weekly->totalCount, count($postponed));?></tr>
</tbody>
</table>
<div class='table totalCount'><?php echo sprintf($lang->weekly->totalCount, count($postponed));?></div>
<div class='page-title'><h4><?php echo $lang->weekly->nextWeek;?></h4></div>
<table class='table has-sort-head table-fixed'>
@@ -150,9 +150,9 @@
<td class='text-left'><?php echo $task->deadline;?></td>
</tr>
<?php endforeach;?>
<td colspan='5' class='totalCount'><?php echo sprintf($lang->weekly->totalCount, count($nextWeek));?></tr>
</tbody>
</table>
<div class='table totalCount'><?php echo sprintf($lang->weekly->totalCount, count($nextWeek));?></div>
<div class='page-title'><h4><?php echo $lang->weekly->workloadByType;?></h4></div>
<table class='table has-sort-head table-fixed'>
File diff suppressed because one or more lines are too long
Binary file not shown.
+3
View File
@@ -245,6 +245,9 @@
<glyph unicode="&#xe9de;" glyph-name="file-log" d="M837.818-126.339c0-51.414-41.677-93.091-93.091-93.091h-605.091c-51.413 0-93.091 41.677-93.091 93.091v837.819c0 51.413 41.678 93.091 93.091 93.091h432.361l265.822-276.027v-189.428h93.091c25.707 0 46.546-20.838 46.546-46.546v-325.818c0-25.707-20.838-46.546-46.546-46.546h-93.091v-46.546zM376.51 246.025h-50.693v-232.727h139.637v40.565h-88.944v192.163zM584.667 246.025c-35.835 0-64.661-11.064-86.482-33.196-21.821-22.127-32.73-50.818-32.73-86.072 0-33.318 10.678-60.555 32.037-81.716 21.355-21.164 49.133-31.744 83.325-31.744 35.016 0 63.33 10.92 84.941 32.759 21.615 21.839 32.423 50.288 32.423 85.351 0 33.606-10.399 61.11-31.191 82.511-20.792 21.406-48.235 32.108-82.326 32.108zM815.715 246.025c-35.244 0-63.642-11.115-85.197-33.34s-32.335-51.065-32.335-86.509c0-34.965 9.794-62.515 29.385-82.66 19.586-20.145 46.318-30.217 80.184-30.217 30.296 0 55.836 6.344 76.614 19.032v111.858h-88.288v-38.498h42.976v-46.196c-7.503-3.873-17.161-5.809-28.97-5.809-19.86 0-35.537 6.586-47.025 19.754-11.487 13.173-17.231 31.525-17.231 55.059 0 23.147 6.363 41.793 19.084 55.933 12.726 14.136 29.337 21.207 49.841 21.207 23.798 0 43.939-5.083 60.416-15.253v45.47c-16.938 6.781-36.752 10.171-59.453 10.171zM583.127 204.479c19.615 0 34.812-6.805 45.591-20.41 10.779-13.61 16.174-32.13 16.174-55.57 0-22.468-5.549-40.359-16.635-53.676-11.091-13.317-26.596-19.977-46.518-19.977-19.507 0-34.858 6.949-46.052 20.847-11.189 13.898-16.789 31.791-16.789 53.681 0 22.174 5.725 40.239 17.175 54.184 11.451 13.95 27.136 20.922 47.053 20.922zM567.855 716.274v-181.667h181.667l-181.667 181.667zM279.273-79.793c-25.706 0-46.546 20.838-46.546 46.546v325.818c0 25.707 20.839 46.546 46.546 46.546h502.691l0.035 140.725c-3.262-0.717-6.615-1.088-10.006-1.088h-213.448c-25.707 0-46.546 20.839-46.546 46.546v213.447c0 3.428 0.371 6.771 1.074 9.989l-373.438-0.018c-18.984 0-34.649-14.205-36.946-32.565l-0.29-4.671v-837.819c0-18.981 14.205-34.649 32.565-36.948l4.671-0.288h605.091c18.981 0 34.649 14.205 36.948 32.567v51.214h-502.403z" />
<glyph unicode="&#xe9df;" glyph-name="sub-review" horiz-adv-x="956" d="M443.733 702.171v-68.267h-341.333v-750.933h682.667v504.698h68.267v-572.964h-819.2v887.467zM513.974 540.878l96.447-96.544 242.703 242.607 48.272-48.272-290.879-290.879-144.815 144.815zM477.867 190.171v-68.267h-273.067v68.267zM682.667 53.638v-68.267h-477.867v68.267z" />
<glyph unicode="&#xe9e0;" glyph-name="blame" d="M702.761 767.792c134.683 0 209.717-64.921 214.729-184.704l0.274-13.035v-498.304c0.016-7.906-3.223-15.529-9.081-21.374s-13.913-9.479-22.574-10.192c-8.663-0.715-17.305 1.545-24.226 6.334-6.917 4.789-11.616 11.76-13.166 19.536l-0.555 5.696v498.304c0 93.333-44.544 134.464-145.403 134.464-96.747 0-143.385-38.094-149.785-122.631l-0.626-11.833v-553.666c0-128.201-76.357-197.737-217.234-197.737-136.007 0-212.014 64.791-217.513 184.704l-0.279 13.033v498.299c-0.016 7.906 3.225 15.531 9.083 21.374s13.913 9.479 22.574 10.192c8.663 0.715 17.303-1.545 24.222-6.334s11.616-11.76 13.168-19.538l0.555-5.696v-498.24c0.279-93.269 45.73-134.523 148.185-134.523 98.142 0 143.733 37.838 147.422 123.074l0.208 11.39v554.551c3.899 127.755 80.951 196.853 220.018 196.853zM30.315 626.203c0-29.159 11.584-57.125 32.201-77.744s48.585-32.201 77.744-32.201c29.159 0 57.125 11.584 77.744 32.201s32.201 48.583 32.201 77.744c0 29.161-11.584 57.125-32.201 77.744s-48.583 32.201-77.744 32.201c-29.161 0-57.125-11.584-77.744-32.201s-32.201-48.583-32.201-77.744v0zM761.159-38.202c0-29.159 11.582-57.122 32.203-77.742s48.585-32.203 77.742-32.203c29.159 0 57.122 11.582 77.742 32.203s32.203 48.585 32.203 77.742c0 29.163-11.582 57.129-32.203 77.742-20.619 20.619-48.585 32.203-77.742 32.203s-57.122-11.582-77.742-32.203c-20.619-20.615-32.203-48.581-32.203-77.742v0z" />
<glyph unicode="&#xe9e1;" glyph-name="table-sort" horiz-adv-x="1182" d="M469.702 526.874l-196.923 277.696-196.923-277.696h148.674v-746.303h94.147v746.303h151.024zM709.625 58.268l196.922-277.696 196.923 277.696h-148.677v746.303h-94.145v-746.303h-151.023z" />
<glyph unicode="&#xe9e2;" glyph-name="appose" d="M116.364-33.247h279.272v-93.091h-372.363v837.818h372.363v-93.090h-279.272v-651.637zM628.364-33.247h93.090v-93.091h-93.090v93.091zM768-33.247h93.090v-93.091h-93.090v93.091zM907.636-126.338v93.090h93.091v-93.090h-93.091zM907.636 199.48v93.091h93.091v-93.090l-93.091-0.001zM907.636 59.844v93.090h93.091v-93.090h-93.091zM907.636 339.116v93.091h93.091v-93.090l-93.091-0.001zM907.636 478.753v93.090h93.091v-93.090h-93.091zM907.636 618.389v93.092h93.091v-93.090l-93.091-0.002zM861.091 618.389h-93.091v93.092h93.090v-93.090l0.001-0.002zM721.455 618.389h-93.091v93.092h93.090v-93.090l0.001-0.002zM488.727 804.571h93.091v-1024h-93.090v1024h-0.001z" />
<glyph unicode="&#xe9e3;" glyph-name="inline" d="M186.182 688.207v-279.272h-93.091v372.363h837.818v-372.363h-93.090v279.272h-651.637zM186.182 176.207v-93.090h-93.091v93.090h93.091zM186.182 36.571v-93.090h-93.091v93.090h93.091zM93.091-103.065h93.090v-93.091h-93.090v93.091zM418.909-103.065h93.091v-93.091h-93.090l-0.001 93.091zM279.273-103.065h93.090v-93.091h-93.090v93.091zM558.545-103.065h93.091v-93.091h-93.090l-0.001 93.091zM698.182-103.065h93.090v-93.091h-93.090v93.091zM837.818-103.065h93.092v-93.091h-93.090l-0.002 93.091zM837.818-56.52v93.091h93.092v-93.090l-93.092-0.001zM837.818 83.116v93.091h93.092v-93.090l-93.092-0.001zM1024 315.844v-93.091h-1024v93.090l1024 0.001z" />
<glyph unicode="&#xf016;" glyph-name="file, file-empty" horiz-adv-x="878" d="M838.857 587.428c21.143-21.143 38.857-63.429 38.857-93.714v-658.286c0-30.286-24.571-54.857-54.857-54.857h-768c-30.286 0-54.857 24.571-54.857 54.857v914.286c0 30.286 24.571 54.857 54.857 54.857h512c30.286 0 72.571-17.714 93.714-38.857zM585.143 726.857v-214.857h214.857c-3.429 9.714-8.571 19.429-12.571 23.429l-178.857 178.857c-4 4-13.714 9.143-23.429 12.571zM804.571-146.286v585.143h-237.714c-30.286 0-54.857 24.571-54.857 54.857v237.714h-438.857v-877.714h731.429z" />
<glyph unicode="&#xf02d;" glyph-name="book" d="M948.764 510.653c13.529-19.482 17.318-44.918 9.741-69.81l-148.822-490.3c-13.529-45.999-61.152-81.716-107.693-81.716h-499.501c-55.199 0-114.186 43.835-134.21 100.116-8.658 24.352-8.658 48.165-1.083 68.728 1.083 10.823 3.248 21.647 3.789 34.635 0.541 8.658-4.329 15.694-3.248 22.188 2.165 12.988 13.529 22.188 22.188 36.799 16.235 27.058 34.635 70.893 40.587 99.033 2.706 10.281-2.706 22.188 0 31.388 2.706 10.281 12.988 17.859 18.401 27.6 14.612 24.894 33.554 73.058 36.259 98.493 1.083 11.364-4.329 23.811-1.083 32.471 3.789 12.447 15.694 17.859 23.811 28.682 12.988 17.859 34.635 69.269 37.881 97.952 1.083 9.199-4.329 18.401-2.706 28.14 2.165 10.281 15.153 21.106 23.811 33.554 22.728 33.554 27.058 107.693 95.787 88.211l-0.541-1.623c9.199 2.165 18.401 4.871 27.6 4.871h411.831c25.434 0 48.165-11.364 61.694-30.306 14.070-19.482 17.318-44.918 9.741-70.352l-148.281-490.3c-25.434-83.34-39.505-101.74-108.235-101.74h-470.277c-7.035 0-15.694-1.623-20.565-8.117-4.329-6.495-4.871-11.364-0.541-23.269 10.823-31.388 48.165-37.881 77.93-37.881h499.501c20.024 0 43.293 11.364 49.247 30.846l162.352 534.135c3.248 10.281 3.248 21.106 2.706 30.846 12.447-4.871 23.811-12.447 31.929-23.269zM372.959 509.57c-3.248-9.741 2.165-17.318 11.905-17.318h329.032c9.199 0 19.482 7.576 22.728 17.318l11.364 34.635c3.248 9.741-2.165 17.318-11.905 17.318h-329.032c-9.199 0-19.482-7.576-22.728-17.318zM328.043 371.031c-3.248-9.741 2.165-17.318 11.905-17.318h329.032c9.199 0 19.482 7.576 22.728 17.318l11.364 34.635c3.248 9.741-2.165 17.318-11.905 17.318h-329.032c-9.199 0-19.482-7.576-22.728-17.318z" />
<glyph unicode="&#xf064;" glyph-name="share" d="M960.285 412.526c0-8.506-3.502-16.511-9.505-22.514l-256.163-256.163c-6.003-6.003-14.008-9.505-22.514-9.505-17.512 0-32.020 14.509-32.020 32.020v128.082h-112.072c-215.638 0-357.227-41.527-357.227-280.178 0-20.513 1.001-41.025 2.501-61.54 0.5-8.005 2.501-17.011 2.501-25.015 0-9.505-6.003-17.512-16.010-17.512-7.004 0-10.506 3.502-14.008 8.506-7.505 10.506-13.009 26.518-18.511 38.025-28.517 64.041-63.54 155.598-63.54 225.643 0 56.036 5.504 113.572 26.518 166.606 69.545 172.609 273.673 201.628 437.778 201.628h112.072v128.082c0 17.512 14.509 32.020 32.020 32.020 8.506 0 16.511-3.502 22.514-9.505l256.163-256.163c6.003-6.003 9.505-14.008 9.505-22.514z" />

Before

Width:  |  Height:  |  Size: 258 KiB

After

Width:  |  Height:  |  Size: 260 KiB

Binary file not shown.
Binary file not shown.