Commit Graph

16590 Commits

Author SHA1 Message Date
d40d73a3a5 GoogleAuth: fix 94 issue 2022-02-24 17:36:44 +03:00
6fb3547652 Files: fix sql 2022-02-24 14:45:58 +03:00
51f79fa0e9 Files: fix track 2022-02-24 14:35:14 +03:00
d4e48004bc added socketio 2022-02-24 13:47:18 +03:00
9d0f1500e6 Files: fix routing 2022-02-24 13:24:39 +03:00
a700e70d86
Merge pull request #532 from ONLYOFFICE/feature/async
Feature/async
2022-02-23 17:20:28 +03:00
d65d30ec24 Test: disable socketio 2022-02-23 17:10:04 +03:00
81b33e673a Files: fix warnings 2022-02-23 17:09:32 +03:00
3cfb10d4d2 Socketio: fix 2022-02-23 17:08:00 +03:00
3d4e000778 Merge branch 'develop' into feature/async
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
2022-02-23 16:01:55 +03:00
1379800971 Files: fix async 2022-02-23 13:42:14 +03:00
75a8ed209f
Merge pull request #562 from ONLYOFFICE/refactoring/frontend-workspaces
Refactoring/frontend workspaces
2022-02-22 18:39:25 +03:00
ae680c6a1c Fix package.json version 2022-02-22 18:27:53 +03:00
fab9e17f6f Update lerna.json 2022-02-22 18:27:20 +03:00
ffaea6ae2c nginx: Remove old products locations 2022-02-22 18:24:54 +03:00
d157dd637e Build: Removed old products nginx configs 2022-02-22 18:23:56 +03:00
e4557b1dec Web: Removed old products from yarn workspaces 2022-02-22 18:21:08 +03:00
9613f4c3ae Merge branch 'master' into develop 2022-02-22 16:19:38 +03:00
297ccb3f73
Merge pull request #547 from ONLYOFFICE/feature/update-readme
Update README.md
2022-02-22 16:18:10 +03:00
412bba955c
Merge branch 'master' into feature/update-readme 2022-02-22 16:13:47 +03:00
a797b3490e Files: async fixes 2022-02-22 12:22:15 +03:00
de0040e7a6 Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2022-02-22 12:15:08 +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
570fa10ca5 Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2022-02-22 11:44:34 +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
88a2934409 Web: Components: fix display table after merge 2022-02-22 11:34:13 +03:00
6b1aed3042 Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2022-02-21 22:27:50 +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
274518139f Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2022-02-18 14:12:32 +03:00
365d8b6a65 Update README.md 2022-02-18 14:01:28 +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
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
15830a9fe0 Fix bug 53339: open banner link in new tab 2022-02-16 18:03:21 +03:00
Vashchuk Nikita
0a384b2c28 refactoring async methods 2022-02-16 15:57:37 +03:00
80f97ef50d Web: Components: ContextMenu: Added left padding for arrow icon 2022-02-16 15:22:46 +03:00