Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
web-apps/apps/documenteditor/main/app/view
History
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
..
AddNewCaptionLabelDialog.js Fix Bug 43433 2019-11-05 13:34:44 +03:00
BookmarksDialog.js Merge branch 'release/v6.1.0' into develop 2020-11-19 23:36:48 +03:00
CaptionDialog.js [DE] Caption dialog: consider current object 2021-01-13 18:39:39 +03:00
CellsAddDialog.js Refactoring setting focus 2020-10-22 13:53:58 +03:00
ChartSettings.js Merge branch 'develop' into feature/multiZoom5.5 2021-02-10 15:40:30 +03:00
ControlSettingsDialog.js [DE] ColorButton: fix auto color 2021-01-20 16:40:00 +03:00
CrossReferenceDialog.js [DE] Fix Bug 47605 2020-11-22 00:16:12 +03:00
CustomColumnsDialog.js [DE] added base class method 2020-10-21 11:10:11 +03:00
DateTimeDialog.js Refactoring setting focus 2020-10-22 13:53:58 +03:00
DocumentHolder.js Merge branch 'release/v6.2.0' into develop 2021-01-19 18:05:55 +03:00
DropcapSettingsAdvanced.js Merge branch 'develop' into feature/multiZoom5.5 2021-02-10 15:40:30 +03:00
EditListItemDialog.js Refactoring setting focus 2020-10-22 13:53:58 +03:00
FileMenu.js [PE][SSE] Add autocorrect options 2020-07-03 15:15:17 +03:00
FileMenuPanels.js [DE] Add new formats for downloading: fb2, html, epub 2021-02-08 21:22:14 +03:00
FootnoteTip.js Feature/pr2 hotfix v5.3.2 (#183) 2019-06-07 18:23:33 +03:00
FormSettings.js [DE] Form settings: revert rev. ae7135459e [ae71354] (use changes in sdk) 2021-01-23 19:20:51 +03:00
FormsTab.js [DE] Add icons 2021-02-09 18:57:40 +03:00
HeaderFooterSettings.js Fix changing units of measurement. 2021-01-11 18:06:12 +03:00
HyperlinkSettingsDialog.js Use new focus manager 2020-10-13 14:30:52 +03:00
ImageSettings.js [multiscaling] changed "wrapping" and "table borders" icons in DE 2021-01-26 23:52:43 +03:00
ImageSettingsAdvanced.js Merge branch 'develop' into feature/multiZoom5.5 2021-02-10 15:40:30 +03:00
LeftMenu.js Merge branch 'release/v6.1.0' into develop 2020-11-19 23:36:48 +03:00
LineNumbersDialog.js [DE] Fix translation 2020-11-23 17:41:56 +03:00
Links.js Add icons 2020-10-19 17:27:36 +03:00
ListSettingsDialog.js Merge pull request #534 from ONLYOFFICE/feature/focus-manager 2020-10-23 11:33:21 +03:00
MailMergeEmailDlg.js [All] Update jquery (fix bugs) 2020-06-05 16:10:48 +03:00
MailMergeSettings.js Refactoring button component 2020-04-29 10:36:53 +03:00
Navigation.js Refactoring treeview border 2020-09-27 14:39:29 +03:00
NoteSettingsDialog.js [DE][DE mobile] Fix Bug 48042 2020-12-25 18:39:54 +03:00
NotesRemoveDialog.js [DE] Add dialog for note removing 2020-07-29 14:50:58 +03:00
NumberingValueDialog.js [DE][DE mobile] Fix Bug 48042 2020-12-25 18:39:54 +03:00
PageMarginsDialog.js Refactoring setting focus 2020-10-22 13:53:58 +03:00
PageSizeDialog.js Refactoring setting focus 2020-10-22 13:53:58 +03:00
ParagraphSettings.js [DE] Fix indents in right panel 2021-01-20 12:27:55 +03:00
ParagraphSettingsAdvanced.js Merge branch 'develop' into feature/multiZoom5.5 2021-02-10 15:40:30 +03:00
RightMenu.js [DE] Change opening right panel tabs for form controls 2020-12-23 13:44:38 +03:00
ShapeSettings.js Merge branch 'develop' into feature/multiZoom5.5 2021-02-10 15:40:30 +03:00
SignatureSettings.js Fix Bug 40401. Show Search dialog in find mode when open mailmerge preview, version history, review preview 2019-02-13 12:57:02 +03:00
Statusbar.js Fix icons for spellcheck and special paste 2019-12-10 16:49:35 +03:00
StyleTitleDialog.js Refactoring setting focus 2020-10-22 13:53:58 +03:00
TableFormulaDialog.js Refactoring setting focus 2020-10-22 13:53:58 +03:00
TableOfContentsSettings.js [dark theme] changed some components 2021-02-02 14:59:45 +03:00
TableSettings.js [DE][PE] Bug 48248: add auto color to border palette 2021-01-20 16:42:48 +03:00
TableSettingsAdvanced.js Merge branch 'develop' into feature/multiZoom5.5 2021-02-10 15:40:30 +03:00
TextArtSettings.js Fix change and apply gradient angle for shapes/textarts/slide/cell 2020-10-16 17:35:56 +03:00
Toolbar.js [DE] Show Forms tab in fill form mode 2021-02-09 17:21:02 +03:00
Viewport.js [copyright] Update Copyright 2019-01-17 16:05:03 +03:00
WatermarkSettingsDialog.js Refactoring color buttons 2021-01-21 22:48:27 +03:00