Julia Radzhabova
|
deae069826
|
Update translation
|
2021-02-26 17:53:24 +03:00 |
|
|
Julia Radzhabova
|
808a7ef142
|
[PE] Refactoring
|
2021-02-26 16:49:34 +03:00 |
|
Maxim Kadushkin
|
b4814420f7
|
[all] fix skeleton stylesheets for IE
|
2021-02-22 17:23:58 +03:00 |
|
|
Maxim Kadushkin
|
78f9fa7637
|
[dark theme] support themes in loader
|
2021-02-22 16:58:25 +03:00 |
|
|
Maxim Kadushkin
|
b07a01bb0f
|
[all] hide "Dark theme" option from "View settings" menu
|
2021-02-21 21:40:41 +03:00 |
|
|
Julia Radzhabova
|
6205f6be76
|
Merge pull request #719 from ONLYOFFICE/feature/help-tips
Feature/help tips
|
2021-02-19 20:20:22 +03:00 |
|
|
Julia Radzhabova
|
3d088ba86b
|
Fix translation
|
2021-02-19 20:06:36 +03:00 |
|
|
Julia Radzhabova
|
5c1b1185dd
|
Delete dark theme tooltip
|
2021-02-19 20:00:35 +03:00 |
|
|
Julia Radzhabova
|
01b693f9c0
|
Update translation
|
2021-02-19 18:51:58 +03:00 |
|
|
Julia Radzhabova
|
dcfed71c9b
|
Update translation
|
2021-02-19 16:30:57 +03:00 |
|
|
Julia Radzhabova
|
efa67ab226
|
Update help
|
2021-02-19 16:20:53 +03:00 |
|
|
Julia Radzhabova
|
ba714c7007
|
Update translation
|
2021-02-19 14:01:26 +03:00 |
|
|
Julia Radzhabova
|
8b1fd47bba
|
Update translation
|
2021-02-19 13:48:37 +03:00 |
|
|
Julia Radzhabova
|
10d0cb5c32
|
Update translation
|
2021-02-19 13:39:24 +03:00 |
|
|
Maxim Kadushkin
|
098ca4540f
|
[PE] fixed scaled "reporter" window
|
2021-02-19 13:28:05 +03:00 |
|
|
Julia Radzhabova
|
badb1c291b
|
[Signature] Goto signature on context menu
|
2021-02-19 11:43:17 +03:00 |
|
Semyon Bezrukov
|
bf7eb0dd30
|
Fix beta hint typo (#715)
|
2021-02-18 17:55:53 +03:00 |
|
|
Julia Radzhabova
|
1bed0d1bf4
|
Add api parameter customization.hideStartTips: hide theme tooltip
|
2021-02-17 22:09:50 +03:00 |
|
|
Julia Radzhabova
|
1dff1aaae3
|
Show tooltips with dark theme description
|
2021-02-17 21:11:04 +03:00 |
|
|
Julia Radzhabova
|
17a1ec78e4
|
Change synchronize tip component: add new placements
|
2021-02-17 20:25:30 +03:00 |
|
|
Maxim Kadushkin
|
64dfc35569
|
[all] fix bug 448774
|
2021-02-17 19:00:28 +03:00 |
|
|
Julia Radzhabova
|
756d638043
|
Fix layout for IE
|
2021-02-16 17:53:01 +03:00 |
|
|
Julia Radzhabova
|
41a907f48d
|
[PE][PE mobile] Bug 46911
|
2021-02-16 17:05:47 +03:00 |
|
|
Julia Radzhabova
|
7bca00ebc5
|
Merge branch 'develop' into feature/pe-slide-size
|
2021-02-16 15:28:45 +03:00 |
|
|
Maxim Kadushkin
|
f34cb00e98
|
[dark theme] hide theme's option for IE
|
2021-02-16 15:08:39 +03:00 |
|
|
Maxim Kadushkin
|
8847c328a6
|
[dark theme] fix PE styles for IE
|
2021-02-16 11:36:00 +03:00 |
|
|
Julia Radzhabova
|
36856e2e20
|
[PE][PE mobile] Get/set slide size in emu
|
2021-02-15 20:10:46 +03:00 |
|
|
Maxim Kadushkin
|
436e232b2e
|
[all] refactoring
|
2021-02-14 00:44:12 +03:00 |
|
|
Maxim Kadushkin
|
db3a344760
|
[all] added "dark theme" item in button "Options"
|
2021-02-14 00:43:51 +03:00 |
|
|
Maxim Kadushkin
|
c7e6a7a316
|
[all] fix compiled app launch
|
2021-02-13 13:05:16 +03:00 |
|
|
Julia Radzhabova
|
f3bf733cf6
|
Merge pull request #707 from ONLYOFFICE/feature/new-chart-types
Feature/new chart types
|
2021-02-13 12:55:59 +03:00 |
|
|
Maxim Kadushkin
|
8ae4d58b96
|
[all] fix compiled app launch
|
2021-02-12 23:51:01 +03:00 |
|
|
Julia Radzhabova
|
0e5e7f81e2
|
Update translation
|
2021-02-12 17:59:34 +03:00 |
|
|
Julia Radzhabova
|
fb8a6f1a98
|
Merge pull request #704 from ONLYOFFICE/feature/hide-rulers
Add hideRulers parameter to customization
|
2021-02-12 14:39:24 +03:00 |
|
|
Maxim Kadushkin
|
e641628a63
|
[all] refactoring
|
2021-02-12 12:08:53 +03:00 |
|
|
Maxim Kadushkin
|
3636bf78c4
|
[all] fix for device scaling checking
|
2021-02-12 12:08:33 +03:00 |
|
|
Julia Radzhabova
|
1de1fd9963
|
Add hideRulers parameter to customization
|
2021-02-11 20:13:47 +03:00 |
|
|
Julia Radzhabova
|
8dfd43ec0e
|
Change api parameter reviewGroups
|
2021-02-11 19:26:06 +03:00 |
|
|
Julia Radzhabova
|
47f079dcb3
|
Merge branch 'develop' into feature/new-chart-types
|
2021-02-11 17:22:09 +03:00 |
|
|
Julia Radzhabova
|
348a771171
|
Refactoring editors loading
|
2021-02-11 15:52:38 +03:00 |
|
|
Maxim Kadushkin
|
5330e3a3c8
|
[all] skeleton support for 150%
|
2021-02-10 23:42:55 +03:00 |
|
|
Julia Radzhabova
|
7a62278eb9
|
Update translation
|
2021-02-10 18:15:56 +03:00 |
|
|
Maxim Kadushkin
|
f62aa45b18
|
Merge branch 'develop' into feature/multiZoom5.5
# Conflicts:
# apps/common/main/resources/img/toolbar/1x/big/.css.handlebars
# apps/common/main/resources/less/asc-mixins.less
# apps/common/main/resources/less/buttons.less
# apps/common/main/resources/less/checkbox.less
# apps/common/main/resources/less/combo-dataview.less
# apps/common/main/resources/less/comments.less
# apps/common/main/resources/less/common.less
# apps/common/main/resources/less/dataview.less
# apps/common/main/resources/less/dropdown-menu.less
# apps/common/main/resources/less/listview.less
# apps/common/main/resources/less/multislider-gradient.less
# apps/common/main/resources/less/radiobox.less
# apps/common/main/resources/less/scroller.less
# apps/common/main/resources/less/separator.less
# apps/common/main/resources/less/theme-colorpalette.less
# apps/common/main/resources/less/toolbar.less
# apps/common/main/resources/less/window.less
# apps/documenteditor/main/resources/less/advanced-settings.less
# apps/documenteditor/main/resources/less/filemenu.less
# apps/documenteditor/main/resources/less/leftmenu.less
# apps/documenteditor/main/resources/less/rightmenu.less
# apps/documenteditor/main/resources/less/statusbar.less
# apps/documenteditor/main/resources/less/toolbar.less
# apps/presentationeditor/main/resources/less/leftmenu.less
# apps/presentationeditor/main/resources/less/rightmenu.less
# apps/presentationeditor/main/resources/less/statusbar.less
# apps/spreadsheeteditor/main/resources/less/celleditor.less
# apps/spreadsheeteditor/main/resources/less/leftmenu.less
# apps/spreadsheeteditor/main/resources/less/rightmenu.less
# apps/spreadsheeteditor/main/resources/less/statusbar.less
# apps/spreadsheeteditor/main/resources/less/toolbar.less
|
2021-02-10 15:40:30 +03:00 |
|
|
Maxim Kadushkin
|
3f228da263
|
[stylesheets] refactoring
|
2021-02-07 00:30:24 +03:00 |
|
|
Maxim Kadushkin
|
5b57ee760b
|
Merge branch 'develop' into feature/colors-table
# Conflicts:
# apps/common/main/resources/less/loadmask.less
# apps/documenteditor/main/app/controller/Main.js
# apps/documenteditor/main/app/view/FileMenuPanels.js
# apps/documenteditor/main/resources/less/toolbar.less
# apps/presentationeditor/main/app/controller/Main.js
# apps/presentationeditor/main/app/controller/RightMenu.js
# apps/presentationeditor/main/app/view/FileMenuPanels.js
# apps/presentationeditor/main/app/view/SlideSettings.js
# apps/spreadsheeteditor/main/app/controller/Main.js
# apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
# apps/spreadsheeteditor/main/resources/less/toolbar.less
|
2021-02-06 14:42:56 +03:00 |
|
|
Maxim Kadushkin
|
1cd0586ed6
|
[dark theme] changed script for deployment
|
2021-02-06 13:08:20 +03:00 |
|
|
Maxim Kadushkin
|
900a179f7e
|
[dark theme] added ui themes switcher
|
2021-02-06 13:06:33 +03:00 |
|
|
Maxim Kadushkin
|
f938e668ef
|
[dark theme] added 'Themes' controller
|
2021-02-06 13:03:46 +03:00 |
|
|
Maxim Kadushkin
|
c879fa6c80
|
[dark theme] changed storage key name
|
2021-02-06 12:55:47 +03:00 |
|
|
Julia Radzhabova
|
a79e733de4
|
Update translation
|
2021-02-05 16:34:50 +03:00 |
|
|
Julia Radzhabova
|
57b1ff417d
|
Update help
|
2021-02-05 16:07:35 +03:00 |
|
|
Julia Radzhabova
|
6d02752fce
|
Update translation
|
2021-02-05 14:56:57 +03:00 |
|
|
Julia Radzhabova
|
f17b8d1c76
|
Change review permissions: deprecate customization.reviewPermissions parameter. Use permissions.reviewGroup instead: list of groups, that current user can accept/reject.
|
2021-02-05 13:51:37 +03:00 |
|
|
Julia Radzhabova
|
310c00b245
|
Deprecate api parameters: document.info.author, document.info.created. Use document.info.owner and document.info.uploaded instead.
|
2021-02-04 16:05:49 +03:00 |
|
|
Julia Radzhabova
|
60cbd47725
|
Add new parameters to "permissions" section of config: editCommentAuthorOnly (can edit your own comments only if true), deleteCommentAuthorOnly (can delete your own comments only if true).
Deprecate customization.commentAuthorOnly parameter.
|
2021-02-04 12:39:56 +03:00 |
|
|
Julia Radzhabova
|
b72744ef47
|
FIx Bug 48553
|
2021-02-03 16:56:01 +03:00 |
|
|
Maxim Kadushkin
|
3ef5d0e738
|
[themes] apply theme to "presenter" view
|
2021-02-03 10:12:26 +03:00 |
|
|
Maxim Kadushkin
|
a24f5c0068
|
[PE] refactoring
|
2021-02-03 10:02:41 +03:00 |
|
|
Julia Radzhabova
|
7272ebad10
|
Update translation
|
2021-02-02 18:36:37 +03:00 |
|
|
Julia Radzhabova
|
772caab844
|
Update translation
|
2021-02-02 18:09:08 +03:00 |
|
|
Maxim Kadushkin
|
40a7e66834
|
[dark theme] keep theme name for next session
|
2021-02-02 15:37:00 +03:00 |
|
|
Julia Radzhabova
|
57775d3951
|
Fix Bug 48522
|
2021-02-02 14:46:13 +03:00 |
|
|
Julia Radzhabova
|
822d88b6d9
|
Add warning when set the password
|
2021-02-02 13:28:35 +03:00 |
|
|
Julia Radzhabova
|
b2dbf6b3c8
|
Change open file dialog
|
2021-02-02 12:59:45 +03:00 |
|
|
Julia Radzhabova
|
4dca8fad6a
|
Update help
|
2021-02-02 11:43:46 +03:00 |
|
|
Maxim Kadushkin
|
acb17c9e08
|
[multiscaling] correct some elements
|
2021-01-31 22:35:09 +03:00 |
|
|
Julia Radzhabova
|
c5a4982382
|
Hide styles for combined charts
|
2021-01-30 16:15:25 +03:00 |
|
|
Julia Radzhabova
|
e83357f86a
|
[PE] Fix Bug 46920: add highlight button
|
2021-01-29 17:31:46 +03:00 |
|
|
Julia Radzhabova
|
b003a5c021
|
[PE] Bug 46920: Add change case button
|
2021-01-29 16:06:51 +03:00 |
|
|
Julia Radzhabova
|
b2dd7d02d6
|
Merge pull request #682 from ONLYOFFICE/release/v6.2.0
Release/v6.2.0
|
2021-01-28 12:07:00 +03:00 |
|
|
Julia Radzhabova
|
6a6e895d08
|
[PE] Fix Bug 48161
|
2021-01-25 17:22:01 +03:00 |
|
|
Julia Radzhabova
|
f9b17e98c8
|
Update translation
|
2021-01-23 00:41:17 +03:00 |
|
|
Julia Radzhabova
|
7a63ee0ed9
|
Update translation
|
2021-01-22 17:58:25 +03:00 |
|
|
Maxim Kadushkin
|
8e81a7b0e1
|
[scaling] repaired some elements
|
2021-01-22 00:18:15 +03:00 |
|
|
Julia Radzhabova
|
c295698704
|
Refactoring color buttons
|
2021-01-21 22:48:27 +03:00 |
|
|
Julia Radzhabova
|
25fb714042
|
Merge pull request #666 from ONLYOFFICE/feature/bug-48248
Feature/bug 48248
|
2021-01-21 16:00:35 +03:00 |
|
|
Maxim Kadushkin
|
4412524e82
|
[multiscaling] repaired some components
|
2021-01-21 13:14:36 +03:00 |
|
|
Maxim Kadushkin
|
edca282ea7
|
[scaling] skip to apply initial zoom
|
2021-01-21 00:05:31 +03:00 |
|
|
Julia Radzhabova
|
e6a7ab5dfb
|
Fix updating guest user name
|
2021-01-20 23:49:01 +03:00 |
|
|
Julia Radzhabova
|
791d86c1be
|
Update help
|
2021-01-20 20:42:21 +03:00 |
|
|
Julia Radzhabova
|
3e6090ca71
|
Remove warning when open protected files (saving files with password implemented for online files)
|
2021-01-20 19:32:42 +03:00 |
|
|
Julia Radzhabova
|
14ad8d8aef
|
Add translation
|
2021-01-20 18:42:55 +03:00 |
|
|
Julia Radzhabova
|
e32c1fd3cf
|
[DE][PE] Bug 48248: add auto color to border palette
|
2021-01-20 16:42:48 +03:00 |
|
|
Julia Radzhabova
|
e8eba05a54
|
Merge branch 'release/v6.2.0' into develop
|
2021-01-19 18:05:55 +03:00 |
|
|
Julia Radzhabova
|
0dd5a8a5de
|
Merge branch 'hotfix/v6.1.1' into release/v6.2.0
|
2021-01-19 11:26:24 +03:00 |
|
|
Maxim Kadushkin
|
d7a2a47979
|
[stylesheets] repaired components according to colors table
|
2021-01-18 23:27:47 +03:00 |
|
|
Julia Radzhabova
|
380a5cba92
|
Update translation
|
2021-01-18 19:08:41 +03:00 |
|
|
Julia Radzhabova
|
0bf41fbee2
|
Update translation
Fix Bug 48205, Bug 43454
|
2021-01-18 17:57:14 +03:00 |
|
|
Julia Radzhabova
|
cdffc1a6e3
|
Fix Bug 48258
|
2021-01-18 13:26:39 +03:00 |
|
|
Maxim Kadushkin
|
29951e266e
|
[stylesheets] repired some components according to colors table
|
2021-01-18 12:19:38 +03:00 |
|
|
Maxim Kadushkin
|
ed7f30f957
|
[scaling] repaired style for some components
|
2021-01-15 18:58:54 +03:00 |
|
|
Julia Radzhabova
|
c9dc69901f
|
Update help
|
2021-01-14 14:37:06 +03:00 |
|
|
Julia Radzhabova
|
86e628b6b6
|
Add new chart types
|
2021-01-14 12:57:22 +03:00 |
|
|
Julia Radzhabova
|
499a033585
|
[PE] Add opacity for slide background
|
2021-01-13 19:34:16 +03:00 |
|
|
Julia Radzhabova
|
b51aec35cf
|
Remove caption from chart type menu
|
2021-01-13 14:14:36 +03:00 |
|
|
Julia Radzhabova
|
0adafd056a
|
[PE] Add columns settings to Home tab
|
2021-01-12 23:01:55 +03:00 |
|
|
Julia Radzhabova
|
7bcfce8e99
|
Update translation
|
2021-01-12 15:05:44 +03:00 |
|
|
Julia Radzhabova
|
844882cc28
|
Update translation
|
2021-01-12 14:51:58 +03:00 |
|
|
Julia Radzhabova
|
30337a0a56
|
Fix changing units of measurement.
Fix form settings.
|
2021-01-11 18:06:12 +03:00 |
|
|
Maxim Kadushkin
|
bd6c34b66d
|
[stylesheets] repaired some components
|
2021-01-06 20:33:01 +03:00 |
|
|
Maxim Kadushkin
|
5f6956ac0f
|
[stylesheets] repaired stylesheets
|
2021-01-04 00:58:06 +03:00 |
|
|
Julia Radzhabova
|
a68f4b50cc
|
Add translation
|
2020-12-30 11:31:49 +03:00 |
|
|
Julia Radzhabova
|
64f81a2984
|
Merge branch 'feature/guest-name' into develop
|
2020-12-30 11:24:02 +03:00 |
|
|
Julia Radzhabova
|
fc9530d919
|
Add customization parameter for setting anonymous name.
|
2020-12-29 23:48:47 +03:00 |
|
|
Maxim Kadushkin
|
39a5bad243
|
[stylesheets] change theme for 'document' area in DE and PE
|
2020-12-29 10:34:59 +03:00 |
|
|
Maxim Kadushkin
|
c81778a5a6
|
[stylesheets] repaired some components
|
2020-12-26 17:44:36 +03:00 |
|
|
Julia Radzhabova
|
99cf0d31aa
|
Update translation
|
2020-12-25 15:30:57 +03:00 |
|
|
Julia Radzhabova
|
05130ea958
|
Update translation
|
2020-12-25 15:19:56 +03:00 |
|
|
Julia Radzhabova
|
dae5509b6d
|
Fix translation
|
2020-12-25 10:47:57 +03:00 |
|
|
Julia Radzhabova
|
f13c8ed33d
|
[DE] Fix Bug 48107
|
2020-12-24 11:50:09 +03:00 |
|
papacarlo
|
3262edd742
|
Merge branch release/v6.1.0 into develop
|
2020-12-24 07:51:18 +00:00 |
|
|
Julia Radzhabova
|
cd710c97e9
|
Fix loader layout
|
2020-12-23 20:22:31 +03:00 |
|
|
Julia Radzhabova
|
b06f78acc0
|
Fix show collaboration tab
|
2020-12-22 15:37:05 +03:00 |
|
|
Julia Radzhabova
|
d31aaac45b
|
Fix toolbar styles
|
2020-12-22 15:30:52 +03:00 |
|
|
Julia Radzhabova
|
1474c14019
|
Change styles for toolbar
|
2020-12-22 14:45:08 +03:00 |
|
|
Julia Radzhabova
|
2784812084
|
Refactoring
|
2020-12-21 17:38:32 +03:00 |
|
|
Julia Radzhabova
|
dbfcca5652
|
Disable favorite button for offline files
|
2020-12-21 14:07:00 +03:00 |
|
|
Maxim Kadushkin
|
a1d23fdda3
|
[PE] support of dark theme
|
2020-12-21 13:32:36 +03:00 |
|
|
Maxim Kadushkin
|
4c0e555be1
|
[PE] switch to dark theme
|
2020-12-21 13:31:46 +03:00 |
|
|
Julia Radzhabova
|
4bbdef54ff
|
Update translation
|
2020-12-21 00:13:47 +03:00 |
|
|
Julia Radzhabova
|
678139bd79
|
Update translation
|
2020-12-21 00:07:23 +03:00 |
|
|
Julia Radzhabova
|
88eb04e0d3
|
Fix changing guest name
|
2020-12-20 12:22:46 +03:00 |
|
|
Maxim Kadushkin
|
3f7e982b79
|
[stylesheets] changed less variables
|
2020-12-19 22:44:34 +03:00 |
|
|
Julia Radzhabova
|
e7877564d6
|
Fix set name for ie11
|
2020-12-18 19:20:31 +03:00 |
|
|
Julia Radzhabova
|
e8dcb54c78
|
Fix changing user name
|
2020-12-18 13:23:14 +03:00 |
|
|
Maxim Kadushkin
|
86273f4959
|
[stylesheets] change colors to variables
|
2020-12-17 11:16:45 +03:00 |
|
|
Julia Radzhabova
|
2c5e7f8d00
|
Fix favorites
|
2020-12-15 17:28:12 +03:00 |
|
|
Julia Radzhabova
|
a30176fae1
|
Add/remove file to favorites
|
2020-12-14 22:45:30 +03:00 |
|
|
Julia Radzhabova
|
d067d3572c
|
Show custom message for protected files
|
2020-12-14 14:47:48 +03:00 |
|
|
Julia Radzhabova
|
a44b9ce686
|
Update translation
|
2020-12-11 16:14:42 +03:00 |
|
|
Julia Radzhabova
|
147d23d1d5
|
Update translation
|
2020-12-11 15:58:46 +03:00 |
|
|
Julia Radzhabova
|
d190e67c41
|
Fix error
|
2020-12-11 15:26:52 +03:00 |
|
|
Julia Radzhabova
|
c6b6a7a0d0
|
Allow password for web apps
|
2020-12-10 17:25:39 +03:00 |
|
|
Julia Radzhabova
|
3b553bb49d
|
Add translation
|
2020-12-10 15:05:48 +03:00 |
|
|
Julia Radzhabova
|
e84335b357
|
Add translation
|
2020-12-08 23:10:38 +03:00 |
|
|
Julia Radzhabova
|
ca01b519f9
|
[SSE] Show errors when set combo chart type
|
2020-12-08 11:48:28 +03:00 |
|
|
Maxim Kadushkin
|
23d1d5204e
|
[all][xp] fix bug 47868
|
2020-12-07 13:22:38 +03:00 |
|
|
Julia Radzhabova
|
9b2885e18b
|
Update translation
|
2020-12-06 00:23:42 +03:00 |
|
|
Julia Radzhabova
|
38d3a07e2b
|
Update translation
|
2020-12-05 23:50:37 +03:00 |
|
Sergey Luzyanin
|
6339b19437
|
Refactoring: rename timing to transition
|
2020-12-02 13:11:49 +03:00 |
|
|
Julia Radzhabova
|
0cdea5cec9
|
[PE] Fix Bug 26518
|
2020-11-28 00:23:26 +03:00 |
|
|
Julia Radzhabova
|
94ed2be03f
|
Update translation
|
2020-11-27 23:17:48 +03:00 |
|
|
Julia Radzhabova
|
b3119b7c18
|
Merge branch 'release/v6.1.0' into develop
|
2020-11-26 19:17:55 +03:00 |
|
|
Julia Radzhabova
|
3fdff95136
|
Fix license
|
2020-11-25 17:27:53 +03:00 |
|
|
Julia Radzhabova
|
2d250c6802
|
Fix Bug 47094
|
2020-11-24 15:31:51 +03:00 |
|
|
Julia Radzhabova
|
67745e22b1
|
Fix Bug 47637
|
2020-11-24 14:54:41 +03:00 |
|
|
Julia Radzhabova
|
73a832242d
|
Update help, Fix Bug 47620
|
2020-11-23 17:56:11 +03:00 |
|
|
Julia Radzhabova
|
b6f31fc7d1
|
[PE] Fix Bug 47621
|
2020-11-22 21:14:27 +03:00 |
|
|
Julia Radzhabova
|
8c24af4aa7
|
Fix Bug 47617: rename images
|
2020-11-22 21:00:44 +03:00 |
|
|
Julia Radzhabova
|
f6950535f6
|
Fix Bug 47611
|
2020-11-21 23:55:54 +03:00 |
|