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
|
1e72e8e0bb
|
[mobile] skip addon path from deploy script
|
2021-08-02 10:29:12 +03:00 |
|
|
Maxim Kadushkin
|
b174f5bbbe
|
[deploy] copy common resources
|
2021-07-26 22:38:34 +03:00 |
|
|
Maxim Kadushkin
|
b5b8dca3a6
|
[all mobile] added version info in production js
|
2021-07-20 19:45:24 +03:00 |
|
|
Maxim Kadushkin
|
6641e9419c
|
Merge branch 'hotfix/v6.3.1' into release/v6.4.0
|
2021-07-04 23:44:01 +03:00 |
|
|
Maxim Kadushkin
|
b8ec15dacb
|
[deploy] refactoring for deployment scripts
|
2021-06-16 20:20:06 +03:00 |
|
|
Maxim Kadushkin
|
e40d7b7009
|
[deploy] extended function to merge configs
|
2021-06-02 14:36:59 +03:00 |
|
|
Maxim Kadushkin
|
442d440c19
|
[deploy] extended 'clean' options
|
2021-05-24 15:39:26 +03:00 |
|
|
Maxim Kadushkin
|
01ce207277
|
[deploy] come missed resources
|
2021-05-20 15:50:02 +03:00 |
|
|
Julia Radzhabova
|
e8d4de37e6
|
Add parameter for default interface language
|
2021-05-12 01:33:51 +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
|
4c5b8cb5d5
|
[deployment] support to build mobile apps via webpack
|
2021-04-16 15:48:54 +03:00 |
|
|
maxkadushkin
|
59afe51335
|
svg was inlined in editor's css
|
2020-11-10 23:49:56 +03:00 |
|
|
maxkadushkin
|
2b50ca8cbd
|
Update Gruntfile.js
|
2020-11-09 18:24:47 +03:00 |
|
|
Maxim Kadushkin
|
58952fcc9a
|
[deploy] fix bug 45991
|
2020-07-30 23:58:14 +03:00 |
|
|
maxkadushkin
|
98b2897594
|
Update Gruntfile.js (#378)
* Update Gruntfile.js
* Update package.json
|
2020-04-07 13:52:53 +03:00 |
|
|
maxkadushkin
|
41cde55b5c
|
Update Gruntfile.js (#377)
|
2020-04-06 16:11:44 +03:00 |
|
|
maxkadushkin
|
ff5d76a40d
|
[deploy] correct environment variables (#375)
|
2020-04-03 18:58:26 +03:00 |
|
Alexey Golubev
|
6375e08b5a
|
Changed phone number
|
2020-03-18 17:29:29 +03:00 |
|
|
Alexey Golubev
|
f8324b58c3
|
Merge branch 'release/v5.5.0' of github.com:ONLYOFFICE/web-apps into release/v5.5.0
|
2020-02-19 20:09:09 +03:00 |
|
|
Alexey Golubev
|
359451fed4
|
Add customer branding
|
2020-02-19 20:04:10 +03:00 |
|
|
maxkadushkin
|
512d8a5de7
|
Update Gruntfile.js (#347)
|
2020-02-19 15:17:18 +03:00 |
|
|
maxkadushkin
|
1138cff890
|
Update Gruntfile.js (#336)
|
2020-02-11 15:22:06 +03:00 |
|
|
Maxim Kadushkin
|
5303f4958b
|
[build] extended deployment to load addons
|
2020-02-11 13:00:21 +03:00 |
|
|
maxkadushkin
|
c0734656fe
|
Update Gruntfile.js (#333)
|
2020-02-06 18:25:21 +03:00 |
|
|
Alexey Golubev
|
abb13c6876
|
Fix brand build
|
2020-02-03 19:27:01 +03:00 |
|
|
Alexey Golubev
|
0212ff96b1
|
Fix branding build
|
2020-02-03 15:45:23 +03:00 |
|
|
Maxim Kadushkin
|
e5a0e50eda
|
Merge with develop
|
2019-12-04 15:26:53 +03:00 |
|
|
Maxim Kadushkin
|
16fbda860d
|
[build] svg didn't inline for alternative start page
|
2019-11-29 14:42:39 +03:00 |
|
|
Maxim Kadushkin
|
670b6cf2c6
|
merge with develop
|
2019-11-28 17:11:18 +03:00 |
|
|
Maxim Kadushkin
|
0dc3212c6c
|
[build] added icons sprite generation to general script
|
2019-11-28 13:58:33 +03:00 |
|
|
Maxim Kadushkin
|
96f9113bf9
|
[deploy] changed path to app extra config
|
2019-10-14 19:02:35 +03:00 |
|
|
Maxim Kadushkin
|
fa5c7bbb30
|
[deploy] refactoring
|
2019-10-14 18:58:17 +03:00 |
|
|
Maxim Kadushkin
|
b28919275f
|
[build] possibility combine app default config with external
|
2019-10-14 16:46:01 +03:00 |
|
|
Maxim Kadushkin
|
43180c90eb
|
[all] sync info with desktop app
|
2019-10-07 15:47:56 +03:00 |
|
|
Julia Radzhabova
|
b338820d20
|
Use vendor/es6-promise for loading translations
|
2019-09-18 14:16:37 +03:00 |
|
|
Julia Radzhabova
|
fb0af71a56
|
[mobile] Bug 39380
|
2019-08-23 11:59:24 +03:00 |
|
|
Julia Radzhabova
|
6a028c838f
|
Fix Bug 42237
|
2019-07-29 13:04:43 +03:00 |
|
|
Julia Radzhabova
|
55ee9ef2cc
|
Merge pull request #176 from ONLYOFFICE/feature/Bug31297
Feature/bug31297
|
2019-05-29 13:30:37 +03:00 |
|
|
Julia Radzhabova
|
9791c7093f
|
Add fetch to build scripts
|
2019-05-22 17:40:10 +03:00 |
|
|
Maxim Kadushkin
|
0211730cc8
|
[build] read environment variables
|
2019-05-22 17:22:50 +03:00 |
|
|
Maxim Kadushkin
|
cc7b8102ca
|
Merge branch 'release/v5.3.0' into develop
# Conflicts:
# apps/documenteditor/main/app/controller/Main.js
|
2019-05-22 16:02:54 +03:00 |
|
|
Maxim Kadushkin
|
9ccb89fd15
|
[build] prepare help's files during deploy
|
2019-05-15 16:25:42 +03:00 |
|
|
Julia Radzhabova
|
b3cf3b6193
|
[DE embed] Translate embedded viewer. Bug 31297
|
2019-05-14 14:11:42 +03:00 |
|
|
Julia Radzhabova
|
8cca5fc839
|
Merge into develop from release/v5.3.0
|
2019-03-29 13:05:29 +03:00 |
|
|
Maxim Kadushkin
|
b57d3cd47f
|
[all] added iscroll plugin in distribution package
|
2019-03-20 15:02:32 +03:00 |
|
|
Maxim Kadushkin
|
6ccb00be8e
|
[all] extend production tags
|
2019-02-26 20:57:23 +03:00 |
|
|
Maxim Kadushkin
|
6cbbcac0db
|
[DE] refactoring
|
2019-02-26 12:34:27 +03:00 |
|
|
Maxim Kadushkin
|
30dc3098b4
|
[build] apply tags to vary production info
|
2019-02-22 15:52:33 +03:00 |
|