Artem Tarasov
|
4474999bb7
|
Web: Doceditor: webpack config modified
|
2022-02-28 18:57:43 +03:00 |
|
Artem Tarasov
|
37eb0732a9
|
Web: Doceditor: modified sharedDependencies
|
2022-02-24 17:43:46 +03:00 |
|
Artem Tarasov
|
73a0c6b637
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Editor/src/App.js
# yarn.lock
|
2022-02-22 13:00:33 +03:00 |
|
Artem Tarasov
|
64a7b0cb17
|
Web: Doceditor: modified template, package.json
|
2022-02-22 12:48:16 +03:00 |
|
Artem Tarasov
|
5bf3c8bc2c
|
Web: Doceditor: modified config'
|
2022-02-22 11:43:05 +03:00 |
|
|
|
3aeac42444
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
# common/services/ASC.ElasticSearch/Service/Settings.cs
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
# common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableGroupMenu.js
# packages/asc-web-components/table-container/TableHeader.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/table-container/TableRow.js
# products/ASC.Files/Client/public/locales/az/Home.json
# products/ASC.Files/Client/public/locales/bg/Home.json
# products/ASC.Files/Client/public/locales/bg/Translations.json
# products/ASC.Files/Client/public/locales/cs/Home.json
# products/ASC.Files/Client/public/locales/de/ConvertDialog.json
# products/ASC.Files/Client/public/locales/de/Home.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/de/UploadPanel.json
# products/ASC.Files/Client/public/locales/el/ConvertDialog.json
# products/ASC.Files/Client/public/locales/el/Home.json
# products/ASC.Files/Client/public/locales/en/ConvertDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/en/UploadPanel.json
# products/ASC.Files/Client/public/locales/es/ConvertDialog.json
# products/ASC.Files/Client/public/locales/es/Home.json
# products/ASC.Files/Client/public/locales/es/UploadPanel.json
# products/ASC.Files/Client/public/locales/fi/Home.json
# products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
# products/ASC.Files/Client/public/locales/fr/Home.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/ConvertDialog.json
# products/ASC.Files/Client/public/locales/it/Home.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/it/UploadPanel.json
# products/ASC.Files/Client/public/locales/ja/Home.json
# products/ASC.Files/Client/public/locales/ja/UploadPanel.json
# products/ASC.Files/Client/public/locales/lv/Home.json
# products/ASC.Files/Client/public/locales/nl/Home.json
# products/ASC.Files/Client/public/locales/nl/Translations.json
# products/ASC.Files/Client/public/locales/pl/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
# products/ASC.Files/Client/public/locales/pt-BR/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Home.json
# products/ASC.Files/Client/public/locales/ro/UploadPanel.json
# products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/ru/UploadPanel.json
# products/ASC.Files/Client/public/locales/sk/Home.json
# products/ASC.Files/Client/public/locales/tr/Home.json
# products/ASC.Files/Client/public/locales/uk/Home.json
# products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
# products/ASC.Files/Client/public/locales/vi/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
# products/ASC.Files/Client/src/HOCs/withBadges.js
# products/ASC.Files/Client/src/HOCs/withContent.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# public/locales/de/Common.json
|
2022-02-21 22:22:38 +03:00 |
|
Artem Tarasov
|
a72302961d
|
Web: Doceditor: modified server config
|
2022-02-19 01:50:14 +03:00 |
|
Artem Tarasov
|
a00a616d9b
|
Web: Doceditor: added config for styled-components (ssr)
|
2022-02-17 17:18:51 +03:00 |
|
|
|
ecb5c7fba2
|
Fixed Bug 55614 - Client.ExternalLink. ‘404 Not Found’ when opening an external link.
|
2022-02-17 15:12:54 +03:00 |
|
|
|
4255cec9ad
|
Notify: fix unsubscribe url
|
2022-02-17 11:30:37 +03:00 |
|
|
|
bef7c923db
|
Settings: added method to get current subscription state
|
2022-02-16 19:32:42 +03:00 |
|
Artem Tarasov
|
88b6c22ff4
|
Web: Doceditor: added webpack-merge
|
2022-02-16 18:34:01 +03:00 |
|
Artem Tarasov
|
e90fbf2bfc
|
Web: Doceditro: config fix
|
2022-02-16 14:16:27 +03:00 |
|
Viktor Fomin
|
fb8e0748f6
|
Web: Campaigns: add ads examples
|
2022-02-16 14:11:49 +03:00 |
|
Artem Tarasov
|
0853e487f8
|
Web: Doceditor: added client render
|
2022-02-16 13:04:04 +03:00 |
|
Artem Tarasov
|
fe8aefd2e4
|
Web: Doceditor: fixed import in render.js
|
2022-02-16 12:52:17 +03:00 |
|
Artem Tarasov
|
f92d2dd2c5
|
Web: Doceditor: added server render
|
2022-02-16 12:50:32 +03:00 |
|
Artem Tarasov
|
14490e8496
|
Web: Doceditor: added initDocEditor func
|
2022-02-16 12:46:47 +03:00 |
|
Artem Tarasov
|
260d00202c
|
Web: Editor: Components: added dynamic component
|
2022-02-16 12:44:25 +03:00 |
|
Artem Tarasov
|
b0e5f7e335
|
Web: Doceditor: added Editor.js
|
2022-02-16 12:41:12 +03:00 |
|
Artem Tarasov
|
da51dfdd2e
|
Web: Doceditor: added node app
|
2022-02-16 12:34:37 +03:00 |
|
Artem Tarasov
|
89a3b3443d
|
Web: Doceditor: package.json: modified scripts
|
2022-02-16 11:37:47 +03:00 |
|
Artem Tarasov
|
8fb05dbc56
|
Web: Doceditor: modified .babelrc
|
2022-02-16 11:23:37 +03:00 |
|
Artem Tarasov
|
ffc5630958
|
Web: Doceditor: added simple webpack config
|
2022-02-16 11:21:42 +03:00 |
|
Artem Tarasov
|
a94022816f
|
Web: Doceditor: added express, modified yarn.lock
|
2022-02-16 11:20:33 +03:00 |
|
Artem Tarasov
|
04667e6821
|
Web: Doceditor: removed next.js
|
2022-02-15 18:44:10 +03:00 |
|
|
|
7f4d29da03
|
Web: Editor: fixed canConvert
|
2022-02-15 16:57:32 +03:00 |
|
|
|
af51658493
|
Web: Campaigns: init example
|
2022-02-15 13:09:44 +03:00 |
|
|
|
f26eb17fe1
|
Web: Common: move shell changes from hotfix/campaigns banner
|
2022-02-15 11:37:31 +03:00 |
|
Artem Tarasov
|
56758b5850
|
Web: Doceditor: fixed i18n config
|
2022-02-09 19:39:04 +03:00 |
|
Artem Tarasov
|
acb5701ee4
|
Web: Doceditor: applied i18n
|
2022-02-08 17:44:34 +03:00 |
|
Artem Tarasov
|
f7c4cf334d
|
Web: Doceditor: added config i18n
|
2022-02-08 17:43:59 +03:00 |
|
|
|
74d6b4bfd6
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
|
2022-02-08 16:06:34 +03:00 |
|
|
|
8d6818c6cd
|
Web: Client: fixed header-logo-wrapper styles
|
2022-02-08 16:06:25 +03:00 |
|
Artem Tarasov
|
39c2fabb69
|
Web: Doceditor: fixed page title and icon change
|
2022-02-08 02:25:10 +03:00 |
|
Artem Tarasov
|
43f882ee32
|
Web: DocEditor: index.js location changed, added Loader
|
2022-02-08 01:49:48 +03:00 |
|
Artem Tarasov
|
51e8212eb9
|
Web: DocEditor/nginx: added base path for doceditor
|
2022-02-08 01:48:41 +03:00 |
|
Artem Tarasov
|
331a53fbed
|
Web: Dooceditor: added redirect to login page if user is not logged in
|
2022-02-07 23:11:15 +03:00 |
|
|
|
b2079ccace
|
fixed warnings
|
2022-02-07 20:19:58 +03:00 |
|
|
|
9f5a1f3ba7
|
Merge branch 'develop' into feature/analizators
|
2022-02-07 19:28:23 +03:00 |
|
|
|
812241a69a
|
Analyzers: fix
|
2022-02-07 17:53:58 +03:00 |
|
|
|
33c0e49705
|
add new file (Home) (de, es, fr, it, zh-CN, ro), update ja UploadPanel
|
2022-02-07 16:44:59 +03:00 |
|
|
|
e16d75839a
|
Merge branch 'develop' of github.com:ONLYOFFICE/CommunityServer-AspNetCore into develop
|
2022-02-04 21:00:05 +03:00 |
|
|
|
eed733b83c
|
fixed user photo thumbnail generator
|
2022-02-04 20:59:58 +03:00 |
|
Artem Tarasov
|
d142d16c4a
|
Web: Doceditor: applied initSSR for axiosClient
|
2022-02-04 17:00:15 +03:00 |
|
|
|
731cbc649b
|
Merge pull request #500 from ONLYOFFICE/feature/socket-io
Feature/socket io
|
2022-02-03 20:58:18 +03:00 |
|
|
|
0f76ba3613
|
Fixed Bug 55236 - Editor: File from third-party storage is can added to favorites.
|
2022-02-03 17:49:00 +03:00 |
|
|
|
34dab043e0
|
Merge branch 'develop' into feature/analizators
# Conflicts:
# common/ASC.Core.Common/ASC.Core.Common.csproj
|
2022-02-03 12:55:33 +03:00 |
|
|
|
4661ee96d0
|
Packages updated
|
2022-02-02 19:54:23 +03:00 |
|
|
|
d0bb0c18a6
|
Web: Files: Fixed editing of converted file.
|
2022-02-02 19:32:38 +03:00 |
|
