Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
9957 commits 47 branches 5000 tags 623 MiB
Commit graph

3034 commits

Author SHA1 Message Date
Julia Radzhabova 9be440c3b3 Fix focus for menu with dataview 2021-09-17 23:30:46 +03:00
Julia Radzhabova 97f607afa9 [DE] Fix focus in content controls settings 2021-09-17 23:02:24 +03:00
Julia Radzhabova b4991432a5 Fix focus in multilevel menu 2021-09-17 22:59:02 +03:00
JuliaSvinareva 637443b913
Merge pull request #1182 from ONLYOFFICE/feature/Bug_43485 
Feature/bug 43485
 2021-09-17 20:11:56 +03:00
Julia Radzhabova 2881ce85fa Update translation 2021-09-17 20:06:09 +03:00
JuliaSvinareva 1c59318682 [DE PE SSE] Add translations for recent shape 2021-09-16 21:02:29 +03:00
JuliaSvinareva c8691ad743 [DE SSE] Change shape menu (bug 43485) 2021-09-16 20:47:48 +03:00
Maxim Kadushkin aa62d6b8d9 [DE] fix bug 52486 2021-09-16 18:42:24 +03:00
Julia Radzhabova b50bff460e [DE] Change add style menu item 2021-09-16 12:36:12 +03:00
Maxim Kadushkin d87f2970ed [themes] fix bug 52580 2021-09-16 01:15:34 +03:00
Julia Radzhabova 0a2d74e72e Disconnect on ConvertationOpenLimitError 2021-09-14 23:17:43 +03:00
Julia Radzhabova bdd326ea12 Fix Bug 52567 2021-09-14 18:45:18 +03:00
Julia Radzhabova 275ffa752c
Merge pull request #1174 from ONLYOFFICE/fix/bugfix 
Add oxps format
 2021-09-13 16:59:59 +03:00
Julia Radzhabova 9c36f3bab5 Add oxps format 2021-09-13 16:53:44 +03:00
Maxim Kadushkin d8eb811b74 [DE] fix bug 52486 2021-09-13 16:44:47 +03:00
Julia Radzhabova ed79e76f30 Update translation 2021-09-10 15:56:49 +03:00
JuliaSvinareva 7e661deea3 [DE] Fix context menu for combo box in view form mode 2021-09-10 10:32:39 +03:00
Julia Radzhabova 6dcf5c9711 Fix Bug 50962: add parameter to config: permissions->protect // show/hide protect feature 2021-09-09 19:15:29 +03:00
Julia Radzhabova e436fe3876 Refactoring table templates rendering 2021-09-08 19:26:02 +03:00
Julia Radzhabova f872be81c9 Refactoring dataview component 2021-09-08 18:42:05 +03:00
Julia Radzhabova a7d388b996 [DE] Fix custom page size 2021-09-07 20:58:45 +03:00
Julia Radzhabova 6eb6cb1db5 [DE] Check page size and page margins when select preset from toolbar. Bug 44180 2021-09-07 19:54:22 +03:00
Julia Radzhabova 7f5fe2274f
Merge pull request #1163 from ONLYOFFICE/release/v6.5.0 
Release/v6.5.0
 2021-09-07 14:13:11 +03:00
Julia Radzhabova 8c55b7cf64 [DE][PE] Fix Bug 52335 2021-09-07 13:39:38 +03:00
Julia Radzhabova a4d21050a3 [DE] Fix editor without content control modification 2021-09-07 00:04:52 +03:00
JuliaSvinareva b1f5dac8ab [DE] Fix context menu for view form mode (for bug 50062) 2021-09-03 18:14:41 +03:00
Julia Radzhabova a23285ba06 Update help. Bug 52172. 2021-09-03 18:06:33 +03:00
Julia Radzhabova ac851c3951 [DE] Fix Bug 52172 2021-09-03 17:38:49 +03:00
JuliaSvinareva 633ddd4e9c [DE PE SSE] Add tooltips to resolved icon when we can not edit comment (bug 51488) 2021-09-03 15:46:42 +03:00
Julia Radzhabova bc20db597b Fix Bug 44992 2021-09-03 14:39:20 +03:00
Julia Radzhabova 8ab86fc4ae Update translation 2021-09-03 13:58:58 +03:00
Julia Radzhabova 51e2efcf9a [DE] Fix Bug 41845 2021-09-03 00:31:19 +03:00
Julia Radzhabova c5326a95a7 [DE] Fix Bug 48154 2021-09-02 23:26:46 +03:00
JuliaSvinareva 89e99a323f [DE] Fix bug 50062 2021-09-02 21:32:19 +03:00
Julia Radzhabova d2ce8e60c4 [DE][PE] Fix Bug 50031. Change set language button 2021-09-02 17:58:18 +03:00
Julia Radzhabova 38def0be24
Merge pull request #1146 from ONLYOFFICE/release/v6.5.0 
Release/v6.5.0
 2021-09-01 15:22:49 +03:00
Julia Radzhabova 51fad69da6 For Bug 49584 2021-08-31 19:08:04 +03:00
Julia Radzhabova cb7bd14600 Add parameters to docinfo 2021-08-31 16:12:30 +03:00
Julia Radzhabova 3d8f6167ed Deprecate url parameter of the insertImage method 2021-08-31 00:12:45 +03:00
Julia Radzhabova 7523a0078f Fix Bug 49127 2021-08-30 23:12:11 +03:00
Julia Radzhabova ee4e8ea3a1
Merge pull request #1135 from ONLYOFFICE/feature/Bug-49584 
Feature/bug 49584
 2021-08-30 01:12:05 +03:00
Julia Radzhabova 34a787f85c Temp fix 2021-08-30 01:04:46 +03:00
JuliaSvinareva 7eb887be42
Merge pull request #1133 from ONLYOFFICE/feature/de-form-settings 
Feature/de form settings
 2021-08-27 18:55:01 +03:00
Julia Radzhabova 9d7a50136e
Merge pull request #1132 from ONLYOFFICE/feature/Bug-29082 
Feature/bug 29082
 2021-08-27 18:42:37 +03:00
Julia Radzhabova c0dd69a647 Update translation 2021-08-27 17:22:46 +03:00
JuliaSvinareva 28142781ba [DE] Fix thumbnails page 2021-08-27 14:50:02 +03:00
Julia Radzhabova baf37cc490 [DE][PE] Fix Bug 49584 2021-08-27 14:42:59 +03:00
Julia Radzhabova 7b57bdb6b7 Fix loading images from storage 2021-08-27 14:07:50 +03:00
Julia Radzhabova 34d89a2043 [DE] Fix loading mail merge from URL 2021-08-27 11:19:59 +03:00
Julia Radzhabova b6aa262f2b [DE] For Bug 29082: load recipient list from url or file 2021-08-26 23:56:09 +03:00
JuliaSvinareva c89bc87017 [DE] Page thumbnails: add handlers 2021-08-26 18:39:06 +03:00
Julia Radzhabova 23fb2b0bbf
Merge pull request #1128 from ONLYOFFICE/feature/Bug-50683 
Fix Bug 50683
 2021-08-26 18:11:41 +03:00
Julia Radzhabova 563291b195 Fix Bug 52205 2021-08-26 17:33:13 +03:00
JuliaSvinareva 6da800f8c0 [DE] Page thumbnails: fix closing dropdown menu when click on slider item 2021-08-26 17:21:08 +03:00
Julia Radzhabova 8221ad5e63 [DE] Add settings for changes display: tooltips or balloons (customization->review->hoverMode) 2021-08-26 16:43:18 +03:00
Julia Radzhabova f336d0ef0a Fix Bug 50683 2021-08-26 15:14:29 +03:00
JuliaSvinareva cbd88e8284 [DE] Add icons, change styles in page thumbnails 2021-08-26 14:10:27 +03:00
Julia Radzhabova 686a648051 Update help 2021-08-26 01:43:28 +03:00
JuliaSvinareva 162864b26b [DE] Add settings and close buttons in page thumbnails 2021-08-25 22:24:49 +03:00
Julia Radzhabova a207366b14 Fix merge release to develop 2021-08-25 20:51:35 +03:00
Maxim Kadushkin 5a7421e35d merge release 6.4.0 to develop 2021-08-25 19:02:44 +03:00
Julia Radzhabova 704c5a6a00 Refactoring create new file: show "create new" when templates are available in config 2021-08-24 18:30:55 +03:00
Julia Radzhabova 2b81097012 Fix creating new file when templates avaliable. 2021-08-24 16:16:04 +03:00
Julia Radzhabova 0c09284b3a For Bug 51561 2021-08-24 14:52:58 +03:00
JuliaSvinareva 0f76f5833a [DE] Add Page Thumbnails panel in left menu 2021-08-24 14:34:10 +03:00
Julia Radzhabova 4ed61a579c For Bug 51561 2021-08-24 14:32:21 +03:00
Julia Radzhabova 75a5df7f22 Merge branch 'feature/view-for-create-new' into develop 
Fix Bug 51561
 2021-08-24 13:56:25 +03:00
Julia Radzhabova 710ddf98ca Fix styles for file templates 2021-08-24 13:38:19 +03:00
OVSharova 90ef8be900 Fix bug 2021-08-24 12:38:06 +03:00
OVSharova 75a15ee3d7 Fix bug 2021-08-24 12:04:32 +03:00
OVSharova a16bd4051d Fix placement 2021-08-24 11:52:10 +03:00
OVSharova 9bc917c0ac Fix color 2021-08-24 11:37:19 +03:00
OVSharova 76bcdea1e8 Fix bug 2021-08-23 23:13:08 +03:00
Julia Radzhabova a9212b73ca Update translation. Fix Bug 51479 2021-08-23 20:51:56 +03:00
Julia Radzhabova e7cfb129c2 Fix Bug 51838 2021-08-23 17:47:10 +03:00
OVSharova 1b65d263dc Fix style 2021-08-23 17:18:30 +03:00
OVSharova d25110f142 Fix style 2021-08-23 17:12:40 +03:00
OVSharova a507452c7f Fix thumb-list 2021-08-23 03:24:48 +03:00
Maxim Kadushkin 0b1168b64e [scaling] apply icons for 125% and 175% 2021-08-23 00:15:51 +03:00
Julia Radzhabova 1552d32271 [DE] Hide forms tab 2021-08-20 18:48:18 +03:00
Julia Radzhabova 3c660d468d Update translation 2021-08-20 18:01:23 +03:00
Julia Radzhabova 5ffb7e8fa0 [SSE] Disable remove/resolve comment buttons when objects protected 2021-08-20 17:38:32 +03:00
OVSharova 6e1afc37f3 Change en.json 2021-08-20 11:29:00 +03:00
OVSharova 740acf45fb Fix style 2021-08-20 03:57:16 +03:00
OVSharova 9a9db37aa9 SSE and tooltip 2021-08-20 01:19:56 +03:00
Julia Radzhabova a29ab88428 For Bug 50233 2021-08-19 20:58:59 +03:00
Julia Radzhabova 24a9b14958 Fix Bug 48962 2021-08-19 15:50:54 +03:00
Julia Radzhabova 75794623c9 [DE] Fix layout 2021-08-19 13:38:41 +03:00
OVSharova d8cb7fb985 edit template DE and PE 2021-08-19 03:03:22 +03:00
Julia Radzhabova 379c97835a Fix Bug 51845, use 1.25, 1.75 icons 2021-08-18 15:18:58 +03:00
Julia Radzhabova 7f0c53fb91 [DE] Fix Bug 51925 2021-08-17 22:12:29 +03:00
JuliaSvinareva 0745e1a040 [DE SSE] Add missed alt-key hints 2021-08-17 15:39:32 +03:00
Julia Radzhabova bb4bf10ada Fix loader: show mask immediately, but loader on timer (for version history bug, for bug 51752) 2021-08-17 14:15:53 +03:00
Julia Radzhabova ef1a5ffe05 [DE] Fix Bug 51752 2021-08-17 12:06:41 +03:00
Julia Radzhabova f71b939ea1 For Bug 51938 2021-08-13 23:46:06 +03:00
Julia Radzhabova 43491e0115
Merge pull request #1075 from ONLYOFFICE/feature/de-review 
Feature/de review
 2021-08-13 20:28:10 +03:00
Julia Radzhabova 24f31be6e9 Update translation 2021-08-13 17:10:55 +03:00
Julia Radzhabova 39239c81f4 For Bug 51845 2021-08-13 16:55:42 +03:00
JuliaSvinareva 20cfb07621 [DE] Add background color in form settings 2021-08-12 20:06:16 +03:00
Julia Radzhabova d978dc52e6
Merge pull request #1064 from ONLYOFFICE/feature/download-file-type 
Feature/download file type
 2021-08-12 16:01:19 +03:00
JuliaSvinareva 903e7862cb Alt-key hints: don't show hints that go beyond the boundaries of the document 2021-08-12 15:39:47 +03:00
Julia Radzhabova 6d6088233f [DE] For Bug 51925 2021-08-12 14:54:06 +03:00
JuliaSvinareva d429cc027a [DE] Make border color visible in all forms 2021-08-12 13:23:47 +03:00
JuliaSvinareva 53add1d1d9 [DE] Fix form settings template 2021-08-12 13:04:40 +03:00
Julia Radzhabova 6c5f96b75b Change translation 2021-08-11 15:39:32 +03:00
Julia Radzhabova c69e2cb695 [DE] Refactoring review tips 2021-08-11 14:03:08 +03:00
JuliaSvinareva 395445571a
Merge pull request #1057 from ONLYOFFICE/feature/Bug_50105 
Feature/bug 50105
 2021-08-09 19:28:01 +03:00
JuliaSvinareva 0cba1c20e0 [DE] Fix position image setting in form settings 2021-08-09 19:11:22 +03:00
Julia Radzhabova 7dcbc69f1b Fix sending filetype 2021-08-09 19:09:59 +03:00
Julia Radzhabova 3ab6e18621 Merge branch 'release/v6.4.0' into develop 2021-08-09 13:30:40 +03:00
Julia Radzhabova e19e8eb15a Update translation 2021-08-06 17:36:33 +03:00
JuliaSvinareva 817d6338f1 [DE] Fix position image setting in form settings 2021-08-05 15:34:28 +03:00
JuliaSvinareva f466027c0f [DE] Make position image setting in form settings 2021-08-05 01:27:55 +03:00
Julia Radzhabova 9d9ae009e3 [DE] Fix Bug 51724 2021-08-04 19:18:26 +03:00
Julia Radzhabova 2c5cecd31b [DE] Fix Bug 51727 2021-08-04 18:08:17 +03:00
Julia Radzhabova 2954b9ded5 [DE] Add parameter review.hoverMode to customization: show review changes balloons as tooltips (on mouse move) 2021-08-04 15:43:54 +03:00
Julia Radzhabova 7dfb96f914 [DE] Add simple markup mode for display review changes 2021-08-04 13:19:19 +03:00
JuliaSvinareva b634ce9493 [DE] Make position image setting in form settings 2021-08-03 20:00:23 +03:00
Julia Radzhabova 64b408b18a Fix Bug 51654 2021-08-02 16:52:33 +03:00
Julia Radzhabova dab0216a3b Update translation 2021-07-30 15:23:08 +03:00
Julia Radzhabova 92bb409c5a Send file type in events onRequestRestore, onDownloadAs, onRequestSaveAs 2021-07-30 01:01:33 +03:00
Julia Radzhabova 7ddde2c3fa Add formats to downloadAs method 2021-07-29 18:52:37 +03:00
Julia Radzhabova ff167b1087 [DE] Highlight required fields in fill form mode 2021-07-29 18:26:31 +03:00
Julia Radzhabova 81d81d0d4e [DE] Change border settings for forms 2021-07-29 18:01:28 +03:00
Julia Radzhabova 2be088df19
Merge pull request #1024 from ONLYOFFICE/fix/version-history 
Fix/version history
 2021-07-28 18:17:08 +03:00
Julia Radzhabova adedc692cd Fix Bug 51562 2021-07-28 14:47:49 +03:00
Julia Radzhabova 5454b06329 Fix version history 2021-07-28 14:23:40 +03:00
Julia Radzhabova d767fa5399 Merge branch 'release/v6.4.0' into develop 2021-07-28 00:03:49 +03:00
Julia Radzhabova 9a5b2487ed [DE][PE] Fix version restore 2021-07-27 22:13:26 +03:00
Julia Radzhabova c8e30ead12 Fix Bug 51343 2021-07-27 18:20:52 +03:00
Maxim Kadushkin d936e8765e [themes] hide "Dark mode" button instead of disable 2021-07-27 16:48:44 +03:00
Julia Radzhabova fb325aaa19 Update translation 2021-07-23 20:08:13 +03:00
Julia Radzhabova e1fc8d4de3 Fix Bug 51491 2021-07-23 19:38:42 +03:00
Julia Radzhabova f305e57396 Fix Bug 51487 2021-07-23 17:40:21 +03:00
Julia Radzhabova ea7a738c5e [DE] Select form placeholder on focus 2021-07-22 23:39:06 +03:00
Julia Radzhabova be8bc7dd42 Move api parameters showReviewChanges, reviewDisplay, trackChanges to section customization.review 2021-07-22 22:56:15 +03:00
Julia Radzhabova f13673653f Merge branch 'release/v6.4.0' into develop 2021-07-22 17:44:51 +03:00
Julia Radzhabova f142cfb697 Fix changing dataview items 2021-07-21 21:05:42 +03:00
Julia Radzhabova 148bc3e179 Add download as docm/pptm/xlsm 2021-07-20 21:30:09 +03:00
Maxim Kadushkin 42c8594563 Merge branch 'feature/document-dark-mode' into develop 2021-07-20 12:36:30 +03:00
Julia Radzhabova 656715a52b Merge branch 'release/v6.4.0' into develop 2021-07-19 14:37:16 +03:00
JuliaSvinareva c4e3899ebd
Merge branch 'develop' into feature/alt-keys 2021-07-16 17:45:18 +03:00
Julia Radzhabova dd6da8de34 Update translation 2021-07-16 17:07:14 +03:00
JuliaSvinareva a6134b58a1 Fix hint manager 2021-07-15 17:20:58 +03:00
Julia Radzhabova 5460ad804c Fix Bug 50945 2021-07-15 00:35:56 +03:00
Julia Radzhabova 64854721e3 Update translation 2021-07-13 11:26:38 +03:00
JuliaSvinareva 3a65ac540f Hint manager: fix locking key events, fix click/mousedown handling 2021-07-12 19:33:05 +03:00
Julia Radzhabova de98eaf0fa [DE] Fix Bug 51224 2021-07-12 18:08:02 +03:00
Julia Radzhabova 79376446c2
Merge pull request #973 from ONLYOFFICE/feature/color-palette-focus 
Feature/color palette focus
 2021-07-12 13:59:52 +03:00
Julia Radzhabova d6da7e82a2 Update translation. Fix Bug 51170 2021-07-12 11:50:18 +03:00
Julia Radzhabova b1534675c4 For Bug 42150 2021-07-12 11:12:02 +03:00
Julia Radzhabova cc271cd723 Bug 42150: add sort direction 2021-07-12 00:30:52 +03:00
Julia Radzhabova 2be31ade1e Add focus for color buttons in modal dialogs 2021-07-11 16:12:05 +03:00
Julia Radzhabova 9eeba125d0 Refactoring 2021-07-11 13:49:39 +03:00
Julia Radzhabova 1a055fcbcc Refactoring Common.UI.ButtonColored 2021-07-11 02:25:12 +03:00
Julia Radzhabova a7c5c47b0b [DE][PE] Fix highlight color button 2021-07-10 22:54:51 +03:00
Julia Radzhabova f6032f2312 Refactoring Common.UI.ButtonColored 2021-07-10 22:52:39 +03:00
Julia Radzhabova ca5b24d516 Focus refactoring 2021-07-09 15:14:24 +03:00
Julia Radzhabova 07417a29d0 Color palette refactoring 2021-07-09 13:52:48 +03:00
Julia Radzhabova 54e23daafd Refactoring 2021-07-09 13:24:24 +03:00
Julia Radzhabova 1ca9c3d6a1 [DE] Support focus in paragraph settings (preset and color buttons, border combobox) 2021-07-09 11:43:54 +03:00
JuliaSvinareva 8bf91f4847 Fix hint manager, add hint visible checks to close panels in left menu 2021-07-08 20:20:34 +03:00
JuliaSvinareva 87413ce121 [DE] Add hints in forms tab/settings 2021-07-08 20:16:39 +03:00
Julia Radzhabova a1edc609b4 [DE] Fix Bug 50912 2021-07-07 16:18:34 +03:00
Julia Radzhabova 91c9872ffc Add close comments button. Layout refactoring 2021-07-07 01:51:19 +03:00
Julia Radzhabova 79dbe85bdf Sort comments by date and author 2021-07-06 22:58:36 +03:00
JuliaSvinareva 91433816bf Fix hint manager 2021-07-06 18:42:13 +03:00
Maxim Kadushkin 6641e9419c Merge branch 'hotfix/v6.3.1' into release/v6.4.0 2021-07-04 23:44:01 +03:00
Maxim Kadushkin c93bfb68cb Merge branch 'hotfix/v6.3.1' into develop 2021-07-04 23:39:04 +03:00
Julia Radzhabova c738f33055 [DE] FIx Bug 51065 2021-07-04 15:40:17 +03:00
Julia Radzhabova 99069aa9fa [DE] Add translation 2021-07-02 19:21:25 +03:00
Julia Radzhabova 871f8af352 [DE] Add options for picture forms 2021-07-02 18:46:09 +03:00
Julia Radzhabova 4a706880e8 Add translation 2021-07-02 17:29:06 +03:00
Maxim Kadushkin a791ecdb85 [DE] added "Dark mode" option 2021-07-02 16:15:54 +03:00
Julia Radzhabova ed793a976e [DE] Fix form settings 2021-07-02 16:00:29 +03:00
Julia Radzhabova fce5caf86d [DE] Fix form settings 2021-07-02 15:51:33 +03:00
JuliaSvinareva a443fcfd2a Merge branch 'develop' into feature/alt-keys 2021-07-01 16:47:01 +03:00
Julia Radzhabova aa7703b7ca
Merge pull request #956 from ONLYOFFICE/fix/de-fixed-forms 
Fix/de fixed forms
 2021-07-01 15:30:53 +03:00
Julia Radzhabova 52d179153b Always use user info parser 2021-06-30 21:04:25 +03:00
Julia Radzhabova 6506146eab [DE] Fix disable for several actions 2021-06-30 15:19:45 +03:00
Julia Radzhabova 68fc002dc3 Refactoring 2021-06-30 00:31:55 +03:00
Julia Radzhabova 6f4de5a73f [DE] Fix disable file menu 2021-06-29 17:26:04 +03:00
Julia Radzhabova 8e5979570b [DE] Refactoring disable editing 2021-06-29 16:27:44 +03:00
Julia Radzhabova a8579827e0 File menu refactoring 2021-06-29 16:09:15 +03:00
Maxim Kadushkin 797a657ce5 Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop 2021-06-28 23:52:22 +03:00
Maxim Kadushkin bae484e6a4 Merge branch 'feature/load-external-themes' into develop 2021-06-28 23:51:38 +03:00
Julia Radzhabova 97c7708d0d Disable save, undo/redo on disconnect 2021-06-28 22:17:56 +03:00
Julia Radzhabova be57b1fae7 Disable language button on disconnect 2021-06-28 21:10:28 +03:00
Maxim Kadushkin f63dab0827 [DE] fix skeleton theme colors 2021-06-28 17:26:13 +03:00
Julia Radzhabova 26b2384ba1 Update translation 2021-06-25 18:40:02 +03:00
Maxim Kadushkin d484103500 [themes] load external themes 2021-06-25 11:55:33 +03:00
Julia Radzhabova 36f718d161 Update translation 2021-06-25 11:46:08 +03:00
JuliaSvinareva db54743eca Hint Manager: add direction exceptions for filter buttons, add ability to add specific hints to buttons 2021-06-23 18:41:38 +03:00
Julia Radzhabova 802da4233f
Fix layout for tt lang (#938) 2021-06-23 13:53:24 +03:00
Julia Radzhabova 4789fd68f0 Fix Bug 27605 2021-06-22 15:42:21 +03:00
JuliaSvinareva a8c09d3200 [PE] Hint Manager: add hints in file menu, left menu, statusbar 2021-06-21 20:49:45 +03:00
Rieffen fbd4830475
Update fr.json 2021-06-21 16:29:11 +02:00
Julia Radzhabova 41d95920a7 Fix loading mask on document opening 2021-06-18 16:53:50 +03:00
Julia Radzhabova bd3629838e [DE] Fix Bug 50920 2021-06-18 15:24:44 +03:00
Julia Radzhabova 8e85201c16 Update translation 2021-06-18 13:06:41 +03:00