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
..
device.jsx	[mobile] update version for Framework7	2021-01-25 00:30:49 +03:00
extendes.js	[copyright] Update Copyright	2019-01-17 16:05:03 +03:00
IrregularStack.js	[DE mobile] Add preloader for long actions	2021-04-07 20:15:09 +03:00
LocalStorage.js	[mobile] added LocalStorage utility	2021-01-12 23:44:36 +03:00
notifications.js	[common] refactoring	2021-02-05 11:27:44 +03:00
SharedSettings.js	[copyright] Update Copyright	2019-01-17 16:05:03 +03:00
utils.js	Change api config: add user.group parameter used for customization.reviewPermissions (added as prefix).	2020-09-02 20:53:49 +03:00