Commit Graph

30760 Commits

Author SHA1 Message Date
3269d48e15 added new table 2023-02-21 14:22:34 +03:00
25859e5d4e refactoring 2023-02-17 15:56:40 +03:00
1133a84671 fix header 2023-02-15 21:26:28 +03:00
d5d8373125 EnableSSLVerification is true by default 2023-02-15 15:06:22 +03:00
4c92d947e8 removed unused migrations 2023-02-09 14:36:16 +03:00
afe82d599d ASC.Webhooks.Service moved to ASC.Web.Studio 2023-02-08 20:31:58 +03:00
6d363d4abd Webhooks: settings 2023-02-08 14:46:33 +03:00
e58175f69e WebHooks: added resources, new methods and settings for disable webhook 2023-02-08 14:17:06 +03:00
d49ee80fd8 Merge branch 'develop' into feature/fix-webhooks-second 2023-02-08 13:18:59 +03:00
523606ebcb
Merge pull request #1185 from ONLYOFFICE/bugfix/fix-plugins-build
Plugins: fix versions
2023-02-08 12:34:46 +03:00
Timofey Boyko
f89c5d4036 Plugins: fix versions 2023-02-08 12:32:48 +03:00
6a2606b71e fixed MigrationPersonalToDocSpace 2023-02-08 12:07:34 +03:00
109b44c529
Merge pull request #1132 from ONLYOFFICE/feature/asc.apicache
Feature/asc.apicache
2023-02-08 11:49:27 +03:00
0e48ad7235
Merge pull request #1183 from ONLYOFFICE/bugfix/toggleButton
Web: Correcting the absence of the background of the button when isCh…
2023-02-08 10:42:29 +03:00
17a6d8785f Web: Correcting the absence of the background of the button when isChecked in the storybook. 2023-02-08 10:34:02 +03:00
6b880d4e10
Merge pull request #1182 from ONLYOFFICE/feature/update-plugins-dependencies
Feature/update plugins dependencies
2023-02-08 10:26:37 +03:00
Timofey Boyko
eb5d6b9b77 Plugins: bump dependencies 2023-02-08 10:21:42 +03:00
Timofey Boyko
1b4d2cad04 docspace-plugin: update dependencies 2023-02-08 10:03:00 +03:00
Timofey Boyko
61d214b15d WebPlugins: update dependencies 2023-02-08 09:59:50 +03:00
4da735203a
Merge pull request #1181 from ONLYOFFICE/feature/action-develo-brach
Modify github action branch
2023-02-07 20:42:56 +03:00
sk81.biz@gmail.com
5d38bd404b Github action build from develop 2023-02-07 20:32:32 +03:00
d38efe9474 Merge branch 'develop' into feature/asc.apicache
# Conflicts:
#	common/services/ASC.ApiSystem/Program.cs
2023-02-07 19:23:54 +03:00
ed94c42896 temporary removed apiCache 2023-02-07 19:12:44 +03:00
5e76441b64 fix 2023-02-07 19:12:09 +03:00
0f35b8ab45 redis: support User property from config 2023-02-07 17:53:34 +03:00
f52f32a6af Merge branch 'develop' into feature/asc.apicache
# Conflicts:
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
#	common/Tools/ASC.Migration.Creator/Program.cs
#	common/Tools/ASC.Migration.Runner/Program.cs
#	common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs
#	common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs
2023-02-07 17:07:20 +03:00
b39b294920 fix 2023-02-07 14:46:24 +03:00
c89b8ca427 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
#	common/ASC.Data.Backup.Core/Storage/BackupStorageFactory.cs
#	common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
#	common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
2023-02-07 14:31:22 +03:00
4a47e72a9a
Merge pull request #1173 from ONLYOFFICE/release/rc-v1.2.0
Release/rc v1.2.0
2023-02-07 13:45:23 +03:00
Timofey Boyko
dda05f7d7d Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-02-07 13:26:54 +03:00
Timofey Boyko
e0f2a397c4 Web:Client: fix translations for devices 2023-02-07 13:26:46 +03:00
0dd6985bd2 Fixed storybook run 2023-02-07 12:57:48 +03:00
b378917502
Merge pull request #1172 from ONLYOFFICE/feature/update-readme
Update README.md
2023-02-07 12:54:01 +03:00
Kseniya Fedoruk
e9764904fb
Update README.md 2023-02-07 12:40:39 +03:00
3bfad2c234 Update README.md 2023-02-07 12:26:37 +03:00
264f415dff Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2023-02-07 12:21:29 +03:00
81e6c58cc1 Web:Client:Added that when opening the Accent and Buttons modal, the colors are displayed from the previously selected portal theme. 2023-02-07 12:20:31 +03:00
22eacf4fb8 Fixed Bug 61060 - Accounts: Error in console Uncaught TypeError: "newData" is read-only when deselecting account 2023-02-07 11:00:21 +03:00
604bc27e88 files: added logs 2023-02-07 00:35:13 +03:00
45b8e81a63 Web: Optimization of thumbnails creation 2023-02-06 23:05:57 +03:00
8c18fb254d Fix TypeError: Cannot read properties of undefined (reading 'split') 2023-02-06 20:47:54 +03:00
Timofey Boyko
3dc7c23196 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-02-06 19:28:08 +03:00
Elyor Djalilov
3722ae1a77 Fix Bug 61037 - Rooms.Localization. Incorrect message about moving rooms to the archive in Russian localization 2023-02-06 21:23:32 +05:00
Elyor Djalilov
0bfb980f99 Bug 61043 - Files. Unreadable characters instead of name in Author column and Info/History panel 2023-02-06 21:19:25 +05:00
Timofey Boyko
131dd06bdb Web: fix build 2023-02-06 19:15:04 +03:00
DmitrySychugov
f25abdc1ba Web: Components: added alignment for title media error 2023-02-06 19:51:53 +05:00
DmitrySychugov
b3d04ccd59 Web: Client: added media error ru translation 2023-02-06 19:50:55 +05:00
c97c281dea Web: Components: Toast: Fixed error toast with custom body 2023-02-06 16:35:50 +03:00
d3bed594a9 Web: Client: ChangeUserTypeEvent: Fixed client error message, added payments setting link 2023-02-06 16:33:40 +03:00
6fa291abce Web: Client: Locales: Payment: Fixed key: QuotaPaidUserLimitError 2023-02-06 16:32:29 +03:00