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
Julia Radzhabova
f13673653f
Merge branch 'release/v6.4.0' into develop
2021-07-22 17:44:51 +03:00
Maxim Kadushkin
b5b8dca3a6
[all mobile] added version info in production js
2021-07-20 19:45:24 +03:00
Maxim Kadushkin
04020debcb
[all] fix build script
2021-07-20 16:31:43 +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
c93bfb68cb
Merge branch 'hotfix/v6.3.1' into develop
2021-07-04 23:39:04 +03:00
Julia Radzhabova
2edcfb779b
[PE embedded][SSE embedded] Show loader mask
2021-06-25 00:48:20 +03:00
Julia Radzhabova
8766f4db61
[DE embedded] Show loader mask
2021-06-24 19:08:21 +03:00
Maxim Kadushkin
db70a44d4e
[all] fix launch customized app
2021-06-17 19:19:07 +03:00
Maxim Kadushkin
b8ec15dacb
[deploy] refactoring for deployment scripts
2021-06-16 20:20:06 +03:00
Maxim Kadushkin
84b722a49a
[SSE mobile] fix bug 50785
2021-06-15 17:55:25 +03:00
Maxim Kadushkin
e40d7b7009
[deploy] extended function to merge configs
2021-06-02 14:36:59 +03:00
Julia Radzhabova
f52a6b459b
[Embedded] Load id and name for anonymous user
2021-05-25 16:40:40 +03:00
Maxim Kadushkin
442d440c19
[deploy] extended 'clean' options
2021-05-24 15:39:26 +03:00
Maxim Kadushkin
1ffb75d3ee
[stylesheets] fix sprites generation
2021-05-21 13:07:18 +03:00
Maxim Kadushkin
44210f7a5a
[all] prepare sprites for 1.25x and 1.75x scaling
2021-05-21 11:19: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
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
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`:
741b10515dhttps://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
