Commit graph

15 commits

Author SHA1 Message Date
OVSharova cd7ca2a1a3 Delete Transitions from SS 2021-08-07 18:44:26 +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 e8eba05a54 Merge branch 'release/v6.2.0' into develop 2021-01-19 18:05:55 +03:00
Julia Radzhabova 499a033585 [PE] Add opacity for slide background 2021-01-13 19:34:16 +03:00
Julia Radzhabova dae5509b6d Fix translation 2020-12-25 10:47:57 +03:00
Maxim Kadushkin a1d23fdda3 [PE] support of dark theme 2020-12-21 13:32:36 +03:00
Julia Radzhabova 07925a0450 [PE] Shape, TextArt, Slide settings: add gradient angle 2020-09-10 17:36:45 +03:00
JuliaSvinareva 0d39db4b41 [PE] Bug 43708 (Text art settings, Shape settings, Slide settings: add buttons (position, add thumb, remove thumb)) 2020-07-09 21:51:19 +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 b56f407328 [PE] Change default state for slide settings(show color fill mode) 2019-11-19 17:34:52 +03:00
Julia Radzhabova 954322e3e0 [PE] Add header/footer settings to the right panel 2019-07-10 13:53:37 +03:00
Julia Radzhabova 8c2afba24d [PE] Change slide settings layout 2019-04-12 18:13:34 +03:00
Julia Radzhabova 59f93b6b7d Align controls in texture-fill settings. 2016-07-08 17:03:42 +03:00
Julia Radzhabova c57254ba21 [DE][PE] При загрузке редакторов с открытой правой панелью показывать настройки параграфа/слайда (контролы на панелях пустые и disabled). 2016-06-21 17:30:02 +03:00
Maxim Kadushkin 741b10515d webapps added 2016-03-10 21:48:53 -03:00