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 |
|
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 |
|