Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
9352 commits 47 branches 5000 tags 623 MiB
Commit graph

288 commits

Author SHA1 Message Date
maxkadushkin 6fb9d9e072
Merge pull request #1134 from ONLYOFFICE/feature/sprite-to-svg 
Feature/sprite to svg
 2021-08-28 00:56:11 +03:00
JuliaSvinareva b9b94a6453
Merge branch 'develop' into feature/Bug_20632 2021-08-18 19:46:55 +03:00
JuliaSvinareva 286876fe3d [SSE] Change statusbar, set compact by default, add status block in compact statusbar, add opportunity to hide this block by context menu 2021-08-10 18:34:00 +03:00
Julia Radzhabova 8cbdfcedfb Merge branch 'develop' into feature/sse-protection 2021-08-05 13:49:29 +03:00
OVSharova c1af534783 First change 2021-07-29 04:25:33 +03:00
JuliaSvinareva 3f0cc17039 [SSE] Made changing of status items in statusbar 2021-07-28 19:49:34 +03:00
Julia Radzhabova f947224a95 Merge branch 'feature/sse-version-history' into develop 2021-07-27 21:20:33 +03:00
JuliaSvinareva eda6510de0 [SSE] Add methods and styles to change compact mode of statusbar 2021-07-26 16:57:01 +03:00
JuliaSvinareva f217483d9d [SSE] Add second line in statusbar, add hide statusbar button in options 2021-07-20 12:30:09 +03:00
Julia Radzhabova 656715a52b Merge branch 'release/v6.4.0' into develop 2021-07-19 14:37:16 +03:00
Julia Radzhabova ef6b13059b [SSE] Refactoring 2021-07-13 22:30:34 +03:00
Julia Radzhabova ad2926db43 [SSE] Add "no icon" to format rule. Fix Bug 51270 2021-07-13 22:08:32 +03:00
Julia Radzhabova c20d006606 [SSE] Fix Bug 51240 2021-07-12 18:20:49 +03:00
JuliaSvinareva 147bffff21 Fix hint manager 2021-07-02 14:58:27 +03:00
JuliaSvinareva a443fcfd2a Merge branch 'develop' into feature/alt-keys 2021-07-01 16:47:01 +03:00
JuliaSvinareva dc5268069e [SSE] Bug 46767 (fix locked, fix close after click on item) 2021-06-30 15:36:53 +03:00
Julia Radzhabova 3f429b0bc8 [SSE] Add version history 2021-06-28 20:18:53 +03:00
JuliaSvinareva f28422fb9c [SSE] Bug 46767 (add icon) 2021-06-28 13:06:49 +03:00
JuliaSvinareva 7719d51d28 [SSE] Fix bug 46767 2021-06-26 16:16:33 +03:00
JuliaSvinareva db54743eca Hint Manager: add direction exceptions for filter buttons, add ability to add specific hints to buttons 2021-06-23 18:41:38 +03:00
Julia Radzhabova 2e6bff5c0e [SSE] Show protected ranges 2021-06-23 00:46:43 +03:00
JuliaSvinareva 529d6c2ad0 [SSE] Hint manager: add hints into right menu and file menu 2021-06-10 23:05:49 +03:00
JuliaSvinareva 9ec0a305b3 [SSE] Hint Manager: add hints into toolbar and right menu 2021-06-08 17:26:10 +03:00
JuliaSvinareva f120ccf6be [SSE] Hint Manager: add hints into toolbar 2021-06-07 21:00:13 +03:00
Julia Radzhabova f1f613451c [SSE] Add show zero option 2021-05-21 18:01:49 +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 fc66f37f43 Change groups paddings 2021-04-27 21:21:11 +03:00
Julia Radzhabova da687f3e78 [SSE] Fix up/down buttons 2021-04-15 16:32:09 +03:00
Julia Radzhabova d0a4de80ec Fix up/down buttons 2021-04-15 02:03:33 +03:00
Julia Radzhabova ff39f7d581 [SSE] Add focus for checkbox 2021-04-14 01:12:59 +03:00
Julia Radzhabova 77cd81322c Merge branch 'feature/sse-from-text' into develop 2021-04-05 11:34:54 +03:00
Julia Radzhabova 1e632df252
Merge pull request #776 from ONLYOFFICE/feature/sse-sparkline 
Feature/sse sparkline
 2021-04-01 13:45:46 +03:00
Julia Radzhabova b1d3ba3fc0 Merge branch 'release/v6.3.0' into develop 2021-03-29 16:33:45 +03:00
Maxim Kadushkin a2c14d92e5 [all] fix bug 49251 2021-03-28 01:23:14 +03:00
Julia Radzhabova 5ab470ec5f [SSE] Add sparklines 2021-03-22 22:21:03 +03:00
Julia Radzhabova b5438c6648 [SSE] Import data from text/csv file 2021-03-19 17:00:05 +03:00
Julia Radzhabova 5609945406 [SSE] Add conditional formatting from right panel 2021-03-15 23:10:47 +03:00
Julia Radzhabova b5433c25db Merge branch 'develop' into feature/sse-conditional-formatting 2021-03-12 11:35:19 +03:00
Julia Radzhabova 58c2a2ff7b [SSE] Refactoring 2021-03-11 20:52:32 +03:00
Julia Radzhabova 1bef03a545 [SSE] Lock/unlock rules 2021-03-11 14:54:37 +03:00
Julia Radzhabova b0fedaa13f Merge branch 'master' into release/v6.3.0 2021-03-04 13:51:02 +03:00
Julia Radzhabova 0075983c9f Merge branch 'develop' into feature/sse-conditional-formatting 2021-02-20 19:15:44 +03:00
Julia Radzhabova 756d638043 Fix layout for IE 2021-02-16 17:53:01 +03:00
Julia Radzhabova 60ca0ddafe [SSE] Add cell indent 2021-02-15 11:35:48 +03:00
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
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
Maxim Kadushkin acb17c9e08 [multiscaling] correct some elements 2021-01-31 22:35:09 +03:00
Maxim Kadushkin d7a2a47979 [stylesheets] repaired components according to colors table 2021-01-18 23:27:47 +03:00
Julia Radzhabova d31aaac45b Fix toolbar styles 2020-12-22 15:30:52 +03:00
Julia Radzhabova 96e720858f Change toolbar styles 2020-12-22 15:11:46 +03:00