Commit graph

65 commits

Author SHA1 Message Date
Maxim Kadushkin 093a5857ab [deploy] debug 2021-06-18 13:10:18 +03:00
Maxim Kadushkin 3b5a064242 [deploy] fix build mobile apps 2021-06-03 15:41:28 +03:00
Maxim Kadushkin 2ab1078ab1 [deploy] added version info 2021-05-20 19:22:13 +03:00
Maxim Kadushkin 4ccd255fe5 [mobile] removed framework7 ver 1.5 sources 2021-05-11 13:32:48 +03:00
Maxim Kadushkin 9a1c2a0b91 [mobile] fix build script 2021-05-06 14:14:51 +03:00
Maxim Kadushkin fdda540c47 [all] fix loading sdk scripts 2021-05-03 20:02:21 +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
Maxim Kadushkin 0ba574b9cf Merge branch 'feature/mobile-apps-on-reactjs-deployment' into feature/mobile-apps-on-reactjs 2021-04-29 21:05:15 +03:00
Maxim Kadushkin 3dd26e178b [common] switch off version compare for debug 2021-04-20 12:47:57 +03:00
Maxim Kadushkin 4c5b8cb5d5 [deployment] support to build mobile apps via webpack 2021-04-16 15:48:54 +03:00
JuliaSvinareva 92520c0e13 Merge branch 'feature/mobile-apps-on-reactjs-fixes' into feature/mobile-apps-on-reactjs 2021-04-15 13:26:46 +03:00
JuliaSvinareva 9e753e6962 [mobile] Fix error 2021-04-15 12:43:24 +03:00
JuliaSvinareva 0f76a31706 [DE mobile] Added replacement of company name in translations 2021-04-12 15:10:14 +03:00
JuliaSvinareva 8d6ea8f464 [DE mobile] Make main controller 2021-04-09 21:08:13 +03:00
Maxim Kadushkin c3e14f5f12 [deploy] changed script for release build 2021-04-08 17:54:03 +03:00
JuliaSvinareva 2b355ce7ec Merge branch 'feature/mobile-apps-on-reactjs' of https://github.com/ONLYOFFICE/web-apps into feature/mobile-apps-on-reactjs 2021-04-04 18:15:34 +03:00
JuliaSvinareva 93152efb32 [DE mobile] Add apply license in main controller 2021-04-04 18:01:19 +03:00
Maxim Kadushkin dc4c20081b [DE mobile] extended controller for private functions 2021-04-03 18:38:32 +03:00
SergeyEzhin 5a090f8210 Merge branch 'feature/mobile-apps-on-reactjs' into feature/mobile-apps-on-reactjs-fixes 2021-03-30 15:36:06 +03:00
Maxim Kadushkin 09102047c1 [DE mobile] load private functions patch 2021-03-28 00:28:07 +03:00
Maxim Kadushkin b0a3d7be7f webpack updated to ver 5 2021-03-22 11:42:10 +03:00
SergeyEzhin 90b613d88d [mobile] Corrected some elements 2021-03-18 17:00:52 +03:00
Maxim Kadushkin 3b40251853 [mobile] fill 'About' info in compile time 2021-03-11 10:21:22 +03:00
Maxim Kadushkin 465ede2f4e [mobile] refactoring build scripts 2021-03-11 10:18:13 +03:00
Maxim Kadushkin 1232c64fc7 [common] mobx version is up to 6 2021-03-07 23:40:54 +03:00
Julia Radzhabova 17535856a0 Fix scroll style: Issue 1160 2021-02-26 12:20:11 +03:00
Maxim Kadushkin ea2e8fa501 [DE mobile] changed project structure 2021-01-25 00:35:48 +03:00
Maxim Kadushkin 003fe4386e [mobile] update version for Framework7 2021-01-25 00:30:49 +03:00
Maxim Kadushkin 03ee826008 [mobile] changed build script 2020-12-10 16:15:41 +03:00
Maxim Kadushkin c320b30ff7 [PE mobile] changed build config 2020-11-25 23:16:45 +03:00
JuliaSvinareva 48d21bc8f8 [mobile] Enabled javascript into less-loader 2020-11-19 20:24:40 +03:00
Maxim Kadushkin b041083933 Merge branch 'feature/reactjs-container-component-with-mobx' into feature/mobile-apps-on-reactjs
# Conflicts:
#	apps/documenteditor/mobile/locale/en.json
#	apps/documenteditor/mobile/src/components/app.jsx
#	apps/documenteditor/mobile/src/components/settings/Settings.jsx
#	apps/documenteditor/mobile/src/components/settings/document-settings/DocumentSettings.jsx
#	apps/documenteditor/mobile/src/js/routes.js
#	apps/documenteditor/mobile/src/pages/home.jsx
#	apps/documenteditor/mobile/src/store/reducers/root.js
#	apps/documenteditor/mobile/src/store/store.js
2020-10-16 11:37:47 +03:00
Maxim Kadushkin ce969e9ca6 tune packages to use mobx 2020-09-29 21:57:01 +03:00
Maxim Kadushkin 9ab2f40f19 [DE] added 'DocumentSettings' controller 2020-09-25 21:17:45 +03:00
JuliaSvinareva bb873e1105 [mobile] add redux-thunk package, add api into store, add orientation setting into document settings 2020-09-20 15:04:46 +03:00
Maxim Kadushkin 43bf279535 [DE] added users collection 2020-08-31 20:31:05 +03:00
Maxim Kadushkin 1d6730f65d [mobile] added f7 build scripts 2020-08-13 13:39:46 +03:00
JuliaSvinareva 45bc8b40b0 [All] jquery 3.5.1 2020-05-22 16:54:23 +03:00
JuliaSvinareva 57bbfd47b7 [All] Update jquery 3.4.1 2020-05-22 16:39:45 +03:00
JuliaSvinareva 7b1fcd763a [All] update jquery 2020-05-20 15:24:15 +03:00
Maxim Kadushkin 09a2df443f [3dparty] version of Less up to 3.10.3 2019-10-18 11:33:36 +03:00
Julia Radzhabova 8ec738fa18 Add es6-promise to vendor 2019-09-18 14:15:31 +03:00
Maxim Kadushkin 83d34ac953 [vendor] debug for fetch polyfill 2019-05-22 15:54:48 +03:00
Maxim Kadushkin 5b1c0751d6 [vendor] added polyfill for fetch function 2019-05-22 15:46:13 +03:00
Maxim Kadushkin 1bac56bb70 [all] minified iscroll sources 2019-03-20 17:31:25 +03:00
Alexander Yuzhin fa94ae05f0 [de] Sailfish scroll support 2019-03-19 15:39:51 +03:00
Alexey Golubev 1c4b3a9292
Delete link to nderscore-min.map 2017-11-08 12:38:56 +03:00
Alexey Golubev 0f8facfb26 Removed map statement 2017-08-01 15:00:50 +03:00
Maxim Kadushkin d223649a8a [Common] dynamically insert svg into developer html 2017-07-13 12:10:40 +03:00
Julia Radzhabova fde00ea2d2 Update jquery to 3.2.1. 2017-04-21 11:20:40 +03:00