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
|
484270d00c
|
Web: Config: deleted nginx config for editor
|
2022-02-22 12:49:00 +03:00 |
|
Artem Tarasov
|
64a7b0cb17
|
Web: Doceditor: modified template, package.json
|
2022-02-22 12:48:16 +03:00 |
|
|
b12ec986fc
|
Merge pull request #561 from ONLYOFFICE/bugfix/fixed-table-view
Web: Components: fixed table view
|
2022-02-22 12:14:51 +03:00 |
|
|
2a7616585e
|
Web: Components: fixed table view
|
2022-02-22 12:10:27 +03:00 |
|
|
c0cd257700
|
Merge pull request #560 from ONLYOFFICE/bugfix/fix-table-display
Web: Components: fix display table after merge
|
2022-02-22 11:44:12 +03:00 |
|
Artem Tarasov
|
5bf3c8bc2c
|
Web: Doceditor: modified config'
|
2022-02-22 11:43:05 +03:00 |
|
|
88a2934409
|
Web: Components: fix display table after merge
|
2022-02-22 11:34:13 +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 |
|
|
dadf439c1f
|
Merge pull request #551 from ONLYOFFICE/hotfix/v1.1.1
Hotfix/v1.1.1
|
2022-02-21 10:22:09 +03:00 |
|
Artem Tarasov
|
a72302961d
|
Web: Doceditor: modified server config
|
2022-02-19 01:50:14 +03:00 |
|
|
df278ba35b
|
fix unsubscribe link
|
2022-02-17 18:55:10 +03:00 |
|
|
e0984202d0
|
fix 55612
|
2022-02-17 18:06:03 +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 |
|
|
e3b894a21a
|
ResManager: fix
|
2022-02-17 14:47:50 +03:00 |
|
|
eccb588362
|
Web: People: Profile: Added default width for language selector
|
2022-02-17 14:38:49 +03:00 |
|
|
ebd51f3f6b
|
Web: Components: DropDown: Disable linter warnings
|
2022-02-17 14:38:07 +03:00 |
|
|
c8790b2cc6
|
Web: Components: ComboBox: Added manualWidth property for DropDown component
|
2022-02-17 14:37:32 +03:00 |
|
|
c2c802b732
|
Web: Common: PageLayout: Fixed default PageLayout header styles after merge
|
2022-02-17 13:06:42 +03:00 |
|
|
e848d5d979
|
Web: Files: Table/Filter: Restored sorting inside favorite folder
|
2022-02-17 12:45:55 +03:00 |
|
|
743d0566a3
|
edit de (common)
|
2022-02-17 12:34:35 +03:00 |
|
|
4255cec9ad
|
Notify: fix unsubscribe url
|
2022-02-17 11:30:37 +03:00 |
|
|
7419eb87dc
|
Web: People: Added opportunity to unsubscribe from mailing list on My Profile page (/my?unsubscribe=tips)
|
2022-02-16 21:34:19 +03:00 |
|
|
d634d82050
|
Web: Components: Added enableToggle for <ToggleContent />
|
2022-02-16 21:30:52 +03:00 |
|
|
e7dfa142d6
|
Subscription: fix
|
2022-02-16 20:34:21 +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 |
|
|
15830a9fe0
|
Fix bug 53339: open banner link in new tab
|
2022-02-16 18:03:21 +03:00 |
|
|
80f97ef50d
|
Web: Components: ContextMenu: Added left padding for arrow icon
|
2022-02-16 15:22:46 +03:00 |
|
|
638390de68
|
Merge pull request #540 from ONLYOFFICE/feature/hide-filter-sort
Feature/hide filter sort
|
2022-02-16 15:14:10 +03:00 |
|
Artem Tarasov
|
e90fbf2bfc
|
Web: Doceditro: config fix
|
2022-02-16 14:16:27 +03:00 |
|
Artem Tarasov
|
08bf74d05e
|
Web: Common: added eager relations for some shared dependencies (mf ssr fix)
|
2022-02-16 14:16:04 +03:00 |
|
Viktor Fomin
|
fb8e0748f6
|
Web: Campaigns: add ads examples
|
2022-02-16 14:11:49 +03:00 |
|
|
924d9bda34
|
Web: Files: Table: Added hiding sort actions inside TableHeader at recent and favorites folder
|
2022-02-16 13:58:57 +03:00 |
|
|
e6731ec23d
|
Web: Components: TableHeader: Added property for hiding sort icon and disable sort actions
|
2022-02-16 13:57:59 +03:00 |
|
|
ee40f9ba7f
|
Web: Files: Filter: Added hiding sort items inside filter at recent and favorites folder
|
2022-02-16 13:55:42 +03:00 |
|
|
02a9c6f973
|
Web: Common: FilterInput: Fixed displaying sort icon if sort items hidden
|
2022-02-16 13:54:11 +03:00 |
|
|
5a876ff5ab
|
Web: Common: FilterInput: Added property for hiding sort items inside SortComboBox
|
2022-02-16 13:53:09 +03:00 |
|
Tatiana Lopaeva
|
05cd52bb77
|
Merge pull request #539 from ONLYOFFICE/bugfix/fix-file-name-when-rename
Fixed Bug 55530 - Client.Files. Fixed the display of the file name wh…
|
2022-02-16 13:42:51 +03:00 |
|
|
62b4b55dca
|
Web: Files: moved isEdit, titleWithoutExt to inject
|
2022-02-16 13:18:14 +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 |
|
|
5322ed2cec
|
Fixed Bug 55530 - Client.Files. Fixed the display of the file name when renaming.
|
2022-02-16 12:03:22 +03:00 |
|