diff --git a/application/Espo/Core/Export/Xlsx.php b/application/Espo/Core/Export/Xlsx.php index 6e6fe3b7e4..7a30e48af2 100644 --- a/application/Espo/Core/Export/Xlsx.php +++ b/application/Espo/Core/Export/Xlsx.php @@ -491,7 +491,14 @@ class Xlsx extends \Espo\Core\Injectable $sheet->setCellValue("$col$rowNumber", $value); } - + } else if ($type == 'multiEnum' || $type == 'array') { + if (!empty($row[$name])) { + $array = json_decode($row[$name]); + if (is_array($array)) { + $value = implode(', ', $array); + $sheet->setCellValue("$col$rowNumber", $value, \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING); + } + } } else { if (array_key_exists($name, $row)) { $sheet->setCellValueExplicit("$col$rowNumber", $row[$name], \PhpOffice\PhpSpreadsheet\Cell\DataType::TYPE_STRING); diff --git a/application/Espo/Core/Htmlizer/Htmlizer.php b/application/Espo/Core/Htmlizer/Htmlizer.php index a3a2e8d24d..dbcb182fe0 100644 --- a/application/Espo/Core/Htmlizer/Htmlizer.php +++ b/application/Espo/Core/Htmlizer/Htmlizer.php @@ -147,6 +147,7 @@ class Htmlizer } $type = $entity->getAttributeType($attribute); + $fieldType = $entity->getAttributeParam($attribute, 'fieldType'); if ($type == Entity::DATETIME) { if (!empty($data[$attribute])) { @@ -194,6 +195,14 @@ class Htmlizer unset($data[$attribute]); } + if ($fieldType === 'currency') { + if ($entity->getAttributeParam($attribute, 'attributeRole') === 'currency') { + if ($currencyValue = $data[$attribute]) { + $data[$attribute . 'Symbol'] = $this->metadata->get(['app', 'currency', 'symbolMap', $currencyValue]); + } + } + } + if (array_key_exists($attribute, $data)) { $keyRaw = $attribute . '_RAW'; $data[$keyRaw] = $data[$attribute]; diff --git a/application/Espo/Core/Utils/ClientManager.php b/application/Espo/Core/Utils/ClientManager.php index 0f5aac853b..66dc3c6520 100644 --- a/application/Espo/Core/Utils/ClientManager.php +++ b/application/Espo/Core/Utils/ClientManager.php @@ -108,6 +108,8 @@ class ClientManager $loaderCacheTimestamp = $cacheTimestamp; } + $linkList = $this->getMetadata()->get(['app', 'client', 'linkList'], []); + $scriptsHtml = ''; foreach ($jsFileList as $jsFile) { $src = $this->basePath . $jsFile . '?r=' . $cacheTimestamp; @@ -121,6 +123,22 @@ class ClientManager $additionalStyleSheetsHtml .= "\n "; } + $linksHtml = ''; + foreach ($linkList as $item) { + $href = $this->basePath . $item['href']; + if (empty($item['noTimestamp'])) { + $href .= '?r=' . $cacheTimestamp; + } + $as = $item['as'] ?? ''; + $rel = $item['rel'] ?? ''; + $type = $item['type'] ?? ''; + $additinalPlaceholder = ''; + if (!empty($item['crossorigin'])) { + $additinalPlaceholder .= ' crossorigin'; + } + $linksHtml .= "\n "; + } + $data = [ 'applicationId' => 'espocrm-application-id', 'apiUrl' => 'api/v1', @@ -134,6 +152,7 @@ class ClientManager 'appClientClassName' => 'app', 'scriptsHtml' => $scriptsHtml, 'additionalStyleSheetsHtml' => $additionalStyleSheetsHtml, + 'linksHtml' => $linksHtml, ]; $html = file_get_contents($htmlFilePath); diff --git a/application/Espo/Core/Utils/Database/Orm/Converter.php b/application/Espo/Core/Utils/Database/Orm/Converter.php index 4d88403c68..ebf0c5494b 100644 --- a/application/Espo/Core/Utils/Database/Orm/Converter.php +++ b/application/Espo/Core/Utils/Database/Orm/Converter.php @@ -91,7 +91,7 @@ class Converter 'select' => 'select', 'orderBy' => 'orderBy', 'where' => 'where', - 'storeArrayValues' => 'storeArrayValues' + 'storeArrayValues' => 'storeArrayValues', ); protected $idParams = array( @@ -506,6 +506,10 @@ class Converter } } + if (isset($fieldParams['type'])) { + $values['fieldType'] = $fieldParams['type']; + } + return $values; } diff --git a/application/Espo/Core/Utils/Database/Orm/Fields/Currency.php b/application/Espo/Core/Utils/Database/Orm/Fields/Currency.php index 601c2ac735..3608ad2fd5 100644 --- a/application/Espo/Core/Utils/Database/Orm/Fields/Currency.php +++ b/application/Espo/Core/Utils/Database/Orm/Fields/Currency.php @@ -100,6 +100,8 @@ class Currency extends Base 'sql' => $converedFieldName . " {direction}", 'leftJoins' => $leftJoins, ], + 'attributeRole' => 'valueConverted', + 'fieldType' => 'currency', ]; $defs[$entityType]['fields'][$fieldName]['orderBy'] = [ @@ -108,6 +110,12 @@ class Currency extends Base ]; } + $defs[$entityType]['fields'][$fieldName]['attributeRole'] = 'value'; + $defs[$entityType]['fields'][$fieldName]['fieldType'] = 'currency'; + + $defs[$entityType]['fields'][$fieldName . 'Currency']['attributeRole'] = 'currency'; + $defs[$entityType]['fields'][$fieldName . 'Currency']['fieldType'] = 'currency'; + return $defs; } } diff --git a/application/Espo/Core/Utils/Database/Orm/Fields/Link.php b/application/Espo/Core/Utils/Database/Orm/Fields/Link.php index bf25a637f2..6b008e69a9 100644 --- a/application/Espo/Core/Utils/Database/Orm/Fields/Link.php +++ b/application/Espo/Core/Utils/Database/Orm/Fields/Link.php @@ -35,25 +35,30 @@ class Link extends Base { $fieldParams = $this->getFieldParams(); - $data = array( - $entityName => array ( - 'fields' => array( - $fieldName.'Id' => array( + $data = [ + $entityName => [ + 'fields' => [ + $fieldName.'Id' => [ 'type' => 'foreignId', - 'index' => $fieldName - ), - $fieldName.'Name' => array( + 'index' => $fieldName, + 'attributeRole' => 'id', + 'fieldType' => 'link', + ], + $fieldName.'Name' => [ 'type' => 'varchar', - 'notStorable' => true - ) - ) - ), - 'unset' => array( - $entityName => array( - 'fields.'.$fieldName - ) - ) - ); + 'notStorable' => true, + 'attributeRole' => 'name', + 'fieldType' => 'link', + ] + ] + ], + 'unset' => [ + $entityName => [ + 'fields.' . $fieldName + ] + ] + ]; + if (!empty($fieldParams['notStorable'])) { $data[$entityName]['fields'][$fieldName.'Id']['notStorable'] = true; } @@ -64,4 +69,4 @@ class Link extends Base return $data; } -} \ No newline at end of file +} diff --git a/application/Espo/Core/Utils/Database/Orm/Fields/LinkMultiple.php b/application/Espo/Core/Utils/Database/Orm/Fields/LinkMultiple.php index d977c84dab..d9a65bea83 100644 --- a/application/Espo/Core/Utils/Database/Orm/Fields/LinkMultiple.php +++ b/application/Espo/Core/Utils/Database/Orm/Fields/LinkMultiple.php @@ -41,12 +41,16 @@ class LinkMultiple extends Base 'notStorable' => true, 'isLinkMultipleIdList' => true, 'relation' => $fieldName, - 'isUnordered' => true + 'isUnordered' => true, + 'attributeRole' => 'idList', + 'fieldType' => 'linkMultiple', ], $fieldName.'Names' => [ 'type' => 'jsonObject', 'notStorable' => true, - 'isLinkMultipleNameMap' => true + 'isLinkMultipleNameMap' => true, + 'attributeRole' => 'nameMap', + 'fieldType' => 'linkMultiple', ] ] ], @@ -71,7 +75,8 @@ class LinkMultiple extends Base $data[$entityName]['fields'][$fieldName . 'Columns'] = [ 'type' => 'jsonObject', 'notStorable' => true, - 'columns' => $columns + 'columns' => $columns, + 'attributeRole' => 'columnsMap', ]; } diff --git a/application/Espo/Core/Utils/Database/Orm/Fields/LinkParent.php b/application/Espo/Core/Utils/Database/Orm/Fields/LinkParent.php index 2e2de76f4d..7adebe13d2 100644 --- a/application/Espo/Core/Utils/Database/Orm/Fields/LinkParent.php +++ b/application/Espo/Core/Utils/Database/Orm/Fields/LinkParent.php @@ -33,33 +33,39 @@ class LinkParent extends Base { protected function load($fieldName, $entityName) { - $data = array( - $entityName => array ( - 'fields' => array( - $fieldName.'Id' => array( + $data = [ + $entityName => [ + 'fields' => [ + $fieldName.'Id' => [ 'type' => 'foreignId', - 'index' => $fieldName - ), - $fieldName.'Type' => array( + 'index' => $fieldName, + 'attributeRole' => 'id', + 'fieldType' => 'linkParent', + ], + $fieldName.'Type' => [ 'type' => 'foreignType', 'notNull' => false, 'index' => $fieldName, - 'len' => 100 - ), - $fieldName.'Name' => array( + 'len' => 100, + 'attributeRole' => 'type', + 'fieldType' => 'linkParent', + ], + $fieldName.'Name' => [ 'type' => 'varchar', 'notStorable' => true, 'relation' => $fieldName, - 'isParentName' => true - ) - ) - ), - 'unset' => array( - $entityName => array( + 'isParentName' => true, + 'attributeRole' => 'name', + 'fieldType' => 'linkParent', + ] + ] + ], + 'unset' => [ + $entityName => [ 'fields.'.$fieldName - ) - ) - ); + ] + ] + ]; $fieldParams = $this->getFieldParams(); @@ -72,4 +78,4 @@ class LinkParent extends Base return $data; } -} \ No newline at end of file +} diff --git a/application/Espo/Core/Utils/ThemeManager.php b/application/Espo/Core/Utils/ThemeManager.php index 2016867555..51b6ad27bd 100644 --- a/application/Espo/Core/Utils/ThemeManager.php +++ b/application/Espo/Core/Utils/ThemeManager.php @@ -52,8 +52,6 @@ class ThemeManager public function getStylesheet() { - return $this->metadata->get('themes.' . $this->getName() . '.stylesheet', 'client/css/espo.css'); + return $this->metadata->get(['themes', $this->getName(), 'stylesheet'], 'client/css/espo/espo.css'); } } - - diff --git a/application/Espo/Modules/Crm/Services/Activities.php b/application/Espo/Modules/Crm/Services/Activities.php index 2452de3141..924fbd8a78 100644 --- a/application/Espo/Modules/Crm/Services/Activities.php +++ b/application/Espo/Modules/Crm/Services/Activities.php @@ -104,7 +104,7 @@ class Activities extends \Espo\Core\Services\Base { $selectManager = $this->getSelectManagerFactory()->create('Meeting'); - $selectParams = array( + $selectParams = [ 'select' => [ 'id', 'name', @@ -119,33 +119,31 @@ class Activities extends \Espo\Core\Services\Base 'parentId', 'status', 'createdAt', - ['VALUE:', 'hasAttachment'] + ['VALUE:', 'hasAttachment'], ], - 'leftJoins' => [['users', 'usersLeft']], - 'whereClause' => array( - ), - 'customJoin' => '' - ); + 'leftJoins' => [['MeetingUser', 'usersLeftMiddle', ['usersLeftMiddle.meetingId:' => 'meeting.id']]], + 'whereClause' => [], + ]; - $where = array( + $where = [ 'usersLeftMiddle.userId' => $entity->id - ); + ]; if ($entity->isPortal() && $entity->get('contactId')) { $selectParams['leftJoins'][] = ['contacts', 'contactsLeft']; $selectParams['distinct'] = true; $where['contactsLeftMiddle.contactId'] = $entity->get('contactId'); - $selectParams['whereClause'][] = array( + $selectParams['whereClause'][] = [ 'OR' => $where - ); + ]; } else { $selectParams['whereClause'][] = $where; } if (!empty($statusList)) { - $selectParams['whereClause'][] = array( + $selectParams['whereClause'][] = [ 'status' => $statusList - ); + ]; } $selectManager->applyAccess($selectParams); @@ -176,12 +174,10 @@ class Activities extends \Espo\Core\Services\Base 'parentId', 'status', 'createdAt', - ['VALUE:', 'hasAttachment'] + ['VALUE:', 'hasAttachment'], ], - 'leftJoins' => [['users', 'usersLeft']], - 'whereClause' => [ - ], - 'customJoin' => '' + 'leftJoins' => [['CallUser', 'usersLeftMiddle', ['usersLeftMiddle.callId:' => 'call.id']]], + 'whereClause' => [], ]; $where = [ @@ -225,13 +221,13 @@ class Activities extends \Espo\Core\Services\Base $selectManager = $this->getSelectManagerFactory()->create('Email'); - $selectParams = array( + $selectParams = [ 'select' => [ 'id', 'name', ['dateSent', 'dateStart'], ['VALUE:', 'dateEnd'], - ['VALUE:', 'dateStart'], + ['VALUE:', 'dateStartDate'], ['VALUE:', 'dateEndDate'], ['VALUE:Email', '_scope'], 'assignedUserId', @@ -242,17 +238,17 @@ class Activities extends \Espo\Core\Services\Base 'createdAt', 'hasAttachment' ], - 'leftJoins' => [['users', 'usersLeft']], - 'whereClause' => array( + 'leftJoins' => [['EmailUser', 'usersLeftMiddle', ['usersLeftMiddle.emailId:' => 'email.id']]], + 'whereClause' => [ 'usersLeftMiddle.userId' => $entity->id - ), - 'customJoin' => '' - ); + ], + 'customJoin' => '', + ]; if (!empty($statusList)) { - $selectParams['whereClause'][] = array( + $selectParams['whereClause'][] = [ 'status' => $statusList - ); + ]; } $selectManager->applyAccess($selectParams); @@ -622,10 +618,10 @@ class Activities extends \Espo\Core\Services\Base protected function getResultFromQueryParts($parts, $scope, $id, $params) { if (empty($parts)) { - return array( + return [ 'list' => [], 'total' => 0 - ); + ]; } $pdo = $this->getEntityManager()->getPDO(); @@ -636,29 +632,29 @@ class Activities extends \Espo\Core\Services\Base } if (!$onlyScope) { - $qu = implode(" UNION ", $parts); + $sql = implode(" UNION ", $parts); } else { - $qu = $parts[$onlyScope]; + $sql = $parts[$onlyScope]; } - $countQu = "SELECT COUNT(*) AS 'count' FROM ({$qu}) AS c"; - $sth = $pdo->prepare($countQu); + $sqlCount = "SELECT COUNT(*) AS 'count' FROM ({$sql}) AS c"; + $sth = $pdo->prepare($sqlCount); $sth->execute(); $row = $sth->fetch(PDO::FETCH_ASSOC); $totalCount = $row['count']; - $qu .= " + $sql .= " ORDER BY dateStart DESC, createdAt DESC "; if (!empty($params['maxSize'])) { - $qu .= " + $sql .= " LIMIT :offset, :maxSize "; } - $sth = $pdo->prepare($qu); + $sth = $pdo->prepare($sql); if (!empty($params['maxSize'])) { $offset = 0; @@ -685,10 +681,10 @@ class Activities extends \Espo\Core\Services\Base $list[] = $row; } - return array( + return [ 'list' => $list, 'total' => $totalCount - ); + ]; } protected function accessCheck($entity) diff --git a/application/Espo/Repositories/Email.php b/application/Espo/Repositories/Email.php index 34d5ab9ec7..e418d4927f 100644 --- a/application/Espo/Repositories/Email.php +++ b/application/Espo/Repositories/Email.php @@ -282,7 +282,7 @@ class Email extends \Espo\Core\ORM\Repositories\RDB $this->fillAccount($entity); } - if (!empty($options['isBeingImported'])) { + if (!empty($options['isBeingImported']) || !empty($options['isJustSent'])) { if (!$entity->has('from')) { $this->loadFromField($entity); } @@ -326,6 +326,10 @@ class Email extends \Espo\Core\ORM\Repositories\RDB public function applyUsersFilters(Entity $entity) { foreach ($entity->getLinkMultipleIdList('users') as $userId) { + if ($entity->get('status') === 'Sent') { + if ($entity->get('sentById') && $entity->get('sentById') === $userId) continue; + } + $filter = $this->getEmailFilterManager()->getMatchingFilter($entity, $userId); if ($filter) { $action = $filter->get('action'); diff --git a/application/Espo/Resources/layouts/ActionHistoryRecord/listLastViewed.json b/application/Espo/Resources/layouts/ActionHistoryRecord/listLastViewed.json index e1f49b4d32..bbfe1200b6 100644 --- a/application/Espo/Resources/layouts/ActionHistoryRecord/listLastViewed.json +++ b/application/Espo/Resources/layouts/ActionHistoryRecord/listLastViewed.json @@ -1,5 +1,5 @@ [ {"name":"targetType", "notSortable": true, "width": 22}, {"name":"target", "notSortable": true}, - {"name":"createdAt", "notSortable": true, "width": 20, "align": "right"} + {"name":"createdAt", "notSortable": true, "width": 20, "align": "right", "view": "views/fields/datetime-short"} ] \ No newline at end of file diff --git a/application/Espo/Resources/metadata/app/client.json b/application/Espo/Resources/metadata/app/client.json index e121a0db69..adc0ba13f2 100644 --- a/application/Espo/Resources/metadata/app/client.json +++ b/application/Espo/Resources/metadata/app/client.json @@ -24,5 +24,23 @@ "client/src/loader.js", "client/src/utils.js", "client/src/exceptions.js" + ], + "linkList": [ + { + "href": "client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff2", + "as": "font", + "type": "font/woff2", + "rel": "preload", + "noTimestamp": true, + "crossorigin": true + }, + { + "href": "client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.woff2", + "as": "font", + "type": "font/woff2", + "rel": "preload", + "noTimestamp": true, + "crossorigin": true + } ] } diff --git a/application/Espo/Resources/metadata/entityDefs/Job.json b/application/Espo/Resources/metadata/entityDefs/Job.json index dadcd4e44e..69bd930683 100644 --- a/application/Espo/Resources/metadata/entityDefs/Job.json +++ b/application/Espo/Resources/metadata/entityDefs/Job.json @@ -104,7 +104,7 @@ "collection": { "orderBy": "number", "order": "desc", - "textFilterFields": ["name", "methodName", "serviceName", "scheduledJobName"] + "textFilterFields": ["name", "methodName", "serviceName", "scheduledJob"] }, "indexes": { "executeTime": { diff --git a/application/Espo/Services/Email.php b/application/Espo/Services/Email.php index 7bcd31b9ae..f00d0a37ba 100644 --- a/application/Espo/Services/Email.php +++ b/application/Espo/Services/Email.php @@ -298,7 +298,7 @@ class Email extends Record $entity->set('isJustSent', true); - $this->getEntityManager()->saveEntity($entity); + $this->getEntityManager()->saveEntity($entity, ['isJustSent' => true]); } protected function applySmtpHandler(string $userId, string $emailAddress, array &$params) diff --git a/application/Espo/Services/LastViewed.php b/application/Espo/Services/LastViewed.php index f3a4ef569f..707a270d45 100644 --- a/application/Espo/Services/LastViewed.php +++ b/application/Espo/Services/LastViewed.php @@ -49,7 +49,7 @@ class LastViewed extends \Espo\Core\Services\Base $scopes = $this->getInjection('metadata')->get('scopes'); $targetTypeList = array_filter(array_keys($scopes), function ($item) use ($scopes) { - return !empty($scopes[$item]['object']); + return !empty($scopes[$item]['object']) || !empty($scopes[$item]['lastViewed']); }); $offset = $params['offset']; diff --git a/client/fonts/open-sans-regular.eot b/client/fonts/open-sans-regular.eot deleted file mode 100644 index c67015670e..0000000000 Binary files a/client/fonts/open-sans-regular.eot and /dev/null differ diff --git a/client/fonts/open-sans-regular.svg b/client/fonts/open-sans-regular.svg deleted file mode 100644 index b79435f392..0000000000 --- a/client/fonts/open-sans-regular.svg +++ /dev/null @@ -1,252 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : Digitized data copyright 20102011 Google Corporation -Foundry : Ascender Corporation -Foundry URL : httpwwwascendercorpcom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/client/fonts/open-sans-regular.ttf b/client/fonts/open-sans-regular.ttf deleted file mode 100644 index db433349b7..0000000000 Binary files a/client/fonts/open-sans-regular.ttf and /dev/null differ diff --git a/client/fonts/open-sans-regular.woff b/client/fonts/open-sans-regular.woff deleted file mode 100644 index 713dbf1a77..0000000000 Binary files a/client/fonts/open-sans-regular.woff and /dev/null differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.eot b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.eot new file mode 100644 index 0000000000..bd83b8e8c2 Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.eot differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.svg b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.svg new file mode 100644 index 0000000000..410561e782 --- /dev/null +++ b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.svg @@ -0,0 +1,336 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.ttf b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.ttf new file mode 100644 index 0000000000..d8cfadd433 Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.ttf differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.woff b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.woff new file mode 100644 index 0000000000..55c50a367f Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.woff differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.woff2 b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.woff2 new file mode 100644 index 0000000000..f503d558d5 Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.woff2 differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.eot b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.eot new file mode 100644 index 0000000000..420e898133 Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.eot differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.svg b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.svg new file mode 100644 index 0000000000..cce30a7735 --- /dev/null +++ b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.svg @@ -0,0 +1,349 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.ttf b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.ttf new file mode 100644 index 0000000000..6564b9b042 Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.ttf differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.woff b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.woff new file mode 100644 index 0000000000..2eaa468cce Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.woff differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.woff2 b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.woff2 new file mode 100644 index 0000000000..c99aabe803 Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.woff2 differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.eot b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.eot new file mode 100644 index 0000000000..c21c200664 Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.eot differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.svg b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.svg new file mode 100644 index 0000000000..8e6b61ade1 --- /dev/null +++ b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.svg @@ -0,0 +1,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.ttf b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.ttf new file mode 100644 index 0000000000..a08646721d Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.ttf differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.woff b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.woff new file mode 100644 index 0000000000..18788e84fc Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.woff differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.woff2 b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.woff2 new file mode 100644 index 0000000000..421a1ab25f Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.woff2 differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.eot b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.eot new file mode 100644 index 0000000000..381bece63c Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.eot differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.svg b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.svg new file mode 100644 index 0000000000..80b563538f --- /dev/null +++ b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.svg @@ -0,0 +1,342 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.ttf b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.ttf new file mode 100644 index 0000000000..9904ea9957 Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.ttf differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.woff b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.woff new file mode 100644 index 0000000000..f5f7974eb3 Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.woff differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.woff2 b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.woff2 new file mode 100644 index 0000000000..12ce3d20d1 Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.woff2 differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.eot b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.eot new file mode 100644 index 0000000000..c6ee21fb8e Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.eot differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.svg b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.svg new file mode 100644 index 0000000000..e6a951f46e --- /dev/null +++ b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.svg @@ -0,0 +1,349 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.ttf b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.ttf new file mode 100644 index 0000000000..2d9c801d2c Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.ttf differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.woff b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.woff new file mode 100644 index 0000000000..34f3eae862 Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.woff differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.woff2 b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.woff2 new file mode 100644 index 0000000000..398b68a085 Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.woff2 differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.eot b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.eot new file mode 100644 index 0000000000..db9210bea2 Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.eot differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.svg b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.svg new file mode 100644 index 0000000000..78eb653a75 --- /dev/null +++ b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.svg @@ -0,0 +1,336 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.ttf b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.ttf new file mode 100644 index 0000000000..be29eca230 Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.ttf differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff new file mode 100644 index 0000000000..799305af21 Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff differ diff --git a/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff2 b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff2 new file mode 100644 index 0000000000..8383e94c65 Binary files /dev/null and b/client/fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff2 differ diff --git a/client/modules/crm/res/templates/calendar/calendar.tpl b/client/modules/crm/res/templates/calendar/calendar.tpl index b23fb81577..d3026f4097 100644 --- a/client/modules/crm/res/templates/calendar/calendar.tpl +++ b/client/modules/crm/res/templates/calendar/calendar.tpl @@ -5,12 +5,12 @@
- - + +
- + - +
@@ -19,10 +19,10 @@
{{#each ../modeDataList}} - + {{/each}}
- +
    {{#if isCustomViewAvailable}} {{#each viewDataList}} diff --git a/client/modules/crm/res/templates/calendar/timeline.tpl b/client/modules/crm/res/templates/calendar/timeline.tpl index ddcf7fdcd7..7383aa9927 100644 --- a/client/modules/crm/res/templates/calendar/timeline.tpl +++ b/client/modules/crm/res/templates/calendar/timeline.tpl @@ -4,11 +4,11 @@
    - - + +
    {{#if calendarTypeSelectEnabled}}
    - +
      {{#each calendarTypeDataList}}
    • @@ -19,7 +19,7 @@ {{/each}}
    - +
    {{/if}}
    @@ -30,10 +30,10 @@
    {{#each ../modeDataList}} - + {{/each}}
    - +
      {{#if isCustomViewAvailable}} {{#each viewDataList}} diff --git a/client/modules/crm/src/views/account/fields/shipping-address.js b/client/modules/crm/src/views/account/fields/shipping-address.js index 377d4d80ed..e6011c8827 100644 --- a/client/modules/crm/src/views/account/fields/shipping-address.js +++ b/client/modules/crm/src/views/account/fields/shipping-address.js @@ -26,21 +26,55 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ -Espo.define('crm:views/account/fields/shipping-address', 'views/fields/address', function (Dep) { +define('crm:views/account/fields/shipping-address', 'views/fields/address', function (Dep) { return Dep.extend({ copyFrom: 'billingAddress', + setup: function () { + Dep.prototype.setup.call(this); + + this.attributePartList = this.getMetadata().get(['fields', 'address', 'actualFields']) || []; + + this.allAddressAttributeList = []; + this.attributePartList.forEach(function (part) { + this.allAddressAttributeList.push(this.copyFrom + Espo.Utils.upperCaseFirst(part)); + this.allAddressAttributeList.push(this.name + Espo.Utils.upperCaseFirst(part)); + }, this); + + this.listenTo(this.model, 'change', function () { + var isChanged = false; + this.allAddressAttributeList.forEach(function (attribute) { + if (this.model.hasChanged(attribute)) { + isChanged = true; + } + }, this); + if (isChanged) { + if (this.isEditMode() && this.isRendered() && this.$copyButton) { + if (this.toShowCopyButton()) { + this.$copyButton.removeClass('hidden'); + } else { + this.$copyButton.addClass('hidden'); + } + } + } + }, this); + }, + afterRender: function () { Dep.prototype.afterRender.call(this); if (this.mode == 'edit') { var label = this.translate('Copy Billing', 'labels', 'Account'); - $btn = $('').on('click', function () { + this.$copyButton = $(''); + this.$copyButton.on('click', function () { this.copy(this.copyFrom); }.bind(this)); - this.$el.append($btn); + if (!this.toShowCopyButton()) { + this.$copyButton.addClass('hidden'); + } + this.$el.append(this.$copyButton); } }, @@ -51,9 +85,24 @@ Espo.define('crm:views/account/fields/shipping-address', 'views/fields/address', this.model.set(destField, this.model.get(sourceField)); }, this); + }, + toShowCopyButton: function () { + var billingIsNotEmpty = false; + var shippingIsNotEmpty = false; + this.attributePartList.forEach(function (part) { + var attribute = this.copyFrom + Espo.Utils.upperCaseFirst(part); + if (this.model.get(attribute)) { + billingIsNotEmpty = true; + } + var attribute = this.name + Espo.Utils.upperCaseFirst(part); + if (this.model.get(attribute)) { + shippingIsNotEmpty = true; + } + }, this); + + return billingIsNotEmpty && !shippingIsNotEmpty; }, }); }); - diff --git a/client/res/templates/dashboard.tpl b/client/res/templates/dashboard.tpl index e4b0c60ea3..ab3cef8d64 100644 --- a/client/res/templates/dashboard.tpl +++ b/client/res/templates/dashboard.tpl @@ -1,22 +1,22 @@
      -
      +
      {{#if displayTitle}}

      {{translate 'Dashboard' category='scopeNames'}}

      {{/if}}
      -
      +
      {{#unless layoutReadOnly}}
      - - + +
      {{/unless}} {{#ifNotEqual dashboardLayout.length 1}}
      {{#each dashboardLayout}} - + {{/each}}
      {{/ifNotEqual}} diff --git a/client/res/templates/fields/map/detail.tpl b/client/res/templates/fields/map/detail.tpl index 25835642f4..aba8fd06d4 100644 --- a/client/res/templates/fields/map/detail.tpl +++ b/client/res/templates/fields/map/detail.tpl @@ -1 +1,5 @@ -
      \ No newline at end of file +{{#if hasAddress}} +
      +{{else}} +{{translate 'None'}} +{{/if}} \ No newline at end of file diff --git a/client/res/templates/modals/add-dashlet.tpl b/client/res/templates/modals/add-dashlet.tpl index 5775539dc9..0865374983 100644 --- a/client/res/templates/modals/add-dashlet.tpl +++ b/client/res/templates/modals/add-dashlet.tpl @@ -1,7 +1,7 @@ -
        + diff --git a/client/res/templates/modals/edit-dashboard.tpl b/client/res/templates/modals/edit-dashboard.tpl index 9a941dde17..1d5b46f127 100644 --- a/client/res/templates/modals/edit-dashboard.tpl +++ b/client/res/templates/modals/edit-dashboard.tpl @@ -1,6 +1,8 @@ -
        - -
        - {{{dashboardTabList}}} +
        +
        + +
        + {{{dashboardTabList}}} +
        diff --git a/client/res/templates/record/detail.tpl b/client/res/templates/record/detail.tpl index 04ae7cd32b..0f2d52183a 100644 --- a/client/res/templates/record/detail.tpl +++ b/client/res/templates/record/detail.tpl @@ -25,10 +25,10 @@ {{#if navigateButtonsEnabled}}
        - -
        diff --git a/client/res/templates/record/list-nested-categories.tpl b/client/res/templates/record/list-nested-categories.tpl index 79350f9e11..9b7b6288dd 100644 --- a/client/res/templates/record/list-nested-categories.tpl +++ b/client/res/templates/record/list-nested-categories.tpl @@ -5,8 +5,8 @@ {{#each list}}
        - - {{name}} + + {{name}}
        {{/each}} diff --git a/client/res/templates/record/list.tpl b/client/res/templates/record/list.tpl index d4cee930d9..8c5e2947c8 100644 --- a/client/res/templates/record/list.tpl +++ b/client/res/templates/record/list.tpl @@ -23,7 +23,7 @@ {{/if}}
        {{#if dropdownItemList.length}} -
          diff --git a/client/res/templates/record/search.tpl b/client/res/templates/record/search.tpl index 3780aebf9c..03a1ce032e 100644 --- a/client/res/templates/record/search.tpl +++ b/client/res/templates/record/search.tpl @@ -35,7 +35,7 @@ -
            @@ -51,7 +51,7 @@ {{#if hasViewModeSwitcher}}
            {{#each viewModeDataList}} - + {{/each}}
            {{/if}} diff --git a/client/src/views/email/record/detail.js b/client/src/views/email/record/detail.js index 095bf2b115..2fe747de66 100644 --- a/client/src/views/email/record/detail.js +++ b/client/src/views/email/record/detail.js @@ -26,7 +26,7 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ -Espo.define('views/email/record/detail', 'views/record/detail', function (Dep) { +define('views/email/record/detail', 'views/record/detail', function (Dep) { return Dep.extend({ @@ -147,34 +147,22 @@ Espo.define('views/email/record/detail', 'views/record/detail', function (Dep) { }, actionMarkAsImportant: function () { - $.ajax({ - url: 'Email/action/markAsImportant', - type: 'POST', - data: JSON.stringify({ - id: this.model.id - }) + Espo.Ajax.postRequest('Email/action/markAsImportant', { + id: this.model.id }); this.model.set('isImportant', true); }, actionMarkAsNotImportant: function () { - $.ajax({ - url: 'Email/action/markAsNotImportant', - type: 'POST', - data: JSON.stringify({ - id: this.model.id - }) + Espo.Ajax.postRequest('Email/action/markAsNotImportant', { + id: this.model.id }); this.model.set('isImportant', false); }, actionMoveToTrash: function () { - $.ajax({ - url: 'Email/action/moveToTrash', - type: 'POST', - data: JSON.stringify({ - id: this.model.id - }) + Espo.Ajax.postRequest('Email/action/moveToTrash', { + id: this.model.id }).then(function () { Espo.Ui.warning(this.translate('Moved to Trash', 'labels', 'Email')); }.bind(this)); @@ -185,12 +173,8 @@ Espo.define('views/email/record/detail', 'views/record/detail', function (Dep) { }, actionRetrieveFromTrash: function () { - $.ajax({ - url: 'Email/action/retrieveFromTrash', - type: 'POST', - data: JSON.stringify({ - id: this.model.id - }) + Espo.Ajax.postRequest('Email/action/retrieveFromTrash', { + id: this.model.id }).then(function () { Espo.Ui.warning(this.translate('Retrieved from Trash', 'labels', 'Email')); }.bind(this)); diff --git a/client/src/views/email/record/list.js b/client/src/views/email/record/list.js index 7cedd29a37..6f41007e51 100644 --- a/client/src/views/email/record/list.js +++ b/client/src/views/email/record/list.js @@ -52,15 +52,6 @@ Espo.define('views/email/record/list', 'views/record/list', function (Dep) { this.addMassAction('markAsRead', false, true); this.addMassAction('moveToTrash', false, true); - /*this.massActionList.push('moveToTrash'); - - this.massActionList.push('markAsRead'); - this.massActionList.push('markAsNotRead'); - this.massActionList.push('markAsImportant'); - this.massActionList.push('markAsNotImportant'); - this.massActionList.push('moveToFolder'); - this.massActionList.push('retrieveFromTrash');*/ - this.listenTo(this.collection, 'moving-to-trash', function (id) { var model = this.collection.get(id); if (model) { diff --git a/client/src/views/fields/map.js b/client/src/views/fields/map.js index 72082e5cdc..ec865c3d35 100644 --- a/client/src/views/fields/map.js +++ b/client/src/views/fields/map.js @@ -27,6 +27,8 @@ Espo.define('views/fields/map', 'views/fields/base', function (Dep) { detailTemplate: 'fields/map/detail', + listTemplate: 'fields/map/detail', + addressField: null, provider: null, @@ -35,6 +37,7 @@ Espo.define('views/fields/map', 'views/fields/base', function (Dep) { data: function () { var data = Dep.prototype.data.call(this); + data.hasAddress = this.hasAddress(); return data; }, @@ -72,7 +75,7 @@ Espo.define('views/fields/map', 'views/fields/base', function (Dep) { }, hasAddress: function () { - return this.addressData.city || this.addressData.postalCode; + return !!this.model.get(this.addressField + 'City') || !!this.model.get(this.addressField + 'PostalCode'); }, afterRender: function () { @@ -175,9 +178,6 @@ Espo.define('views/fields/map', 'views/fields/base', function (Dep) { }); } }.bind(this)); - } - }); - }); diff --git a/client/src/views/modals/add-dashlet.js b/client/src/views/modals/add-dashlet.js index 7a1b4417bf..48928f307f 100644 --- a/client/src/views/modals/add-dashlet.js +++ b/client/src/views/modals/add-dashlet.js @@ -52,13 +52,6 @@ define('views/modals/add-dashlet', 'views/modal', function (Dep) { }, }, - buttonList: [ - { - name: 'cancel', - label: 'Cancel' - } - ], - setup: function () { this.headerHtml = this.translate('Add Dashlet'); diff --git a/client/src/views/modals/detail.js b/client/src/views/modals/detail.js index 28d29f50a4..c421d543d6 100644 --- a/client/src/views/modals/detail.js +++ b/client/src/views/modals/detail.js @@ -97,6 +97,7 @@ Espo.define('views/modals/detail', 'views/modal', function (Dep) { title: this.translate('Previous Entry'), pullLeft: true, className: 'btn-icon', + style: 'text', disabled: true }); this.buttonList.push({ @@ -105,6 +106,7 @@ Espo.define('views/modals/detail', 'views/modal', function (Dep) { title: this.translate('Next Entry'), pullLeft: true, className: 'btn-icon', + style: 'text', disabled: true }); this.indexOfRecord = this.model.collection.indexOf(this.model); diff --git a/client/src/views/modals/last-viewed.js b/client/src/views/modals/last-viewed.js index 696c69a0b7..08eb71570f 100644 --- a/client/src/views/modals/last-viewed.js +++ b/client/src/views/modals/last-viewed.js @@ -49,13 +49,6 @@ Espo.define('views/modals/last-viewed', ['views/modal', 'search-manager'], funct setup: function () { Dep.prototype.setup.call(this); - this.buttonList = [ - { - name: 'cancel', - label: 'Close' - } - ]; - this.headerHtml = this.getLanguage().translate('LastViewed', 'scopeNamesPlural'); this.headerHtml = '' + this.headerHtml + ''; diff --git a/client/src/views/record/detail.js b/client/src/views/record/detail.js index ff64743a97..d852e110d0 100644 --- a/client/src/views/record/detail.js +++ b/client/src/views/record/detail.js @@ -844,8 +844,9 @@ define('views/record/detail', ['views/record/base', 'view-record-helper'], funct }, switchToModelByIndex: function (indexOfRecord) { - if (!this.model.collection) return; - var model = this.model.collection.at(indexOfRecord); + var collection = this.model.collection || this.collection; + if (!collection) return; + var model = collection.at(indexOfRecord); if (!model) { throw new Error("Model is not found in collection by index."); } @@ -870,7 +871,16 @@ define('views/record/detail', ['views/record/base', 'view-record-helper'], funct }, actionPrevious: function () { - if (!this.model.collection) return; + var collection; + if (!this.model.collection) { + collection = this.collection; + if (!collection) return; + this.indexOfRecord--; + if (this.indexOfRecord < 0) this.indexOfRecord = 0; + } else { + collection = this.model.collection; + } + if (!(this.indexOfRecord > 0)) return; var indexOfRecord = this.indexOfRecord - 1; @@ -878,13 +888,18 @@ define('views/record/detail', ['views/record/base', 'view-record-helper'], funct }, actionNext: function () { - if (!this.model.collection) return; - if (!(this.indexOfRecord < this.model.collection.total - 1) && this.model.collection.total >= 0) return; - if (this.model.collection.total === -2 && this.indexOfRecord >= this.model.collection.length - 1) { - return; + var collection; + if (!this.model.collection) { + collection = this.collection; + if (!collection) return; + this.indexOfRecord--; + if (this.indexOfRecord < 0) this.indexOfRecord = 0; + } else { + collection = this.model.collection; } - var collection = this.model.collection; + if (!(this.indexOfRecord < collection.total - 1) && collection.total >= 0) return; + if (collection.total === -2 && this.indexOfRecord >= collection.length - 1) return; var indexOfRecord = this.indexOfRecord + 1; if (indexOfRecord <= collection.length - 1) { diff --git a/client/src/views/stream/panel.js b/client/src/views/stream/panel.js index 90f57ce2ee..79db1b37a2 100644 --- a/client/src/views/stream/panel.js +++ b/client/src/views/stream/panel.js @@ -91,6 +91,7 @@ define('views/stream/panel', ['views/record/panels/relationship', 'lib!Textcompl if ($target.parent().hasClass('remove-attachment')) return; if ($.contains(this.$postContainer.get(0), e.target)) return; if (this.$textarea.val() !== '') return; + if (e.target.classList.contains('popover-content')) return; var attachmentsIds = this.seed.get('attachmentsIds') || []; if (!attachmentsIds.length && (!this.getView('attachments') || !this.getView('attachments').isUploading)) { @@ -389,20 +390,33 @@ define('views/stream/panel', ['views/record/panels/relationship', 'lib!Textcompl }, this); } - $a = this.$el.find('.buttons-panel a.stream-post-info'); + var $a = this.$el.find('.buttons-panel a.stream-post-info'); $a.popover({ placement: 'bottom', container: 'body', content: this.translate('streamPostInfo', 'messages').replace(/(\r\n|\n|\r)/gm, '
            '), - trigger: 'click', html: true }).on('shown.bs.popover', function () { - $('body').one('click', function () { + $('body').off('click.popover-' + this.id); + $('body').on('click.popover-' + this.id , function (e) { + if (e.target.classList.contains('popover-content')) return; + if ($.contains($a.get(0), e.target)) return; + $('body').off('click.popover-' + this.id); $a.popover('hide'); - }); + e.stopPropagation(); + }.bind(this)); }); + $a.on('click', function () { + $(this).popover('toggle'); + }); + + this.on('remove', function () { + if ($a) $a.popover('destroy') + $('body').off('click.popover-' + this.id); + }, this); + this.createView('attachments', 'views/stream/fields/attachment-multiple', { model: this.seed, mode: 'edit', diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less index 2e34665ead..97585e0aea 100644 --- a/frontend/less/espo/custom.less +++ b/frontend/less/espo/custom.less @@ -91,6 +91,10 @@ } } +b, strong { + font-weight: 600; +} + .text-primary { color: @state-primary-text; } @@ -156,6 +160,7 @@ blockquote { height: @font-size-h3; display: inline-block; } + opacity: 0.4; } .modal-footer { @@ -220,6 +225,7 @@ blockquote { label { margin-bottom: 3px; + font-weight: 600; } .table { @@ -1085,6 +1091,11 @@ section { } } +.modal-body > .no-side-margin { + margin-left: -@panel-padding; + margin-right: -@panel-padding; +} + .panel-body > .no-margin { margin: -@panel-padding; } @@ -1708,14 +1719,6 @@ label.attach-file-label { } } -@font-face { - font-family: Open Sans; - src: url('../../fonts/open-sans-regular.eot?') format('eot'), - url('../../fonts/open-sans-regular.woff') format('woff'), - url('../../fonts/open-sans-regular.ttf') format('truetype'), - url('../../fonts/open-sans-regular.svg#svgFontName') format('svg'); -} - .notifications-badge-container > .notifications-button > .number-badge { position: absolute; z-index: 10; @@ -1728,6 +1731,10 @@ label.attach-file-label { color: @white-color; } +.badge { + font-weight: 600; +} + .badge-circle { width: 8px; height: 8px; @@ -1935,6 +1942,7 @@ h4.panel-title span.fas.color-icon { padding: .09em .5em .2em; position: relative; top: -1px; + font-weight: 600; } .label-md { @@ -2148,12 +2156,12 @@ table.table td.cell .complex-text { margin-top: 0 !important; } h1 { - font-weight: bold; + font-weight: 600; margin-top: @line-height-computed; margin-bottom: (@line-height-computed / 2); } h2, h3 { - font-weight: bold; + font-weight: 600; margin-top: (@line-height-computed / 2); margin-bottom: (@line-height-computed / 2); } @@ -2344,6 +2352,10 @@ table.table td.cell .complex-text { .categories-container .root-item { padding-bottom: 3px; + + a, a:hover, a:active { + text-decoration: none; + } } .list-group-tree { @@ -2386,11 +2398,11 @@ table.table td.cell .complex-text { .list-group-side li.selected a:visited.side-link, .list-group-side li.selected a:focus.side-link { color: @brand-danger; - font-weight: bold; + font-weight: 600; } .text-bold { - font-weight: 800; + font-weight: 600; } .email-address-create-dropdown .btn { @@ -2428,7 +2440,7 @@ table.table td.cell .complex-text { } h5 { - font-weight: bold; + font-weight: 600; margin-top: 9px; margin-bottom: 9px; } @@ -2559,6 +2571,9 @@ pre > code { position: relative; top: -1px; } + .folder-icon { + margin-right: 3px; + } } } @@ -2614,7 +2629,7 @@ pre > code { font-size: 16px; } > a.text-danger { - font-weight: bold; + font-weight: 600; } } @@ -2693,6 +2708,12 @@ pre > code { float: right; } + .search-row { + .btn.btn-icon-x-wide { + width: 54px; + } + } + .categories-container > .list { margin: @panel-padding 0; } @@ -2991,4 +3012,62 @@ a.field-info > span.fa-info-circle { -o-transform: rotate(270deg); -ms-transform: rotate(270deg); transform: rotate(270deg); -} \ No newline at end of file +} + +a.link-gray { + &, + &:active { + color: @gray-soft; + } + &:hover, + &:focus { + color: @gray-dark; + } +} + +.btn-text { + color: @gray-soft; + border-radius: 0; + + &, + &:active, + &.active, + &[disabled], + fieldset[disabled] & { + background-color: transparent; + .box-shadow(none); + } + &, + &:hover, + &:focus, + &:active { + border-color: transparent; + } + &:hover, + &:focus { + color: @gray-dark; + text-decoration: none; + background-color: transparent; + } + &.disabled, + &[disabled], + fieldset[disabled] & { + &:hover, + &:focus { + color: @gray-light; + text-decoration: none; + } + color: @gray-light; + } + &.active { + border-bottom: 1px solid @gray-light; + } + + font-weight: 600; +} + +.btn-group.open .dropdown-toggle { + &.btn-text { + .box-shadow(none); + } +} diff --git a/frontend/less/espo/fonts.less b/frontend/less/espo/fonts.less new file mode 100644 index 0000000000..e22e326321 --- /dev/null +++ b/frontend/less/espo/fonts.less @@ -0,0 +1,78 @@ +/* open-sans-regular - cyrillic_latin_cyrillic-ext_latin-ext */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.eot'); /* IE9 Compat Modes */ + src: local('Open Sans Regular'), local('OpenSans-Regular'), + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff') format('woff'), /* Modern Browsers */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.svg#OpenSans') format('svg'); /* Legacy iOS */ +} +/* open-sans-italic - cyrillic_latin_cyrillic-ext_latin-ext */ +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 400; + src: url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.eot'); /* IE9 Compat Modes */ + src: local('Open Sans Italic'), local('OpenSans-Italic'), + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.woff') format('woff'), /* Modern Browsers */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.svg#OpenSans') format('svg'); /* Legacy iOS */ +} +/* open-sans-600 - cyrillic_latin_cyrillic-ext_latin-ext */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.eot'); /* IE9 Compat Modes */ + src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.woff2') format('woff2'), /* Super Modern Browsers */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.woff') format('woff'), /* Modern Browsers */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.svg#OpenSans') format('svg'); /* Legacy iOS */ +} +/* open-sans-600italic - cyrillic_latin_cyrillic-ext_latin-ext */ +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 600; + src: url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.eot'); /* IE9 Compat Modes */ + src: local('Open Sans SemiBold Italic'), local('OpenSans-SemiBoldItalic'), + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.woff') format('woff'), /* Modern Browsers */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.svg#OpenSans') format('svg'); /* Legacy iOS */ +} +/* open-sans-700 - cyrillic_latin_cyrillic-ext_latin-ext */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.eot'); /* IE9 Compat Modes */ + src: local('Open Sans Bold'), local('OpenSans-Bold'), + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.woff2') format('woff2'), /* Super Modern Browsers */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.woff') format('woff'), /* Modern Browsers */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.svg#OpenSans') format('svg'); /* Legacy iOS */ +} +/* open-sans-700italic - cyrillic_latin_cyrillic-ext_latin-ext */ +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 700; + src: url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.eot'); /* IE9 Compat Modes */ + src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.woff') format('woff'), /* Modern Browsers */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.svg#OpenSans') format('svg'); /* Legacy iOS */ +} \ No newline at end of file diff --git a/frontend/less/espo/iframe/iframe.less b/frontend/less/espo/iframe/iframe.less index 0bf9d9ffd8..2ea5a1c3fd 100644 --- a/frontend/less/espo/iframe/iframe.less +++ b/frontend/less/espo/iframe/iframe.less @@ -19,14 +19,6 @@ body { margin: 0; } -@font-face { - font-family: Open Sans; - src: url('../../fonts/open-sans-regular.eot?') format('eot'), - url('../../fonts/open-sans-regular.woff') format('woff'), - url('../../fonts/open-sans-regular.ttf') format('truetype'), - url('../../fonts/open-sans-regular.svg#svgFontName') format('svg'); -} - a { color: @link-color; text-decoration: none; diff --git a/frontend/less/espo/iframe/main.less b/frontend/less/espo/iframe/main.less index b0a3320dd8..67adb28d40 100644 --- a/frontend/less/espo/iframe/main.less +++ b/frontend/less/espo/iframe/main.less @@ -1,4 +1,5 @@ @import "../bootstrap/variables.less"; @import "../variables.less"; +@import "../fonts.less"; @import "iframe.less"; \ No newline at end of file diff --git a/frontend/less/espo/misc.less b/frontend/less/espo/misc.less index 5a68aa0b1b..d0e8fbccdf 100644 --- a/frontend/less/espo/misc.less +++ b/frontend/less/espo/misc.less @@ -9,3 +9,5 @@ @import "misc/colorpicker/colorpicker.less"; @import "misc/fontawesome/fontawesome.less"; @import "misc/gridstack/gridstack.less"; + +@import "fonts.less"; diff --git a/html/main.html b/html/main.html index 57ae80d9c2..be2819a6ae 100644 --- a/html/main.html +++ b/html/main.html @@ -2,7 +2,7 @@ {{applicationName}}{{scriptsHtml}} - {{additionalStyleSheetsHtml}} + {{additionalStyleSheetsHtml}}{{linksHtml}} diff --git a/package-lock.json b/package-lock.json index 0920f886ed..b11c4c0c71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "espocrm", - "version": "5.6.2", + "version": "5.6.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -572,9 +572,9 @@ "dev": true }, "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true }, "eventemitter2": { @@ -691,11 +691,10 @@ "dev": true }, "fstream": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", - "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", + "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", "dev": true, - "optional": true, "requires": { "graceful-fs": "^4.1.2", "inherits": "~2.0.0", @@ -805,6 +804,12 @@ "rimraf": "~2.6.2" }, "dependencies": { + "esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "dev": true + }, "findup-sync": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz", @@ -850,6 +855,16 @@ "safer-buffer": ">= 2.1.2 < 3" } }, + "js-yaml": { + "version": "3.5.5", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz", + "integrity": "sha1-A3fDgBfKvHMisNH7zSWkkWQfL74=", + "dev": true, + "requires": { + "argparse": "^1.0.2", + "esprima": "^2.6.0" + } + }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", @@ -1412,13 +1427,13 @@ "optional": true }, "js-yaml": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz", - "integrity": "sha1-A3fDgBfKvHMisNH7zSWkkWQfL74=", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", "dev": true, "requires": { - "argparse": "^1.0.2", - "esprima": "^2.6.0" + "argparse": "^1.0.7", + "esprima": "^4.0.0" } }, "jsbn": { diff --git a/package.json b/package.json index 4a4e361a1f..e5158c9bdc 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "author": "", "license": "GPL-3.0", "devDependencies": { + "fstream": ">=1.0.12", "grunt": "~1.0.3", "grunt-chmod": "~1.1.0", "grunt-contrib-clean": "~2.0.0", @@ -21,6 +22,7 @@ "grunt-contrib-uglify": "~4.0.0", "grunt-mkdir": "~1.0.0", "grunt-replace": "~1.0.1", + "js-yaml": "^3.13.1", "pofile": "~1.0.11", "tar": "^4.4.8" }