|
|
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 |
|
|
|
2094fa112a
|
refactoring: update urlShortener
|
2022-02-22 16:45:14 +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 |
|
|
|
6f1ab3515f
|
delete urlShortener.svc
|
2022-02-22 15:54:44 +03:00 |
|
|
|
ac0e314f60
|
winsw: refactoring
update bats
relocate xml and exe
|
2022-02-22 15:45:21 +03:00 |
|
|
|
348e4cd1e0
|
winsw: bugfix urlShortener
|
2022-02-22 13:31:10 +03:00 |
|
|
|
b8b23d266d
|
winsw: update bats
|
2022-02-22 13:15:02 +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 |
|
|
|
8ac659957b
|
Merge pull request #529 from ONLYOFFICE/feature/refactoring-webhooks.core
Feature/refactoring webhooks.core
|
2022-02-21 22:35:35 +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 |
|
|
|
780a1cf608
|
Merge branch 'feature/backend-refactor' into feature/refactoring-webhooks.core
|
2022-02-21 21:20:35 +03:00 |
|
|
|
5c7e46b9ab
|
winsw: add winsw
add urlShortener.xml
update bats
add winsw.exe
|
2022-02-21 20:46:23 +03:00 |
|
|
|
a4fb62546a
|
winsw: update urlShortener
get settings in appsettings.json
|
2022-02-21 20:45:39 +03:00 |
|
|
|
8640d03a5f
|
MessagingSystem: refactor
|
2022-02-21 18:50:53 +03:00 |
|
|
|
e66375760d
|
MessagingSystem: refactor
|
2022-02-21 18:48:48 +03:00 |
|
|
|
c707004d15
|
MessaginSystem: used file-scoped namespaces
|
2022-02-21 18:40:38 +03:00 |
|
|
|
9fe4971055
|
add mapping, project reorganization
|
2022-02-21 18:35:57 +03:00 |
|
|
|
d15fd84881
|
Notify: added services
|
2022-02-21 15:29:25 +03:00 |
|
|
|
a021ef2cd8
|
Notify: reworked to IHostedService
|
2022-02-21 15:29:16 +03:00 |
|
|
|
deb18a37f8
|
Notify: reworked to background service
|
2022-02-21 15:28:52 +03:00 |
|
|
|
a57882df01
|
Notify: removed unnecessary laucnher
|
2022-02-21 15:28:09 +03:00 |
|
|
|
66203b100c
|
Notify: add using
|
2022-02-21 15:27:26 +03:00 |
|
|
|
9f13cb5e17
|
Merge branch 'feature/backend-refactor' into feautre/asc-messaging-system-refactor
|
2022-02-21 13:07:50 +03:00 |
|
|
|
0221db9fbf
|
Core: removed unnecessary
|
2022-02-21 13:01:21 +03:00 |
|
|
|
7ad1462b81
|
Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor
|
2022-02-21 12:51:45 +03:00 |
|
|
|
f09673bfe7
|
Core: refactor
|
2022-02-21 12:25:30 +03:00 |
|
|
|
998471f868
|
Core: removed empty lines
|
2022-02-21 12:17:17 +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 |
|
|
|
485fecd98a
|
Merge pull request #538 from ONLYOFFICE/feature/asc-ipsecurity-refactor
Feature/asc ipsecurity refactor
|
2022-02-18 20:31:55 +03:00 |
|
|
|
5b5ed4a4e3
|
Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor
|
2022-02-18 18:55:59 +03:00 |
|
|
|
880d81af83
|
Fedd: used file-scoped namespaces
|
2022-02-18 18:32:42 +03:00 |
|
|
|
9c08a5c52e
|
Feed: moved feed migrations to ASC.Feed, resolved usings
|
2022-02-18 18:30:53 +03:00 |
|
|
|
f079f77ab9
|
reorganize
|
2022-02-18 18:11:53 +03:00 |
|
|
|
a877ddf69d
|
fix
|
2022-02-18 18:10:50 +03:00 |
|
