web-apps/apps/documenteditor/main/app/template
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
..
ChartSettings.template Hide styles for combined charts 2021-01-30 16:15:25 +03:00
ControlSettingsDialog.template [DE] Fix text field settings 2020-06-25 14:13:08 +03:00
DropcapSettingsAdvanced.template webapps added 2016-03-10 21:48:53 -03:00
FileMenu.template [All] Update jquery (fix bugs) 2020-06-05 16:10:48 +03:00
FormSettings.template [DE] Fix form settings 2021-01-27 17:33:50 +03:00
HeaderFooterSettings.template [DE] Change settings for header/footer: page numbering. 2018-01-18 14:14:33 +03:00
ImageSettings.template [DE] Bug 42913: replace image from storage. 2020-05-13 14:28:14 +03:00
ImageSettingsAdvanced.template [DE][SSE] Add autofit settings for shape 2020-02-25 16:47:53 +03:00
LeftMenu.template [All] Update jquery (fix bugs) 2020-06-05 16:10:48 +03:00
MailMerge.template webapps added 2016-03-10 21:48:53 -03:00
MailMergeEmailDlg.template [DE] Update layout for mail merge dialog 2018-06-15 16:26:46 +03:00
ParagraphSettings.template [DE] Add paragraph indents to right panel 2021-01-19 11:17:04 +03:00
ParagraphSettingsAdvanced.template [DE] correct elements border 2020-12-11 21:26:40 +03:00
RightMenu.template [DE] Add icons 2020-10-07 15:44:36 +03:00
ShapeSettings.template [DE] Shape and TextArt settings: add gradient angle 2020-09-10 15:00:58 +03:00
SignatureSettings.template [DE] Change signature settings layout in the right panel. 2017-11-28 15:30:26 +03:00
StatusBar.template [All] Update jquery (fix bugs) 2020-06-05 16:10:48 +03:00
TableSettings.template [DE] Bug 42429 2019-12-13 15:20:13 +03:00
TableSettingsAdvanced.template [DE] Added alternative text for tables (for future use). 2017-01-19 12:41:35 +03:00
TextArtSettings.template [DE] Shape and TextArt settings: add gradient angle 2020-09-10 15:00:58 +03:00
Toolbar.template [DE] Add tab Forms in the fill forms mode. Add prev/next, submit buttons 2021-02-04 23:19:43 +03:00
ToolbarView.template Fix toolbar disable in two-line header mode 2019-02-05 14:46:26 +03:00
Viewport.template [All] Update jquery (fix bugs) 2020-06-05 16:10:48 +03:00
WatermarkSettings.template [DE] Bug 42913: load watermark image from storage. 2020-05-13 12:47:45 +03:00