Commit graph

207 commits

Author SHA1 Message Date
OVSharova 4869a9a604 Edit rules for lock 2021-08-03 02:06:03 +03:00
OVSharova 2407152424 Create rules for lock 2021-08-02 04:37:23 +03:00
OVSharova 8f8d5e5a49 Reinclude Tab Transitions 2021-07-30 20:22:42 +03:00
OVSharova 3e9f3b0b3a Create tab Transitions in applyLayout 2021-07-27 20:51:37 +03:00
OVSharova 5aa980df91 moove tab create 2021-07-27 13:50:13 +03:00
OVSharova ea6479f18c start settings 2021-07-22 02:09:53 +03:00
OVSharova 5abe22fa6e moove to PE 2021-07-18 02:15:10 +03:00
OVSharova b7801e5a2e copy tab 2021-07-16 17:31:23 +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 45d7980212 Merge branch 'release/v6.3.0' into develop 2021-05-21 12:28:54 +03:00
Julia Radzhabova be4a444adb Fix Bug 50298 2021-05-11 15:24:53 +03:00
Maxim Kadushkin 97474af94d Merge branch 'release/v6.3.0' into develop
# Conflicts:
#	apps/common/main/lib/controller/Plugins.js
#	apps/common/main/lib/view/Header.js
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
#	apps/documenteditor/main/app/view/Toolbar.js
#	apps/documenteditor/main/locale/sl.json
#	apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
#	apps/presentationeditor/main/locale/ja.json
#	apps/spreadsheeteditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/template/Toolbar.template
#	apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js
2021-04-29 23:31:07 +03:00
Julia Radzhabova 67499c5d21 Fix Bug 34613, Fix Bug 16000 2021-04-20 18:46:41 +03:00
Julia Radzhabova 57b6acfd67 Merge branch 'feature/de-preview-bullets' into develop 2021-04-10 00:37:17 +03:00
Julia Radzhabova c3fc27031f [PE] [DE] Draw list preview in sdk 2021-04-02 23:04:37 +03:00
Julia Radzhabova 8d54a7d1fb [PE] Fix themes list 2021-03-30 13:23:23 +03:00
Julia Radzhabova b0fedaa13f Merge branch 'master' into release/v6.3.0 2021-03-04 13:51:02 +03:00
Julia Radzhabova 41a907f48d [PE][PE mobile] Bug 46911 2021-02-16 17:05:47 +03:00
Julia Radzhabova 36856e2e20 [PE][PE mobile] Get/set slide size in emu 2021-02-15 20:10:46 +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
Julia Radzhabova b72744ef47 FIx Bug 48553 2021-02-03 16:56:01 +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 c295698704 Refactoring color buttons 2021-01-21 22:48:27 +03:00
Maxim Kadushkin 29951e266e [stylesheets] repired some components according to colors table 2021-01-18 12:19:38 +03:00
Julia Radzhabova 0adafd056a [PE] Add columns settings to Home tab 2021-01-12 23:01:55 +03:00
Julia Radzhabova b06f78acc0 Fix show collaboration tab 2020-12-22 15:37:05 +03:00
Julia Radzhabova ca01b519f9 [SSE] Show errors when set combo chart type 2020-12-08 11:48:28 +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 222113d277 Merge branch 'release/v6.1.0' into develop 2020-10-27 21:55:00 +03:00
Julia Radzhabova bfcffc756e [PE] Fix Bug 46835 2020-10-09 17:24:11 +03:00
Julia Radzhabova 829f5d8eda [PE] Bug 46835 2020-10-09 12:48:12 +03:00
Julia Radzhabova c769995941 Fix opening symbol dialog: select first symbol from the selected text or recent symbol 2020-10-05 17:32:18 +03:00
Julia Radzhabova 1188155f15 Fix inserting special characters 2020-08-27 18:54:14 +03:00
Julia Radzhabova b97195489b [SSE][PE] Fix list settings (different list types) 2020-06-26 14:02:09 +03:00
Julia Radzhabova baa4065363 [SSE][PE] Fix list settings 2020-06-25 13:52:14 +03:00
Julia Radzhabova bf057320ea [PE][SSE] Change list settings dialog 2020-06-17 16:55:01 +03:00
Julia Radzhabova fc4de46980 [PE][SSE] Bug 42913: load image for filling shape, slide and replacing image from storage. 2020-05-13 17:20:58 +03:00
Julia Radzhabova 67dd73e767 Refactoring 2020-04-22 12:35:55 +03:00
Julia Radzhabova 27dbfcae82 Refactoring symbol table, don't show special chars when using in list settings. 2020-04-02 16:14:45 +03:00
Julia Radzhabova 308428d83f Fix Bug 44916 2020-03-31 16:49:33 +03:00
Julia Radzhabova c70db921eb [PE] Show current hyperlink settings 2020-03-17 10:54:47 +03:00
Julia Radzhabova 8d852e957a Merge branch 'release/v5.5.0' into develop 2020-03-05 13:34:31 +03:00
Julia Radzhabova 63771420f4 [PE] Fix Bug 44712 2020-03-02 17:36:10 +03:00
Julia Radzhabova 5bcef477da
[PE] Fix translation for themes (#319) 2020-01-29 11:32:22 +03:00
Julia Radzhabova f714a26da7 Change color scheme by index 2019-12-19 11:00:49 +03:00
Julia Radzhabova 6f5a76c63a [PE] Fix selected list type for custom bullet 2019-12-17 12:33:12 +03:00
Maxim Kadushkin 670b6cf2c6 merge with develop 2019-11-28 17:11:18 +03:00