Commit graph

344 commits

Author SHA1 Message Date
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 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
Julia Radzhabova 379c97835a Fix Bug 51845, use 1.25, 1.75 icons 2021-08-18 15:18:58 +03:00
Julia Radzhabova 39239c81f4 For Bug 51845 2021-08-13 16:55:42 +03:00
Julia Radzhabova 5a3eaa2700 Merge branch 'feature/transitions' into develop 2021-08-11 16:55:22 +03:00
OVSharova dc3febf157 Add small icons 2021-08-11 11:51:55 +03:00
OVSharova ec0bc1b27a Change style 2021-08-11 02:38:35 +03:00
OVSharova 00e8b9ecd2 Add icons 2021-08-11 01:19:16 +03:00
Julia Radzhabova 3ab6e18621 Merge branch 'release/v6.4.0' into develop 2021-08-09 13:30:40 +03:00
OVSharova ac7b7ca290 Сhanges for tab 2021-08-06 06:05:27 +03:00
OVSharova ed42b9979e Edit templates 2021-07-30 03:27:08 +03:00
Julia Radzhabova 5742271ba5 Fix spiner styles in toolbar 2021-07-29 13:17:42 +03:00
OVSharova 6fcf934299 edit style 2021-07-29 02:50:34 +03:00
Julia Radzhabova adedc692cd Fix Bug 51562 2021-07-28 14:47:49 +03:00
OVSharova 9cd64f4d33 add checkbox delay 2021-07-27 17:18:50 +03:00
OVSharova 5aa980df91 moove tab create 2021-07-27 13:50:13 +03:00
OVSharova fd9e0e7fca edit setMenuParametrs 2021-07-26 14:52:56 +03:00
OVSharova 66b308e733 Add less 2021-07-26 04:20:39 +03:00
Julia Radzhabova 009779620d Bug 44511 2021-07-22 12:40:13 +03:00
JuliaSvinareva c4e3899ebd
Merge branch 'develop' into feature/alt-keys 2021-07-16 17:45:18 +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 eca0abff3b [PE] Hint Manager: add hints in toolbar, right menu 2021-06-16 16:43:51 +03:00
Maxim Kadushkin c0c4766574 [SSE PE] fix bug 50724 2021-06-04 10:34:56 +03:00
evgenykatyshev 89f1746dbe Update icons for 125 and 175% 2021-05-25 23:39:55 +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 be03943431 Update translation. Bug 50473 2021-05-18 22:47:09 +03:00
Julia Radzhabova f49703ddf7 Update help 2021-05-18 13:38:59 +03:00
Julia Radzhabova 510c43a89c Update help 2021-05-14 18:39:15 +03:00
Julia Radzhabova a6164ccffc [PE] Update help 2021-05-14 17:37:39 +03:00
Julia Radzhabova 33c3c9c887 Update help 2021-05-07 12:37:17 +03:00
Julia Radzhabova 661b937a74 Fix Bug 50031 2021-05-04 18:34:52 +03:00
Julia Radzhabova 79a4ad4542 Update help 2021-05-04 17:26:37 +03:00
Julia Radzhabova e265dd3aaf [PE] Update help 2021-04-30 17:42:55 +03:00
Julia Radzhabova 9569670490 [PE] Update help 2021-04-30 17:19:11 +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 bf6cab4d48 [PE] fix bug 49966 2021-04-26 23:54:50 +03:00