Commit graph

456 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
JuliaSvinareva 395445571a
Merge pull request #1057 from ONLYOFFICE/feature/Bug_50105
Feature/bug 50105
2021-08-09 19:28:01 +03:00
Julia Radzhabova 3ab6e18621 Merge branch 'release/v6.4.0' into develop 2021-08-09 13:30:40 +03:00
JuliaSvinareva f466027c0f [DE] Make position image setting in form settings 2021-08-05 01:27:55 +03:00
JuliaSvinareva b634ce9493 [DE] Make position image setting in form settings 2021-08-03 20:00:23 +03:00
Julia Radzhabova adedc692cd Fix Bug 51562 2021-07-28 14:47:49 +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
evgenykatyshev abecfe41e8 Remove sprites & add them to gitignore 2021-05-26 14:08:17 +03:00
evgenykatyshev 65cb4e278b Delete icon with wrong name 2021-05-25 23:53:39 +03:00
evgenykatyshev 89f1746dbe Update icons for 125 and 175% 2021-05-25 23:39:55 +03:00
Julia Radzhabova 69d4c7f064 Fix merge release 2021-05-21 12:40:54 +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
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 a1fbe024d7 [DE] Update hellp 2021-05-14 17:30:09 +03:00
Maxim Kadushkin cd588618e6 [all] fix bug 50327, 50328, 50329 2021-05-10 22:39:44 +03:00
Maxim Kadushkin d23c869622 [DE] fix bug 50284 2021-05-09 00:34:53 +03:00
Maxim Kadushkin 4b99303859 [DE] fix bug 50273 2021-05-08 23:21:07 +03:00
Maxim Kadushkin 4c4c3f6c51 [DE] fix css images relative path for Safari 2021-05-08 01:05:22 +03:00
Julia Radzhabova 33c3c9c887 Update help 2021-05-07 12:37:17 +03:00
Maxim Kadushkin 4fb015bd30 [DE] fix bug 50238 2021-05-05 22:14:39 +03:00
maxkadushkin 1473950368
Merge pull request #862 from ONLYOFFICE/feature/assets-update
Feature/assets update
2021-05-04 23:55:26 +03:00
evgenykatyshev e362b4282f Rename more 2 icons 2021-05-04 23:53:06 +03:00
evgenykatyshev 8d6db1841a Rename icon 2021-05-04 23:51:29 +03:00
Maxim Kadushkin 50c8054bd6 [scaling] fix bug 50160 2021-05-04 23:49:43 +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 35e9f96ff8 [DE] Update help 2021-04-30 16:51: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 5a0161b352 [DE] Show current level of list 2021-04-23 17:59:55 +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
Julia Radzhabova 1349be4fb3 Add hint manager for alt+keys 2021-04-21 20:52:17 +03:00
maxkadushkin 0f90b7da83
Merge pull request #823 from ONLYOFFICE/feature/assets-update
fix bug 49722
2021-04-21 12:58:59 +03:00
evgenykatyshev f08f424b19 fix bug 49722 2021-04-21 12:33:47 +03:00