Commit graph

105 commits

Author SHA1 Message Date
Andrey Shimagin 16c09f3b6a [PE] Add RTL-styles 2022-04-15 16:57:00 +03:00
Julia Radzhabova 21a0746dd9 Merge branch 'release/v7.1.0' into develop 2022-03-21 12:08:52 +03:00
Maxim Kadushkin 43c0fb8b0c [deploy] debug deploy modules for mobile 2022-03-20 01:08:02 +03:00
Maxim Kadushkin d54084cdbd [mobile] changed npm manifest lock file 2022-03-19 18:42:30 +03:00
Maxim Kadushkin 5c7b3ab04d [deploy] changed npm manifest files 2022-03-19 18:12:08 +03:00
Julia Radzhabova b1a58e9f61 Merge branch 'release/v7.1.0' into develop 2022-03-05 13:05:49 +03:00
ShimaginAndrey cc60ecdd54 Fix regSettings and refactoring 2022-03-02 13:09:22 +03:00
Maxim Kadushkin 8410640633 [stylesheet] version of less up to 4.1.2 2022-03-01 11:30:22 +03:00
Maxim Kadushkin 41d3e37774 [all mobile] for bug 49275 2022-02-15 11:27:08 +03:00
papacarlo adc2afabf5 Merge branch release/v7.0.0 into release/v7.1.0 2022-01-17 14:34:05 +00:00
papacarlo b43a9055b3 Merge branch release/v7.0.0 into develop 2022-01-17 14:34:00 +00:00
Maxim Kadushkin ba344265b3 [mobile] added checking of extra addons for build 2022-01-15 15:33:12 +03:00
Julia Radzhabova 6abc2ae930 [Vendor] Remove bs docs 2022-01-14 00:52:27 +03:00
Julia Radzhabova 89a66ab06a Merge branch 'release/v7.0.0' into develop 2021-12-24 17:32:14 +03:00
Maxim Kadushkin e14be4baec Merge branch 'hotfix/v6.4.3' into release/v7.0.0 2021-12-21 00:06:03 +03:00
Maxim Kadushkin e638c321e7 [SSE] fix bug 53558 2021-12-20 18:05:02 +03:00
Maxim Kadushkin 95ffddb860 [SSE] fix bug 54618 2021-12-20 12:17:16 +03:00
Maxim Kadushkin bd89e046e7 [mobile] adapt skeleton for dark theme 2021-11-24 15:19:07 +03:00
Julia Radzhabova 308ec711c8 Merge branch 'release/v7.0.0' into develop 2021-11-19 15:34:25 +03:00
Maxim Kadushkin e148ad159e [SSE] fix bug 53558 2021-11-10 00:56:44 +03:00
Maxim Kadushkin 27d024bde5 Merge branch 'hotfix/v6.4.2' into release/v7.0.0 2021-10-31 22:26:35 +03:00
Maxim Kadushkin a69f22b9b4 Merge branch 'hotfix/v6.4.2' into develop 2021-10-31 22:23:43 +03:00
Maxim Kadushkin b828bf616f [mobile] get "about" info from enviroment variables 2021-10-23 11:35:46 +03:00
Maxim Kadushkin 1b0b18b691 [mobile] fix bug 53253 2021-10-22 23:04:06 +03:00
Maxim Kadushkin ec46276bea [mobile] for bug 53253 2021-10-22 23:03:03 +03:00
Maxim Kadushkin 24024fac8f [SSE modile] refactoring 2021-09-28 11:09:07 +03:00
Maxim Kadushkin 594db69572 [SSE mobile] inline skeleton styles to html 2021-09-27 22:01:49 +03:00
Maxim Kadushkin 5a7421e35d merge release 6.4.0 to develop 2021-08-25 19:02:44 +03:00
maxkadushkin 6272524079
Update package.json (#1119) 2021-08-24 12:40:37 +03:00
Julia Radzhabova 3ab6e18621 Merge branch 'release/v6.4.0' into develop 2021-08-09 13:30:40 +03:00
Maxim Kadushkin 736453ce15 [mobile] revert changes for addon path 2021-08-02 21:31:49 +03:00
Maxim Kadushkin 1690881eeb [deploy] debug 2021-08-02 17:31:10 +03:00
Maxim Kadushkin 1e72e8e0bb [mobile] skip addon path from deploy script 2021-08-02 10:29:12 +03:00
maxkadushkin bc746c723e
Merge pull request #1009 from ONLYOFFICE/release/v6.4.0
undo build.js
2021-07-22 18:25:47 +03:00
maxkadushkin aa599d44ba
undo build.js 2021-07-22 18:23:48 +03:00
Oleg Korshul 79064ecbc1 Fix spaces in previous commit 2021-07-22 17:59:06 +03:00
Oleg Korshul 50663b460f
Merge pull request #1008 from ONLYOFFICE/release/v6.4.0
Release/v6.4.0
2021-07-22 17:58:52 +03:00
Oleg Korshul fe36bef1d6 Exit in developer mode 2021-07-22 17:56:25 +03:00
Maxim Kadushkin 7310d1dd12 [vendor] added bootstrap v3.4.1 2021-07-14 18:13:38 +03:00
Maxim Kadushkin dc9668a5b7 remove bootstrap v3.3.7 2021-07-14 18:10:29 +03:00
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