Commit graph

226 commits

Author SHA1 Message Date
Julia Radzhabova e79216b581 Merge branch 'feature/animation_tab' into develop 2021-12-20 13:40:45 +03:00
OVSharova 52bdff7133 Add icons for animation 2021-12-17 17:53:49 +03:00
Julia Radzhabova 8574d52daf [PE] Add icons for animation 2021-12-17 16:39:37 +03:00
Maxim Kadushkin f24dff7c11 [common] fix bug 29734 2021-12-14 22:57:24 +03:00
OVSharova 696d23deaa Add item to effects 2021-12-13 13:01:10 +03:00
OVSharova 0a49fe5815 Fix bugs 2021-12-12 01:09:16 +03:00
Julia Radzhabova 39d99bc762 [PE] Fix lock animation tab. Fix fill settings/change effects. 2021-12-09 01:26:38 +03:00
OVSharova 01cf4e1eb3 Add action from dialog 2021-12-08 04:28:30 +03:00
Julia Radzhabova 83a5f74c03 Merge branch 'feature/animation_tab' into feature/combo-data-view-animation 2021-12-03 12:13:31 +03:00
OVSharova fbc521f76a Fix bugs and refactoring 2021-12-03 06:46:24 +03:00
Julia Radzhabova 125ff2bc5f [PE] Fix animation effects list 2021-12-03 00:41:39 +03:00
OVSharova b304b01e9b add AnimationDialog 2021-12-01 08:08:41 +03:00
OVSharova 57937af17a add functions 2021-11-22 11:54:14 +03:00
Maxim Kadushkin f7e367e617 [desktop] fix fill forms stylesheets 2021-11-19 20:29:36 +03:00
OVSharova 9961257432 Arrays for Animation 2021-11-19 01:24:54 +03:00
OVSharova 91dca660b0 Fill arrays 2021-11-16 03:49:39 +03:00
OVSharova c920f8b925 Fix arrays 2021-11-15 05:10:36 +03:00
OVSharova 59a0eca4c9 Create effectData 2021-11-11 09:17:25 +03:00
Maxim Kadushkin 0724928aa0 [desktop] debug ui themes 2021-11-06 00:33:02 +03:00
Maxim Kadushkin 937501deea [DE] fix skeleton dark theme 2021-11-04 22:44:24 +03:00
Maxim Kadushkin 2c5e17fd0c [desktop] fixed theme initialization on app launch 2021-10-14 20:33:30 +03:00
Maxim Kadushkin ad9a747fc9 [desktop] correct theme's config 2021-10-09 01:05:06 +03:00
Julia Radzhabova 2b6807a5cf Merge branch 'hotfix/v6.4.1' into fix/merge-hotfix 2021-09-30 17:38:38 +03:00
Julia Radzhabova 2a1ecec65d Merge branch 'hotfix/v6.4.1' into develop 2021-09-30 17:30:38 +03:00
maxkadushkin 203bded1e7
[all] fix old-style loader (#1205) 2021-09-24 17:12:58 +03:00
Maxim Kadushkin a6df1332b8 [desktop] apply theme's type if available 2021-09-20 18:33:39 +03:00
Maxim Kadushkin f0786bcdd6 [desktop] extend themes initialization 2021-09-08 10:40:36 +03:00
Maxim Kadushkin 5a7421e35d merge release 6.4.0 to develop 2021-08-25 19:02:44 +03:00
Julia Radzhabova 36f63c87b8 Fix loading when localStorage is not available 2021-08-18 13:30:42 +03:00
Julia Radzhabova 92bb409c5a Send file type in events onRequestRestore, onDownloadAs, onRequestSaveAs 2021-07-30 01:01:33 +03:00
Julia Radzhabova 656715a52b Merge branch 'release/v6.4.0' into develop 2021-07-19 14:37:16 +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
Maxim Kadushkin ee1ca73fb2 [scaling] correct scaling root selectors 2021-06-28 21:01:08 +03:00
Maxim Kadushkin b441e301e3 [all] locked zoom attribute correction 2021-06-28 17:43:46 +03:00
Maxim Kadushkin d484103500 [themes] load external themes 2021-06-25 11:55:33 +03:00
Maxim Kadushkin 88c62da5f6 [common] refactoring 2021-06-25 11:29:11 +03:00
Maxim Kadushkin 4afe790e0f [themes] refactoring 2021-06-25 11:03:05 +03:00
Julia Radzhabova 41d95920a7 Fix loading mask on document opening 2021-06-18 16:53:50 +03:00
JuliaSvinareva 9b8d68594b Hint Manager: changed the way of setting offsets, add hints 2021-06-01 20:07:24 +03:00
JuliaSvinareva 88f32b91f6 Hint Manager: change letter getting, add offsets, add hints for toolbar 2021-05-26 18:30:18 +03:00
Julia Radzhabova d99ad6b1fc Save user id for anonymous user (when user.id is undefined).
[Mobile] Fix loading name for guest user
2021-05-25 16:39:12 +03:00
Maxim Kadushkin fb35bd107c [themes] use system color's scheme by default 2021-05-21 15:48:50 +03:00
Maxim Kadushkin f48235f3cf [themes] fix dependance theme from config 2021-05-21 15:17:04 +03:00
Julia Radzhabova 45d7980212 Merge branch 'release/v6.3.0' into develop 2021-05-21 12:28:54 +03:00
Maxim Kadushkin 11ab64a4d8 [common] fix bug 50245 2021-05-14 22:20:56 +03:00
Maxim Kadushkin 6f32dd91a7 [common] changed theme loading 2021-05-14 17:05:47 +03:00
JuliaSvinareva ed70fe9442 [common] Fix error when clicking on next review in mobile 2021-05-12 18:59:34 +03:00
Maxim Kadushkin c8c5810d1c [common] extend htmlEncode function 2021-05-06 16:29:27 +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