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

372 commits

Author SHA1 Message Date
Maxim Kadushkin c1a80a7f74 [all] fix bug 54037 2021-11-24 14:35:15 +03:00
OVSharova f86ccc0f93 Bug 53885 2021-11-24 09:52:29 +03:00
OVSharova 6835199df7 Bug 53886 2021-11-24 08:03:12 +03:00
Julia Radzhabova 308ec711c8 Merge branch 'release/v7.0.0' into develop 2021-11-19 15:34:25 +03:00
JuliaSvinareva c94249e1ac [SSE] Fix bug 53734 2021-11-15 19:27:26 +03:00
OVSharova 37330803da fix mark 2021-11-10 01:46:19 +03:00
Julia Radzhabova 67b8c6bccd Merge branch 'release/v7.0.0' into develop 2021-10-31 01:40:47 +03:00
Julia Radzhabova 2a1992f7ad For Bug 53301 2021-10-29 12:23:28 +03:00
JuliaSvinareva 2f5805d3ac [SSE] Add number page and name of active sheet in print settings in file menu 2021-10-25 11:37:28 +03:00
JuliaSvinareva a9d8043996 [SSE] Add alt-key hints, make preview navigation buttons in print settings 2021-10-22 21:17:45 +03:00
JuliaSvinareva 095c0d624d [SSE] Make print with preview in file menu 2021-10-18 19:35:23 +03:00
JuliaSvinareva 225c669dd0 [SSE] Make print with preview in file menu 2021-10-18 11:21:30 +03:00
Julia Radzhabova 78badd1ef3
Merge pull request #1231 from ONLYOFFICE/feature/gradient-fill-direction 
Gradient fill direction
 2021-10-06 14:11:12 +03:00
OVSharova 112fa9f977 Refactoring 2021-10-06 13:21:06 +03:00
Julia Radzhabova 2a1ecec65d Merge branch 'hotfix/v6.4.1' into develop 2021-09-30 17:30:38 +03:00
OVSharova 3f3f7b2de7 Bug 52187 2021-09-30 03:48:54 +03:00
OVSharova 501043f04c Fix Bug 52187 2021-09-28 17:35:52 +03:00
OVSharova 3d60527f99 SSE and PE 2021-09-28 04:14:30 +03:00
Julia Radzhabova f18a5efa53 Merge branch 'hotfix/v6.4.1' into release/v6.5.0 2021-09-24 13:22:40 +03:00
Julia Radzhabova fc95cbe2e6 [SSE] Fix Bug 52428 2021-09-08 20:07:51 +03:00
Julia Radzhabova 563291b195 Fix Bug 52205 2021-08-26 17:33:13 +03:00
Maxim Kadushkin 5a7421e35d merge release 6.4.0 to develop 2021-08-25 19:02:44 +03:00
Julia Radzhabova 4ed61a579c For Bug 51561 2021-08-24 14:32:21 +03:00
Julia Radzhabova 75a5df7f22 Merge branch 'feature/view-for-create-new' into develop 
Fix Bug 51561
 2021-08-24 13:56:25 +03:00
Julia Radzhabova 710ddf98ca Fix styles for file templates 2021-08-24 13:38:19 +03:00
OVSharova 90ef8be900 Fix bug 2021-08-24 12:38:06 +03:00
OVSharova 9bc917c0ac Fix color 2021-08-24 11:37:19 +03:00
OVSharova 76bcdea1e8 Fix bug 2021-08-23 23:13:08 +03:00
Julia Radzhabova e7cfb129c2 Fix Bug 51838 2021-08-23 17:47:10 +03:00
OVSharova 1b65d263dc Fix style 2021-08-23 17:18:30 +03:00
OVSharova d25110f142 Fix style 2021-08-23 17:12:40 +03:00
Maxim Kadushkin 0b1168b64e [scaling] apply icons for 125% and 175% 2021-08-23 00:15:51 +03:00
OVSharova 740acf45fb Fix style 2021-08-20 03:57:16 +03:00
JuliaSvinareva b9b94a6453
Merge branch 'develop' into feature/Bug_20632 2021-08-18 19:46:55 +03:00
Julia Radzhabova 379c97835a Fix Bug 51845, use 1.25, 1.75 icons 2021-08-18 15:18:58 +03:00
JuliaSvinareva f144a76e1a [SSE] Change saving status block in statusbar 2021-08-16 17:22:13 +03:00
Julia Radzhabova 39239c81f4 For Bug 51845 2021-08-13 16:55:42 +03:00
JuliaSvinareva ab98e6cedc [SSE] Fix paddings of math items in statusbar 2021-08-11 19:26:28 +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 3ab6e18621 Merge branch 'release/v6.4.0' into develop 2021-08-09 13:30:40 +03:00
JuliaSvinareva 44a1232366 [SSE] Fix align position of statusbar menu, fix styles in statusbar 2021-07-29 15:47:51 +03:00
Julia Radzhabova adedc692cd Fix Bug 51562 2021-07-28 14:47:49 +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
JuliaSvinareva c4e3899ebd
Merge branch 'develop' into feature/alt-keys 2021-07-16 17:45:18 +03:00
OVSharova 8023a8d892 edit 3 marks 2021-07-07 06:19:27 +03:00
Julia Radzhabova a0ee0e909f [SSE] Fix merge: disable statusbar buttons(rev. 745231f3b7) 2021-07-05 13:53:10 +03:00
Maxim Kadushkin 6641e9419c Merge branch 'hotfix/v6.3.1' into release/v6.4.0 2021-07-04 23:44:01 +03:00
Maxim Kadushkin c93bfb68cb Merge branch 'hotfix/v6.3.1' into develop 2021-07-04 23:39:04 +03:00
JuliaSvinareva a443fcfd2a Merge branch 'develop' into feature/alt-keys 2021-07-01 16:47:01 +03:00
JuliaSvinareva a041dddc7b Merge branch 'feature/Bug_46767' into develop 2021-07-01 15:53:41 +03:00
JuliaSvinareva d8a24b96c0 [SSE] Bug 46767 2021-07-01 13:34:48 +03:00
Julia Radzhabova 3f429b0bc8 [SSE] Add version history 2021-06-28 20:18:53 +03:00
JuliaSvinareva 7719d51d28 [SSE] Fix bug 46767 2021-06-26 16:16:33 +03:00
JuliaSvinareva f120ccf6be [SSE] Hint Manager: add hints into toolbar 2021-06-07 21:00:13 +03:00
Maxim Kadushkin c0c4766574 [SSE PE] fix bug 50724 2021-06-04 10:34:56 +03:00
maxkadushkin a68c38f83c
Merge pull request #895 from ONLYOFFICE/feature/hotfix-6-3-1 
Feature/hotfix 6 3 1
 2021-05-23 21:36:43 +03:00
Julia Radzhabova 45d7980212 Merge branch 'release/v6.3.0' into develop 2021-05-21 12:28:54 +03:00
Maxim Kadushkin 44210f7a5a [all] prepare sprites for 1.25x and 1.75x scaling 2021-05-21 11:19:26 +03:00
Maxim Kadushkin 00b8e67c68 [PE] fix bug 50284 2021-05-19 15:08:04 +03:00
Julia Radzhabova 745231f3b7 [SSE] Fix disabled buttons in statusbar 2021-05-17 17:52:29 +03:00
Maxim Kadushkin 975554b86a [SSE] fix bug 50289 2021-05-08 23:31:33 +03:00
Maxim Kadushkin 518ab99097 [SSE] fix bug 50242 2021-05-05 22:37:33 +03:00
Maxim Kadushkin 0d491e78be [SSE] fix bug 50190 2021-05-04 20:09:24 +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
Maxim Kadushkin 134001162c [web-apps] fix bug 50030 2021-04-28 14:10:39 +03:00
Maxim Kadushkin 1e878cd085 [SSE] fixed cell editors style for 150% scaling 2021-04-27 22:44:01 +03:00
Maxim Kadushkin 59182cfd6b [common] changed combobox caret style 2021-04-27 22:42:41 +03:00
Maxim Kadushkin acaeec776f [SSE] fix bug 50024 2021-04-27 20:21:45 +03:00
Maxim Kadushkin f57486d376 [themes] fix bug 50002 2021-04-26 14:31:58 +03:00
maxkadushkin 0caa949644
Merge pull request #827 from ONLYOFFICE/feature/classic-light-theme 
Feature/classic light theme
 2021-04-22 12:54:33 +03:00
Maxim Kadushkin 21ae480d3e [common] refactoring 2021-04-19 23:58:59 +03:00
Maxim Kadushkin ba31d2f163 [common] fix bug 49731 2021-04-19 23:57:54 +03:00
Maxim Kadushkin 978d892456 [all] fix bug 49398 2021-04-18 18:09:49 +03:00
Maxim Kadushkin 57c9c6268e [common] extended theme's object 2021-04-18 17:32:39 +03:00
Julia Radzhabova 1677cbfedd Merge branch 'release/v6.3.0' into develop 2021-04-15 17:54:30 +03:00
Julia Radzhabova 785cfb49e5 [SSE] Fix button styles 2021-04-15 16:40:49 +03:00
Julia Radzhabova da687f3e78 [SSE] Fix up/down buttons 2021-04-15 16:32:09 +03:00
Julia Radzhabova 57b6acfd67 Merge branch 'feature/de-preview-bullets' into develop 2021-04-10 00:37:17 +03:00
Julia Radzhabova 926a3c436d [SSE] Draw list preview in sdk 2021-04-03 10:44:20 +03:00
Julia Radzhabova 9b6ec674de
Merge pull request #779 from ONLYOFFICE/release/v6.3.0 
Release/v6.3.0
 2021-04-02 11:53:39 +03:00
Maxim Kadushkin b109057b01 [SSE PE] fix disabled state's icon 2021-04-01 11:15:52 +03:00
Julia Radzhabova b1d3ba3fc0 Merge branch 'release/v6.3.0' into develop 2021-03-29 16:33:45 +03:00
Maxim Kadushkin db3aafeb33 [SSE] fixed spreadsheet tab disabled stylesheet 2021-03-23 22:25:57 +03:00
Maxim Kadushkin bda2dd7873 [all] some changes for components stylesheet 2021-03-06 00:52:06 +03:00
Julia Radzhabova 2d188d6688 [SSE] Show icons settings in conditional formatting 2021-03-03 20:58:06 +03:00
Julia Radzhabova 0f1288e198 [SSE] Fix icons sets presets 2021-03-03 14:05:31 +03:00
Julia Radzhabova 0075983c9f Merge branch 'develop' into feature/sse-conditional-formatting 2021-02-20 19:15:44 +03:00
Maxim Kadushkin 64dfc35569 [all] fix bug 448774 2021-02-17 19:00:28 +03:00
Maxim Kadushkin 66ff7cf201 [dark theme] fix SSE stylesheets for IE support 2021-02-16 11:37:33 +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 9e36276e3e [dark theme] changed some elements 2021-02-07 00:31:35 +03:00
Maxim Kadushkin 3f228da263 [stylesheets] refactoring 2021-02-07 00:30:24 +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
Julia Radzhabova c240e0e89e [SSE] Fix Bug 48247 2021-01-22 00:45:44 +03:00
Maxim Kadushkin 8e81a7b0e1 [scaling] repaired some elements 2021-01-22 00:18:15 +03:00
Maxim Kadushkin 4412524e82 [multiscaling] repaired some components 2021-01-21 13:14:36 +03:00
Maxim Kadushkin 551ffb48c6 [stylesheets] changed styleshteets according to colors table 2021-01-20 22:32:46 +03:00