Commit graph

108 commits

Author SHA1 Message Date
Maxim Kadushkin 01ce207277 [deploy] come missed resources 2021-05-20 15:50:02 +03:00
Maxim Kadushkin 3b517bdc49 [PE] fix build config 2021-05-06 17:33:13 +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
Maxim Kadushkin dba13ffbdf [all] fixed logo on bundled app version 2021-03-31 19:52:05 +03:00
Maxim Kadushkin 5cd3145d73 [multiscaling] changed "wrapping" and "table borders" icons in DE 2021-01-26 23:52:43 +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
Alexander Trofimov 31f0e37086 [build] Fix
Delete space. On build this file always have changes
2020-10-26 18:05:14 +03:00
Julia Radzhabova 8233cc2388 Merge branch 'release/v6.0.0' into develop 2020-09-09 13:55:55 +03:00
Maxim Kadushkin 43bf279535 [DE] added users collection 2020-08-31 20:31:05 +03:00
maxkadushkin 74a44dce21
corrected list of packages for production 2020-08-26 11:41:35 +03:00
Maxim Kadushkin 58952fcc9a [deploy] fix bug 45991 2020-07-30 23:58:14 +03:00
Julia Radzhabova 104cdd2a22 Fix Bug 45007 2020-07-02 23:20:43 +03:00
Julia Radzhabova 5303389420 Change recent files 2020-06-11 19:36:37 +03:00
Maxim Kadushkin 56420dc147 [all] copy loader for 'embed' mode 2020-05-06 19:36:01 +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
Pavel Lobashov 4b6762a534 Remove unneded dependency grunt-jscoverage
This was added in first commit:
741b10515d
Task was not initialized and never used, no source of
`jscoverage:` config found, `grunt jscoverage` failing with error
2019-12-18 15:02:14 +03:00
Pavel Lobashov ad9c03aa4e Remove grunt-replace nodejs dependency
This was introduced since first commit to `web-apps`:
741b10515d
Accroding to https://www.npmjs.com/package/grunt-replace
it create grunt task `grunt-replace` but it's never used.
Also this depends on `"lodash": "^4.11.0"` and blocking
security updates of `lodash` (current 4.17.15)
2019-12-18 12:29:34 +03:00
Alexey Golubev 700add7047 Make 'sprites.sh' executable 2019-12-16 15:41:06 +03:00
Maxim Kadushkin e5a0e50eda Merge with develop 2019-12-04 15:26:53 +03:00
Maxim Kadushkin 291807d986 [build] version is up for less plugin 2019-12-02 14:21:34 +03:00
Maxim Kadushkin c304aa15ca [build] script to build sprites for develop 2019-11-29 18:55:02 +03:00
Maxim Kadushkin 16fbda860d [build] svg didn't inline for alternative start page 2019-11-29 14:42:39 +03:00
Maxim Kadushkin dfee17d7ae [build] added package.json for sprites build 2019-11-29 14:27:09 +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 0cac87856a [build] skip copying sprite sources for deployment 2019-11-28 11:46:48 +03:00
Maxim Kadushkin 2efde585a4 [sprite] changed deploy script 2019-11-27 20:12:05 +03:00
Maxim Kadushkin 8a7aa454ac [DE] build icon sprite from source images 2019-11-21 10:58:05 +03:00
Oleg Korshul 93e10743fb Add images to deploy 2019-11-15 14:36:57 +03:00
Julia Radzhabova 6bae248efb Update build script (add symbol table translation) 2019-11-12 15:11:44 +03:00
Alexander Yuzhin 50e93373c3 [DE] Fixed display dummy document on loading 2019-10-30 11:29:17 +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 8d3ec85ca2 Merge branch 'develop' into feature/optimization 2019-09-18 16:32:26 +03:00
Julia Radzhabova b338820d20 Use vendor/es6-promise for loading translations 2019-09-18 14:16:37 +03:00