Commit graph

2558 commits

Author SHA1 Message Date
IlPer 5a22635157
Add files via upload 2021-05-18 14:03:15 +03:00
Julia Radzhabova a69b0746af [DE embed] Change loader 2021-05-18 02:26:42 +03:00
Julia Radzhabova b8c49ec793 [DE embed] Change fill form mode 2021-05-18 01:49:08 +03:00
Julia Radzhabova 6d9d599ade [DE embedded] Change embedded layout 2021-05-17 23:55:33 +03:00
JuliaSvinareva 537f007461 [mobile] Fix view comment for tablet 2021-05-17 19:51:12 +03:00
Julia Radzhabova 60c43641a3 Merge branch 'develop' into feature/de-embed-fill-form 2021-05-17 19:21:12 +03:00
JuliaSvinareva 383620fbc7 [DE mobile] Fix templates 2021-05-17 16:14:41 +03:00
JuliaSvinareva 89b98477bf [PE mobile] Add skeleton 2021-05-17 13:51:50 +03:00
Maxim Kadushkin 2d4e237e75 [themes] correct "available" option 2021-05-15 13:47:32 +03:00
Maxim Kadushkin 668dfb5680 [desktop] added option to hide themes selector 2021-05-15 00:07:13 +03:00
Maxim Kadushkin 11ab64a4d8 [common] fix bug 50245 2021-05-14 22:20:56 +03:00
Maxim Kadushkin 0e4dacae8f [common] fix bug 50417 2021-05-14 21:48:51 +03:00
Maxim Kadushkin 6f32dd91a7 [common] changed theme loading 2021-05-14 17:05:47 +03:00
Maxim Kadushkin 1e175f338a [all] fix bug 50414 2021-05-14 15:32:03 +03:00
JuliaSvinareva 7e7ce909ac [mobile] Fix users into collaboration 2021-05-14 14:03:06 +03:00
JuliaSvinareva b968fb4d2d [mobile] Fix bug 48187 2021-05-14 12:49:10 +03:00
Julia Radzhabova cb6998eac6 Fix Bug 50389. Refactoring listview. 2021-05-13 20:30:57 +03:00
JuliaSvinareva 861c60caff Merge branch 'feature/mobile-apps-on-reactjs-fixes' into develop 2021-05-13 18:09:03 +03:00
evgenykatyshev 34e48ae469 Color fix
1. Column titles
2. Color shading
3. Tokens order
2021-05-13 13:02:38 +03:00
Julia Radzhabova 59c658ecab Wopi: change config parameters and post messages 2021-05-13 00:57:01 +03:00
Julia Radzhabova f8ee00314a Change file sharing by url for wopi 2021-05-12 22:27:57 +03:00
Maxim Kadushkin 119944a3f9 [scaling] fix bug 50355 2021-05-12 20:29:11 +03:00
JuliaSvinareva 2ae18c1787 [mobile] Fix template of user page 2021-05-12 20:00:00 +03:00
Julia Radzhabova 4a383469a3 Merge remote-tracking branch 'origin/develop' into develop 2021-05-12 19:04:37 +03:00
Julia Radzhabova 5c7350e28f Support rename for wopi 2021-05-12 19:04:14 +03:00
JuliaSvinareva ed70fe9442 [common] Fix error when clicking on next review in mobile 2021-05-12 18:59:34 +03:00
Maxim Kadushkin 5f1a5c7fb2 [themes] debug 2021-05-12 17:20:01 +03:00
maxkadushkin cdc2d781df
Merge pull request #875 from ONLYOFFICE/feature/assets-update
Feature/assets update
2021-05-12 17:14:34 +03:00
Maxim Kadushkin f900a3480b [all] extend options on desktop app launch 2021-05-12 16:41:59 +03:00
evgenykatyshev 9070df45e0 For fix bug 50307
Remove "no color" icon from sprites
2021-05-12 12:21:04 +03:00
Julia Radzhabova 35e132ce68 [SSE] Fix Bug 50285 2021-05-11 15:00:34 +03:00
maxkadushkin 71ce073bed
Merge pull request #873 from ONLYOFFICE/feature/colors-update
Update spreadsheet colors
2021-05-11 12:02:53 +03:00
evgenykatyshev 2047a887a3 Update spreadsheet colors
Spreadsheet column title borders colors for Classic Light replaced by colors from Light instead Dark
2021-05-11 11:38:55 +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
Oleg Korshul 8d4528f321
Merge pull request #870 from ONLYOFFICE/feature/colors-update
Feature/colors update
2021-05-07 18:24:47 +03:00
SergeyEzhin acc1f43a9a [common] Bug 47778 2021-05-07 17:34:02 +03:00
evgenykatyshev 07471b0deb Change about logo in dark theme 2021-05-07 17:03:55 +03:00
evgenykatyshev 9610b94216 Disabled controls opacity 2021-05-07 16:57:01 +03:00
evgenykatyshev 18aa9d0ab3 Classic theme colors 2021-05-07 15:49:04 +03:00
maxkadushkin 540cf5c451
Merge pull request #869 from ONLYOFFICE/feature/colors-update
Feature/colors update
2021-05-07 13:43:38 +03:00
evgenykatyshev f8e12df456 Update color of ruler elements 2021-05-07 13:20:25 +03:00
evgenykatyshev cb443da6cd Update color of tab mark at ruler 2021-05-07 12:00:18 +03:00
Maxim Kadushkin dbec551477 [common] changed icon's sprite template 2021-05-06 19:07:21 +03:00
Maxim Kadushkin 12cd63f48f Merge branch 'release/v6.3.0' of https://github.com/ONLYOFFICE/web-apps into release/v6.3.0 2021-05-06 17:47:45 +03:00
Maxim Kadushkin 2df14e5a4e [themes] fix bug 49481 2021-05-06 17:47:28 +03:00
Maxim Kadushkin c8c5810d1c [common] extend htmlEncode function 2021-05-06 16:29:27 +03:00
SergeyEzhin f6ff8b498d [common] Bug 48187 2021-05-06 15:59:37 +03:00
SergeyEzhin 2a7812bfa3 [common] Bug 37524 2021-05-06 15:01:29 +03:00
Julia Radzhabova c14408bd9c Fix wopi messages 2021-05-06 14:37:46 +03:00
Maxim Kadushkin 4f6b59f4b3 [themes] changed stylesheets for dataview combobox 2021-05-06 13:35:45 +03:00
Maxim Kadushkin 4ea1f0f1d5 [themes] changed stylesheets for dataview 2021-05-06 12:00:59 +03:00
evgenykatyshev 4ba3b12108 Update colors in new themes 2021-05-06 11:29:00 +03:00
evgenykatyshev 2c11e84b00 Classic theme scrolls and link colors 2021-05-06 11:05:13 +03:00
Maxim Kadushkin 949c412319 [common] fix bug 50025 2021-05-06 00:08:26 +03:00
Maxim Kadushkin 5582176247 [common] fix icon in 'options' button 2021-05-05 17:30:40 +03:00
Maxim Kadushkin 9042abf790 [themes] changed gradient slider styles 2021-05-05 16:38:58 +03:00
SergeyEzhin d55aad76ac Bug 49157 2021-05-05 16:06:07 +03:00
Maxim Kadushkin 295bc949c9 Merge branch 'feature/fix-bug-shimaginA' into develop 2021-05-05 00:31:01 +03:00
Maxim Kadushkin 71521d5dc0 [themes] fix bug 50197 2021-05-04 23:11:38 +03:00
Maxim Kadushkin 8f3f10180c [scaling] fix bug 50203 2021-05-04 22:09:17 +03:00
Julia Radzhabova 6eee4f8ae1 [Mobile] Fix plugins loading 2021-05-04 22:05:26 +03:00
Maxim Kadushkin 5fbc199dc7 [themes] fix bug 50206 2021-05-04 21:53:53 +03:00
SergeyEzhin 6f328beca6 Merge branch 'feature/mobile-apps-on-reactjs-pe-bug50044' into feature/mobile-apps-on-reactjs-fixes 2021-05-04 21:07:52 +03:00
Maxim Kadushkin 4de5dcfd87 [themes] fix link's colors 2021-05-04 20:09:54 +03:00
Julia Radzhabova 50b1ff54bb Fix Bug 50210 2021-05-04 18:46:22 +03:00
Julia Radzhabova 661b937a74 Fix Bug 50031 2021-05-04 18:34:52 +03:00
Julia Radzhabova dd0b1708f7 Fix password dialog 2021-05-04 13:30:14 +03:00
Maxim Kadushkin fdda540c47 [all] fix loading sdk scripts 2021-05-03 20:02:21 +03:00
Maxim Kadushkin eb400599d9 [scaling] fix bug 49877 2021-05-01 23:25:08 +03:00
JuliaSvinareva 7bb9cc90ab Merge branch 'feature/mobile-apps-on-reactjs-bug50044' into develop 2021-05-01 18:41:17 +03:00
Maxim Kadushkin 2e8a4ddc38 [scaling] fix bug 50164 2021-04-30 23:44:16 +03:00
Maxim Kadushkin 751482c515 [scaling] fix bug 50146 2021-04-30 23:43:53 +03:00
Maxim Kadushkin 75667dc229 Merge branch 'feature/mobile-apps-on-reactjs' into develop
# Conflicts:
#	apps/api/documents/api.js
#	apps/common/main/lib/util/utils.js
#	apps/documenteditor/mobile/app/controller/DocumentHolder.js
#	apps/documenteditor/mobile/app/controller/Main.js
#	apps/documenteditor/mobile/app/controller/Search.js
#	apps/documenteditor/mobile/app/controller/Settings.js
#	apps/documenteditor/mobile/app/controller/Toolbar.js
#	apps/documenteditor/mobile/app/controller/add/AddImage.js
#	apps/documenteditor/mobile/app/controller/add/AddOther.js
#	apps/documenteditor/mobile/app/controller/add/AddTable.js
#	apps/documenteditor/mobile/app/controller/edit/EditChart.js
#	apps/documenteditor/mobile/app/controller/edit/EditHyperlink.js
#	apps/documenteditor/mobile/app/controller/edit/EditImage.js
#	apps/documenteditor/mobile/app/controller/edit/EditParagraph.js
#	apps/documenteditor/mobile/app/controller/edit/EditShape.js
#	apps/documenteditor/mobile/app/controller/edit/EditTable.js
#	apps/documenteditor/mobile/app/controller/edit/EditText.js
#	apps/documenteditor/mobile/app/template/EditTable.template
#	apps/documenteditor/mobile/app/template/EditText.template
#	apps/documenteditor/mobile/app/template/Settings.template
#	apps/documenteditor/mobile/app/view/Settings.js
#	apps/documenteditor/mobile/app/view/add/AddOther.js
#	apps/documenteditor/mobile/app/view/edit/EditTable.js
#	apps/documenteditor/mobile/index.html
#	apps/documenteditor/mobile/index.html.deploy
#	apps/documenteditor/mobile/index_loader.html
#	apps/documenteditor/mobile/locale/en.json
#	apps/documenteditor/mobile/locale/ru.json
#	apps/documenteditor/mobile/resources/css/app-ios.css
#	apps/documenteditor/mobile/resources/css/app-material.css
#	apps/presentationeditor/main/app/view/SlideSettings.js
#	apps/presentationeditor/mobile/app-dev.js
#	apps/presentationeditor/mobile/app.js
#	apps/presentationeditor/mobile/app/controller/DocumentHolder.js
#	apps/presentationeditor/mobile/app/controller/Main.js
#	apps/presentationeditor/mobile/app/controller/Search.js
#	apps/presentationeditor/mobile/app/controller/Settings.js
#	apps/presentationeditor/mobile/app/controller/Toolbar.js
#	apps/presentationeditor/mobile/app/controller/add/AddImage.js
#	apps/presentationeditor/mobile/app/controller/add/AddLink.js
#	apps/presentationeditor/mobile/app/controller/add/AddTable.js
#	apps/presentationeditor/mobile/app/controller/edit/EditContainer.js
#	apps/presentationeditor/mobile/app/controller/edit/EditImage.js
#	apps/presentationeditor/mobile/app/controller/edit/EditLink.js
#	apps/presentationeditor/mobile/app/controller/edit/EditShape.js
#	apps/presentationeditor/mobile/app/controller/edit/EditSlide.js
#	apps/presentationeditor/mobile/app/controller/edit/EditTable.js
#	apps/presentationeditor/mobile/app/controller/edit/EditText.js
#	apps/presentationeditor/mobile/app/template/EditSlide.template
#	apps/presentationeditor/mobile/app/template/EditTable.template
#	apps/presentationeditor/mobile/app/template/EditText.template
#	apps/presentationeditor/mobile/app/view/Settings.js
#	apps/presentationeditor/mobile/app/view/add/AddOther.js
#	apps/presentationeditor/mobile/app/view/add/AddSlide.js
#	apps/presentationeditor/mobile/app/view/edit/EditSlide.js
#	apps/presentationeditor/mobile/app/view/edit/EditTable.js
#	apps/presentationeditor/mobile/index.html
#	apps/presentationeditor/mobile/index.html.deploy
#	apps/presentationeditor/mobile/index_loader.html
#	apps/presentationeditor/mobile/locale/cs.json
#	apps/presentationeditor/mobile/locale/de.json
#	apps/presentationeditor/mobile/locale/en.json
#	apps/presentationeditor/mobile/locale/es.json
#	apps/presentationeditor/mobile/locale/fr.json
#	apps/presentationeditor/mobile/locale/hu.json
#	apps/presentationeditor/mobile/locale/it.json
#	apps/presentationeditor/mobile/locale/ko.json
#	apps/presentationeditor/mobile/locale/nl.json
#	apps/presentationeditor/mobile/locale/pl.json
#	apps/presentationeditor/mobile/locale/pt.json
#	apps/presentationeditor/mobile/locale/ru.json
#	apps/presentationeditor/mobile/locale/sk.json
#	apps/presentationeditor/mobile/locale/zh.json
#	apps/presentationeditor/mobile/resources/css/app-ios.css
#	apps/presentationeditor/mobile/resources/css/app-material.css
#	apps/presentationeditor/mobile/resources/less/app-ios.less
#	apps/presentationeditor/mobile/resources/less/app-material.less
#	apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
#	apps/spreadsheeteditor/mobile/app/controller/FilterOptions.js
#	apps/spreadsheeteditor/mobile/app/controller/Main.js
#	apps/spreadsheeteditor/mobile/app/controller/Search.js
#	apps/spreadsheeteditor/mobile/app/controller/Settings.js
#	apps/spreadsheeteditor/mobile/app/controller/Statusbar.js
#	apps/spreadsheeteditor/mobile/app/controller/Toolbar.js
#	apps/spreadsheeteditor/mobile/app/controller/add/AddContainer.js
#	apps/spreadsheeteditor/mobile/app/controller/add/AddLink.js
#	apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js
#	apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js
#	apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js
#	apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js
#	apps/spreadsheeteditor/mobile/app/controller/edit/EditImage.js
#	apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js
#	apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js
#	apps/spreadsheeteditor/mobile/app/template/EditCell.template
#	apps/spreadsheeteditor/mobile/app/template/EditImage.template
#	apps/spreadsheeteditor/mobile/app/template/EditText.template
#	apps/spreadsheeteditor/mobile/app/template/Settings.template
#	apps/spreadsheeteditor/mobile/app/view/Settings.js
#	apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js
#	apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
#	apps/spreadsheeteditor/mobile/app/view/edit/EditText.js
#	apps/spreadsheeteditor/mobile/index.html
#	apps/spreadsheeteditor/mobile/index.html.deploy
#	apps/spreadsheeteditor/mobile/index_loader.html
#	apps/spreadsheeteditor/mobile/locale/en.json
#	apps/spreadsheeteditor/mobile/resources/css/app-ios.css
#	apps/spreadsheeteditor/mobile/resources/css/app-material.css
#	apps/spreadsheeteditor/mobile/resources/less/app-material.less
#	apps/spreadsheeteditor/mobile/resources/less/ios/_icons.less
#	apps/spreadsheeteditor/mobile/resources/less/material/_icons.less
#	apps/spreadsheeteditor/mobile/resources/less/statusbar.less
#	build/package.json
2021-04-30 19:29:10 +03:00
JuliaSvinareva 61998a2c04 [mobile] Add hide navbar when sheet-modal is opened 2021-04-30 16:29:41 +03:00
SergeyEzhin 4b0722ad91 [common] Correct searchbar 2021-04-30 16:10:30 +03:00
SergeyEzhin 45b0cb2bac [common] Edits toolbar and corrected searchbar 2021-04-30 01:18:03 +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 02b6ec8a9b
Merge pull request #852 from ONLYOFFICE/fix/bugfix
Fix/bugfix
2021-04-29 20:54:30 +03:00
Maxim Kadushkin 1244f69115 [common] fix bug 50136 2021-04-29 19:32:00 +03:00
Julia Radzhabova 663cf2afc6 Fix Bug 50139 2021-04-29 19:21:41 +03:00
SergeyEzhin 482feeb67d Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-edits 2021-04-29 17:08:19 +03:00
Julia Radzhabova 09a27c30b8 For Bug 50113 2021-04-29 15:41:04 +03:00
SergeyEzhin 4f6251fcbc Merge branch 'feature/mobile-apps-on-reactjs-edits' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs-edits 2021-04-28 17:17:35 +03:00
SergeyEzhin 79cc895ea7 [DE PE mobile] Correct text settings and styles 2021-04-28 16:35:35 +03:00
Maxim Kadushkin 0739e2d588 [common] fix bug 50025 2021-04-28 15:32:20 +03:00
maxkadushkin ba6a752ec8
Merge pull request #848 from ONLYOFFICE/feature/px24-fix-bug-50024
Feature/px24 fix bug 50024
2021-04-28 14:15:46 +03:00
Maxim Kadushkin 134001162c [web-apps] fix bug 50030 2021-04-28 14:10:39 +03:00
JuliaSvinareva 4080a1ab27 Merge branch 'feature/mobile-apps-on-reactjs-edits' into feature/mobile-apps-on-reactjs 2021-04-28 12:34:17 +03:00
JuliaSvinareva cc80c72411 [mobile] Fix icons 2021-04-28 12:33:15 +03:00
SergeyEzhin 141cd15ab6 [DE PE SSE mobile] Moved icon-collaboration 2021-04-28 12:19:09 +03:00
JuliaSvinareva 8cdb629864 [mobile] Fix open context menu, when dialog is opened 2021-04-28 12:04:50 +03:00
Maxim Kadushkin 64031048ce [themes] changed component's state opacity 2021-04-27 23:38:17 +03:00
Maxim Kadushkin 50a97c9152 [themes] fixed dropdown menu style 2021-04-27 23:36:29 +03:00
Maxim Kadushkin 59182cfd6b [common] changed combobox caret style 2021-04-27 22:42:41 +03:00
Julia Radzhabova cc41080814 Change paddings for huge buttons 2021-04-27 22:27:47 +03:00
Julia Radzhabova fc66f37f43 Change groups paddings 2021-04-27 21:21:11 +03:00
Maxim Kadushkin e39c23cc88 [common] changed active state for combobox button 2021-04-27 20:25:00 +03:00
JuliaSvinareva 1d51be59a6 Merge branch 'feature/mobile-apps-on-reactjs-plugins' into feature/mobile-apps-on-reactjs 2021-04-27 17:28:49 +03:00
SergeyEzhin a0538ee3e0 [common] Added plugins 2021-04-27 16:39:39 +03:00