Commit graph

710 commits

Author SHA1 Message Date
Maxim Kadushkin 3eb148097c [all] changed 'loading ' animated image 2020-11-05 18:32:59 +03:00
Julia Radzhabova 460ff7e6f3 Merge branch 'feature/de-new-controls' into develop 2020-10-31 19:11:19 +03:00
Julia Radzhabova 222113d277 Merge branch 'release/v6.1.0' into develop 2020-10-27 21:55:00 +03:00
Julia Radzhabova a48997fee4 Fix using customization.toolbarHideFileName parameter 2020-10-23 17:46:34 +03:00
Julia Radzhabova 840d6b5d86
Merge pull request #534 from ONLYOFFICE/feature/focus-manager
Feature/focus manager
Bug 27088, Bug 28317, Bug 34046, Bug 46575, Bug 46574, Bug 46636
2020-10-23 11:33:21 +03:00
Julia Radzhabova a0a28260e9 [SSE mobile] Fix Bug 47043
[SSE] Fix sheet name containing spaces
2020-10-22 22:56:57 +03:00
Julia Radzhabova 767c8652f3 Draw dark border for focused listview, treeview 2020-10-15 19:28:45 +03:00
Julia Radzhabova 41c082ad44 [DE] Add icons 2020-10-13 15:27:32 +03:00
Julia Radzhabova b357198994 [DE] Add icons 2020-10-07 15:44:36 +03:00
Julia Radzhabova bc908cc7bf Merge branch 'feature/sse-views' into develop 2020-09-28 19:18:37 +03:00
Julia Radzhabova 5648bb1040 Fix listview border 2020-09-27 14:40:27 +03:00
Julia Radzhabova c19306c83d Refactoring treeview border 2020-09-27 14:39:29 +03:00
Julia Radzhabova dd4238fc31 Fix scroll cursor (cell menu on canvas) 2020-09-14 20:28:15 +03:00
Julia Radzhabova b9ce71728c Merge branch 'develop' into feature/sse-views 2020-09-14 14:06:03 +03:00
Julia Radzhabova 8233cc2388 Merge branch 'release/v6.0.0' into develop 2020-09-09 13:55:55 +03:00
JuliaSvinareva 2a1ff38a02 [SSE] Fix bug 44946 2020-08-25 21:43:32 +03:00
Julia Radzhabova 66370233e2 Add icons 2020-08-25 15:34:03 +03:00
Julia Radzhabova 7b0763581a [DE][PE] Add icons for table menu 2020-08-20 18:50:40 +03:00
Julia Radzhabova 50dec94149 [DE] Shift text in menu items with icons ( + all context menu). 2020-08-18 14:50:10 +03:00
Julia Radzhabova ffca06badb [DE] Add icons to button menu and context menu 2020-08-18 14:02:44 +03:00
Julia Radzhabova face8757f1 Change autocorrect dialog: use dialog with tabs 2020-08-10 19:18:32 +03:00
Julia Radzhabova f336367b0b Fix Bug 46003
+ fix rev.4ce8507aca613b650d580d8b7a56ef04164f0813 (resize pivot tab)
2020-08-03 14:05:35 +03:00
Maxim Kadushkin 6c26ab0c1b [common] removed 'undock' button from header 2020-07-29 23:06:01 +03:00
Maxim Kadushkin 4f027719e7 [all] fix bug 45981 2020-07-29 18:28:15 +03:00
Julia Radzhabova accbea96e5 Merge branch 'release/v6.0.0' into develop 2020-07-29 11:09:38 +03:00
Julia Radzhabova e0be508225 Merge branch 'hotfix/v5.6.0' into develop 2020-07-28 22:15:23 +03:00
Julia Radzhabova da9482c62b Merge branch 'hotfix/v5.6.0' into release/v6.0.0 2020-07-28 21:54:39 +03:00
Julia Radzhabova 10c4de8edd Fix styles 2020-07-22 16:03:12 +03:00
JuliaSvinareva b89a1c784c Merge branch 'develop' into feature/gradient-fill 2020-07-22 13:02:09 +03:00
Julia Radzhabova d53ae5fab9 [Common] Add help button to window component 2020-07-21 15:32:58 +03:00
Julia Radzhabova c35e34e1f6 Merge branch 'develop' into feature/sse-views 2020-07-17 11:35:16 +03:00
Julia Radzhabova 262015dd14 Change component SynchronizeTip 2020-07-17 11:13:50 +03:00
Julia Radzhabova a91e1801ee [SSE] Table settings: change action buttons 2020-07-14 14:27:45 +03:00
JuliaSvinareva 1a08f99fd5 [SSE] Bug 43708 (Cell settings: fix gradient slider style, add tooltip) 2020-07-03 19:58:39 +03:00
JuliaSvinareva 0b9ff0405d [SSE] Bug 43708 (Cell settings: add buttons (position, add thumb, remove thumb), change gradient slider style) 2020-07-03 15:42:26 +03:00
Julia Radzhabova d4c0e9f771 [SSE] Fix pivot tab 2020-06-22 17:10:01 +03:00
Julia Radzhabova 1c80bea9fd Change new file panel 2020-06-18 14:43:26 +03:00
Julia Radzhabova 663b38e1e1 [SSE] Slicers: change style component 2020-06-11 15:58:58 +03:00
Maxim Kadushkin 7a768c8678 [all] 'Header' markup changed, added 'crypted' icon 2020-06-08 14:02:48 +03:00
Julia Radzhabova efa4c63d94 [SSE] Fix pivot tab 2020-06-05 20:50:16 +03:00
GoshaZotov a035c19757 Merge branch 'develop' into feature/sse-slicer 2020-06-02 13:48:36 +03:00
Julia Radzhabova 4cd77292af Merge branch 'develop' into feature/sse-slicer 2020-05-29 15:22:29 +03:00
Kirill Volkov e1c4d6bcb7 change 1,75 toolbar icons 2020-05-28 17:41:37 +03:00
Julia Radzhabova 51d6daa702 [PE] Add icons for Bug 40447 2020-05-27 22:39:10 +03:00
Julia Radzhabova ebe0f338cf [SSE] Set slicer style settings 2020-05-27 18:34:15 +03:00
Julia Radzhabova e3dd2bc5dd Merge branch 'feature/chart-svg-icons' into develop 2020-05-06 18:20:30 +03:00
Julia Radzhabova 0a54513e47 [SSE][PE] Set svg icons for chart types 2020-05-06 18:04:48 +03:00
Julia Radzhabova fd5c8d5f79 [DE] Fix svg icon for chart type 2020-05-06 17:17:03 +03:00
Julia Radzhabova cf37f3390d
Merge pull request #393 from ONLYOFFICE/feature/color-button
Feature/color button
2020-04-30 15:21:52 +03:00
Julia Radzhabova 506919df1b [SSE] Fix spark icons 2020-04-29 22:17:38 +03:00
Julia Radzhabova a581950dbb Refactoring 2020-04-29 22:15:22 +03:00
Maxim Kadushkin 2400e764e6 [all] debug for insert chart 2020-04-29 11:01:24 +03:00
Julia Radzhabova 103c2693fe [Common] Change ColorButton component 2020-04-28 18:10:49 +03:00
maxkadushkin c0e8ff2438
changes from design dep 2020-04-28 10:26:36 +03:00
Julia Radzhabova 66575bd40b
Merge pull request #389 from ONLYOFFICE/feature/icons1.25x1.75x
Add toolbar icons 1.25x and 1.75x
2020-04-27 14:10:47 +03:00
Maxim Kadushkin 9abf2c60db [all] fix bug 44742 2020-04-25 00:58:40 +03:00
Maxim Kadushkin 6892321fb5 [DE] show warning on locked document open 2020-04-23 19:57:36 +03:00
Maxim Kadushkin e582d74f32 [common] refactoring 2020-04-23 19:55:45 +03:00
Kirill Volkov c9391e5f93 Add toolbar icons 1.25x and 1.75x 2020-04-23 11:59:10 +03:00
Maxim Kadushkin 0d719d810d fix bug 45259 2020-04-22 19:46:53 +03:00
Julia Radzhabova b5c4eb23ed
Merge pull request #385 from ONLYOFFICE/feature/icons-
Remove and relocate icons.
2020-04-21 20:40:32 +03:00
Julia Radzhabova 62ec2aa9f3 Fix icons 2020-04-21 20:35:58 +03:00
Julia Radzhabova c46103472f Fix InputFieldBtn component 2020-04-21 20:13:03 +03:00
Kirill Volkov 7dc69c2508 Remove and relocate icons.
Remove and relocate icons to avoid duplication.
2020-04-21 18:32:49 +03:00
JuliaSvinareva b8cd3a4054 Merge branch 'feature/Bug_44946' into develop 2020-04-16 21:24:20 +03:00
Julia Radzhabova 6573cc7a84 Merge branch 'hotfix/v5.5.1' into develop 2020-04-15 15:04:23 +03:00
Julia Radzhabova 29f1351b7c Add icons 2020-04-14 17:35:11 +03:00
Julia Radzhabova 39892cb54a Merge branch 'feature/toolbar-resize' into develop 2020-04-13 22:45:20 +03:00
Julia Radzhabova 8a203be2e6 [SSE] Pivot settings refactoring 2020-04-13 20:12:50 +03:00
Julia Radzhabova b639b12d98 Refactoring toolbar resize: hide buttons captions in right-to-left order 2020-04-13 17:45:30 +03:00
Julia Radzhabova 3e352d5c80 ListView refactoring 2020-04-09 16:29:04 +03:00
Julia Radzhabova 9024a6fa46 [SSE] Use InputFieldBtn component for selecting data 2020-04-06 17:46:22 +03:00
Julia Radzhabova 3c5a7dac21 Add InputFieldBtn components 2020-04-06 14:57:26 +03:00
Julia Radzhabova 5e38c59787 Fix Bug 43986 2020-04-03 20:21:00 +03:00
JuliaSvinareva e394d494ed [SSE] Bug 44946 (Invalid locking of sheet navigation buttons) 2020-03-27 17:45:18 +03:00
Julia Radzhabova 664fae40e5 [SSE] Get link to the internal range 2020-03-20 15:29:47 +03:00
maxkadushkin f9d5ba38e5
Update asc-mixins.less 2020-03-17 15:19:42 +03:00
Julia Radzhabova d76fc24f4b
Merge pull request #364 from ONLYOFFICE/feature/internal-link
Feature/internal link
2020-03-12 14:10:33 +03:00
Julia Radzhabova 97c1e56964 Merge branch feature/Bug_36585 into develop 2020-03-12 11:53:39 +03:00
Julia Radzhabova 030aaf1768 InputField: hide error when component is disabled 2020-03-11 13:21:26 +03:00
Julia Svinareva 7b9460a5f1 Merge branch 'feature/sse-move-sheet' into develop 2020-03-05 15:42:45 +03:00
Julia Radzhabova 8d852e957a Merge branch 'release/v5.5.0' into develop 2020-03-05 13:34:31 +03:00
Julia Radzhabova b20217d187 [DE] Bug 36585: insert date/time 2020-03-03 11:08:15 +03:00
Julia Radzhabova 63771420f4 [PE] Fix Bug 44712 2020-03-02 17:36:10 +03:00
Julia Radzhabova c06650fa50
[DE] Change text for empty navigation panel (#354) 2020-02-27 13:31:31 +03:00
Julia Svinareva b1a6e69991 [SSE] Move sheet: drag and drop 2020-02-13 12:09:05 +03:00
Julia Radzhabova f4aee180e9 [DE] Use svg icons for chart type 2020-01-31 13:53:58 +03:00
Julia Radzhabova f0e1e64d68 Don't use 1.5x icons: fix rev. 0125ad24f3 2020-01-30 16:30:50 +03:00
Maxim Kadushkin 09ef1d8f58 [all] repaired stylesheet of logo@2x 2019-12-26 18:15:46 +03:00
Julia Radzhabova 90c33eebcd Merge branch 'release/v5.5.0' into feature/de-list-settings 2019-12-20 11:53:55 +03:00
Julia Radzhabova 54db30d9fd [DE] Fix list settings 2019-12-19 17:14:05 +03:00
Julia Radzhabova eae1645df5 Table/Cell settings: change border buttons 2019-12-17 15:18:06 +03:00
Julia Radzhabova 5cb3cc0e84 Bug 43909 2019-12-17 15:15:19 +03:00
Julia Radzhabova e946e06dc3 Fix style for focused input in search dialog 2019-12-17 12:53:57 +03:00
maxkadushkin 28c60a4a1c
Merge pull request #282 from ONLYOFFICE/origin/feature/checkbox-appearance
Update checkbox.less
2019-12-16 15:05:53 +03:00
Julia Svinareva eb7cbca182 [DE] [SSE] [PE] Bug 42429 2019-12-16 13:55:13 +03:00
evgenykatyshev d8fc827d52 Update checkbox.less
Indents fix
2019-12-13 21:13:55 +03:00
evgenykatyshev 07a689a69c Update checkbox.less
Change mark fit and add border radius to checkbox square
2019-12-13 21:06:58 +03:00
Julia Svinareva 050d1a697e [DE] Bug 42429 2019-12-13 15:20:13 +03:00
Julia Radzhabova 51eb5efae1 Change icons 2019-12-12 17:40:16 +03:00
Julia Radzhabova 53557dad16
Merge pull request #281 from ONLYOFFICE/feature/pr-icon2
change and add icons
2019-12-12 10:40:29 +03:00
Maxim Kadushkin 8075db0095 [common] fix for IE10 2019-12-11 19:03:06 +03:00
Kirill Volkov 438ac7beed change and add icons 2019-12-11 18:42:20 +03:00
Maxim Kadushkin ad7bc46e30 [common] changed radiobox component 2019-12-10 23:58:38 +03:00
Maxim Kadushkin 3d087bb587 [common] changed checkbox's layout 2019-12-10 23:52:01 +03:00
Julia Radzhabova f6dec13893 Fix icons for spellcheck and special paste 2019-12-10 16:49:35 +03:00
Kirill Volkov f630b11935 change and add icons 2019-12-10 12:24:28 +03:00
Julia Radzhabova 9a81f52ec5 Fix style for focused input controls 2019-12-09 14:19:26 +03:00
Maxim Kadushkin 5f57bba30f [common] added some 1.5x icons 2019-12-06 18:19:43 +03:00
Maxim Kadushkin e48e1422f1 [common] 'no-color' icon draw via css 2019-12-06 18:17:41 +03:00
Maxim Kadushkin 503adba0ac [styles] 1.5x styles applyed for 2x scaling because wrong media query 2019-12-06 18:14:59 +03:00
Julia Radzhabova ea6237abee Bug 43396: change style for selected fields (input field, spinner, combobox, textarea) 2019-12-06 11:52:59 +03:00
Maxim Kadushkin bc10737018 [component] debug of checkbox 2019-12-05 15:32:19 +03:00
Maxim Kadushkin e5a0e50eda Merge with develop 2019-12-04 15:26:53 +03:00
Maxim Kadushkin ad04f01c65 removed unused resources 2019-12-03 19:23:45 +03:00
Maxim Kadushkin 980ab56b1f [component] changed stylesheet for radiobutton and checkbox 2019-12-03 18:44:40 +03:00
Julia Radzhabova 1f959536e5 Fix style for button 2019-12-03 15:18:03 +03:00
Julia Radzhabova f0846cea7d Add icons 2019-12-03 14:20:09 +03:00
Maxim Kadushkin b8686c48a1 [DE] changed style for some buttons 2019-12-02 19:26:04 +03:00
Maxim Kadushkin 7e9a81f1ab [all] renamed icon 2019-12-02 19:21:39 +03:00
Julia Radzhabova bb36f6055f [SSE] Fix up/down buttons in sort dialog 2019-12-02 17:36:01 +03:00
Julia Radzhabova 01da19cf26 Merge branch 'feature/sse-custom-sort' into develop 2019-12-02 15:17:35 +03:00
Maxim Kadushkin d1e175076f [build] optimized output css 2019-12-02 14:20:19 +03:00
Maxim Kadushkin 618f70c1cf removed unused resources 2019-12-02 14:19:00 +03:00
Julia Radzhabova a2a05ca474 Add icons 2019-11-29 16:29:52 +03:00
Julia Radzhabova 1129d455d5 Fix toolbar icons 2019-11-29 15:33:16 +03:00
Julia Radzhabova 08daab14b1 Fix toolbar icons 2019-11-29 14:46:58 +03:00
Maxim Kadushkin 670b6cf2c6 merge with develop 2019-11-28 17:11:18 +03:00
Julia Radzhabova 8027645de5 Merge branch 'develop' into feature/compare 2019-11-28 12:51:56 +03:00
Maxim Kadushkin 88299b78ac [sprite] removed unused resources 2019-11-27 20:15:54 +03:00
Maxim Kadushkin 2efde585a4 [sprite] changed deploy script 2019-11-27 20:12:05 +03:00
Maxim Kadushkin 699f22d8b6 [all] header svg icons go to png 2019-11-27 19:47:04 +03:00
Kirill Volkov 3b6ef99b92 changed icon 2019-11-27 16:24:16 +03:00
Kirill Volkov 4ccbc8edbe Changed icon 2019-11-27 16:10:20 +03:00
Julia Radzhabova d72fcfd6d1 [SSE] Fix width for active and not active tabs 2019-11-27 12:15:39 +03:00
Julia Radzhabova 0e4bee102e Merge branch 'develop' into feature/sse-custom-sort 2019-11-27 11:45:21 +03:00
Kirill Volkov 2ba1155ee3 Changed icons from stroked to filled 2019-11-26 17:24:05 +03:00
Kirill Volkov daa383b471 Added Icons 1.5 x 2019-11-26 11:57:29 +03:00
Kirill Volkov 1586bce27e Changed icons 1.5x 2019-11-26 11:55:12 +03:00
Kirill Volkov db082610b8 icons added
Toolbar icons 1,5x and 2x added
2019-11-25 18:10:09 +03:00
Julia Svinareva 7a42e934e2 [SSE] Fix commit: fe4a450465 2019-11-21 13:43:23 +03:00
Maxim Kadushkin 8a7aa454ac [DE] build icon sprite from source images 2019-11-21 10:58:05 +03:00
Maxim Kadushkin fa5c9d5626 [all] changed 'notify' button state 2019-11-20 12:42:39 +03:00
Maxim Kadushkin 00caf68082 [component] hide 'check' marker for custom style of 'checked' state 2019-11-20 12:05:59 +03:00
Julia Radzhabova 75f61c4943 Merge branch 'develop' into feature/de-calendar 2019-11-19 13:43:36 +03:00
Julia Radzhabova f3d9759883 Move chart styles to common 2019-11-18 14:08:17 +03:00
Julia Radzhabova 736e7336a2
Merge pull request #266 from ONLYOFFICE/feature/gradient-slider
Feature/gradient slider
2019-11-15 15:25:06 +03:00
Julia Radzhabova b811606de9 Merge branch 'develop' into feature/remove-comments 2019-11-15 11:52:22 +03:00
Julia Svinareva cd45eec7ca Merge branch 'develop' into feature/gradient-slider 2019-11-15 11:50:40 +03:00
Julia Radzhabova 769fa9a611 Merge branch 'develop' into feature/compare 2019-11-14 12:47:19 +03:00
Julia Radzhabova 3b0cb57e4e Merge branch 'develop' into feature/symbol-table 2019-11-13 14:55:17 +03:00
Julia Radzhabova 0dd9e23188 Merge branch 'develop' into feature/remove-comments 2019-11-13 14:32:00 +03:00
Julia Radzhabova 1e89edb036 Update icons 2019-11-13 13:50:22 +03:00
Julia Radzhabova d01da7458f Fix resizing of symbol table dialog 2019-11-13 13:44:20 +03:00
Julia Svinareva 87270ee486 [SSE] Gradient Slider: remove color 2019-11-12 17:13:34 +03:00
Julia Radzhabova eb19033e23 Add icon for symbol table 2019-11-12 14:57:26 +03:00
Julia Radzhabova 57e744435a Add translation for symbol table ranges 2019-11-12 14:33:47 +03:00
Julia Radzhabova 28861851fb Symbol table refactoring 2019-11-11 16:45:44 +03:00
Julia Radzhabova cfb06354ca Refactoring add/remove comments buttons: change icons, change caption of buttons on Collaboration tab. 2019-11-06 17:22:12 +03:00
Julia Radzhabova c3022dd826 Update icons 2019-11-06 16:07:24 +03:00
Julia Svinareva e7a6314590 [Calendar] Fix style 2019-11-01 09:53:13 +03:00
Julia Svinareva 9cf1d3443e [Calendar] 2019-10-31 13:40:22 +03:00
Maxim Kadushkin 15431b1eae [common] repaire icons svg 2019-10-30 16:31:52 +03:00
Julia Svinareva 6d14719bb6 Calendar 2019-10-30 11:17:15 +03:00
Julia Svinareva 86cdc7ae89 Calendar (add options - firstday) 2019-10-29 13:33:24 +03:00
Julia Svinareva ca1e871ec5 Calendar (component) 2019-10-28 17:18:35 +03:00
Maxim Kadushkin 5b8a2f893a [all] styles refactoring 2019-10-25 17:22:27 +03:00
Maxim Kadushkin b7fcac1485 [DE] marked useless icons 2019-10-25 17:14:18 +03:00
Maxim Kadushkin 291616bcb8 [common] debug stylesheet 2019-10-21 18:05:10 +03:00
Maxim Kadushkin b65c980be5 [DE] changed icons sprite 2019-10-21 18:04:48 +03:00
Julia Svinareva fe4a450465 [SSE] Scale to Fit (fix disabled) 2019-10-21 17:43:34 +03:00
Maxim Kadushkin a79b404c37 [all] doesn't inject images in css 2019-10-21 17:05:50 +03:00
Julia Svinareva e7aca2fdba [DE] Calendar 2019-10-21 17:04:16 +03:00
Maxim Kadushkin 4a0e4a5c2a [DE] restore 'image' icons instead of 'svg' in toolbar 2019-10-21 16:56:38 +03:00
Maxim Kadushkin 048ba1e039 [common] new version of Less does not calculate value for var 2019-10-21 16:52:43 +03:00
Maxim Kadushkin dbf16e5733 [all] refactoring 2019-10-21 16:42:12 +03:00
Maxim Kadushkin 66bd9697a2 [common] refactoring for button's stylesheet 2019-10-18 11:45:46 +03:00
Maxim Kadushkin fff79264b5 [style] big button's icon size change to 28x28 2019-10-16 11:30:33 +03:00
Maxim Kadushkin 891e3435d4 [DE] applied 1.5x icons on toolbar (svg + png) 2019-10-15 16:11:19 +03:00
Maxim Kadushkin b1cb16171f [style] marked 'disabled' state in sprites 2019-10-15 15:30:08 +03:00
Maxim Kadushkin 6c88d171f6 [component] changed 'disabled' button's state 2019-10-15 14:04:54 +03:00
Julia Radzhabova dfd3f3f3ea [DE] Change icon for compare button 2019-10-15 12:52:23 +03:00
Julia Radzhabova c1a2efdf68 Update icons 2019-10-15 12:41:08 +03:00
Maxim Kadushkin da37e8cde3 [components] changed style for disabled state 2019-10-10 16:02:17 +03:00
maxkadushkin 694f19ea16
[common] fixed app logo's stylesheet for @2x 2019-10-09 15:05:59 +03:00
Maxim Kadushkin 2d43f6d050 Merge branch 'develop' into feature/svg-icons 2019-10-08 15:35:23 +03:00
Julia Radzhabova a51d386f16 Fix header logo for 4K 2019-10-08 15:33:29 +03:00
Julia Radzhabova b691842936 Fix header logo 2019-10-08 11:47:03 +03:00
Maxim Kadushkin 1407e01f4c Merge branch 'develop' into feature/svg-icons
# Conflicts:
#	apps/documenteditor/main/index.html
2019-10-07 16:55:17 +03:00
Maxim Kadushkin e4c45d5223 [common] load app logo from url instead of base64 source 2019-10-07 15:44:14 +03:00
Julia Radzhabova 488753ac57 [SSE] Custom sort: fill list for custom sort 2019-10-05 16:58:13 +03:00
Alexey Golubev 61d210eea9 v5.4.1 2019-10-02 12:07:24 +03:00
Julia Radzhabova 84796a03a6 Update icons 2019-10-01 11:30:54 +03:00
Julia Radzhabova 4a776615d2 Update icons 2019-10-01 10:06:00 +03:00
Julia Radzhabova a4a2bdcf46 Merge branch 'feature/de-caption' into develop 2019-09-26 12:35:57 +03:00
Maxim Kadushkin 455a1f6a03 [DE] added localized version of items for TOC menu 2019-09-25 16:25:57 +03:00
Julia Radzhabova 0153af839d [SSE] Fix autosum icon 2019-09-20 13:33:35 +03:00
Julia Radzhabova 92e56f7815 Fix Bug 42882 2019-09-19 12:45:40 +03:00
Julia Radzhabova bd44f6b773 Merge branch feature/window-refactoring into develop 2019-09-18 17:54:16 +03:00
Julia Radzhabova 5e38d632a4 Merge branch 'feature/new-settings' into develop
[SSE] Add scaling options
2019-09-17 17:45:53 +03:00