IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,673 Commits 40 Branches 22 Tags 420 MiB
b48305ae35
Commit Graph

11470 Commits

Author SHA1 Message Date
Pavel Bannov
166208565f
Merge pull request #1724 from ONLYOFFICE/feature/remove-ser-attr 
removed Serializable attribute
 2023-09-11 07:33:57 -07:00
Pavel Bannov
5977a9f986
Merge pull request #1719 from ONLYOFFICE/feature/json-7 
Feature/json 7
 2023-09-11 07:33:28 -07:00
Pavel Bannov
00a9b332df
Merge pull request #1727 from ONLYOFFICE/feature/accounts-optimization 
Feature/accounts optimization
 2023-09-11 04:36:07 -07:00
Pavel Bannov
0510210a7b
Merge pull request #1728 from ONLYOFFICE/bugfix/folder-restore 
Bugfix/folder restore
 2023-09-11 02:11:24 -07:00
MaksimChegulov
d3097f9cd9 Merge branch 'develop' into bugfix/room-filter 
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
 2023-09-11 11:19:40 +03:00
MaksimChegulov
bf9eae140f fixed folder restore from trash 2023-09-11 11:16:24 +03:00
pavelbannov
2283184a61 removed Serializable attribute 2023-09-08 16:24:24 +03:00
pavelbannov
37f59ea4f6 Socket: added FileEntryDtoContext 2023-09-08 11:39:14 +03:00
MaksimChegulov
07aa2dda5a Merge branch 'develop' into feature/accounts-optimization 2023-09-08 10:47:32 +03:00
pavelbannov
778a49ac8a Merge branch 'develop' into feature/json-7 2023-09-07 17:55:51 +03:00
Pavel Bannov
d7400c31bd
Merge pull request #1576 from ONLYOFFICE/feature/backup-s3-tar 
Feature/backup s3 tar
 2023-09-07 07:23:01 -07:00
pavelbannov
2c53224c3f Merge branch 'develop' into feature/backup-s3-tar 
# Conflicts:
#	common/ASC.Data.Storage/S3/S3Storage.cs
 2023-09-07 17:10:28 +03:00
Sergey Linnik
0610c91965
Merge pull request #1688 from ONLYOFFICE/feature/reference-data-improovement 
reference data improovement
 2023-09-07 17:00:57 +03:00
Pavel Bannov
b5c2572dbc
Merge pull request #1712 from ONLYOFFICE/feature/adding_translations-back 
Feature/adding translations back
 2023-09-07 03:24:27 -07:00
Alexey Bannov
3f43b0b9c2
Merge pull request #1703 from ONLYOFFICE/feature/tag-new-optimization 
feature/tag new optimization
 2023-09-07 10:23:57 +03:00
MaksimChegulov
c6d1b4e631 fixed filtering by room in trash 2023-09-06 13:50:48 +03:00
Maria-Sukhova
2792df1a84 added pt-PT 2023-09-05 17:23:59 +03:00
MaksimChegulov
0369705ae3 Merge branch 'develop' into feature/accounts-optimization 
# Conflicts:
#	products/ASC.People/Server/Api/UserController.cs
 2023-09-05 11:22:06 +03:00
pavelbannov
d864448da5 Merge branch 'hotfix/v1.1.2' into develop 
# Conflicts:
#	products/ASC.Files/Core/Core/VirtualRooms/InvitationLinkService.cs
#	products/ASC.Files/Core/Utils/FileSharing.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
 2023-09-04 23:01:50 +03:00
MaksimChegulov
a40294f624 fixed tag new creating after copy 2023-09-04 20:11:09 +03:00
MaksimChegulov
7f9286219c optimized access check 2023-09-04 20:10:13 +03:00
MaksimChegulov
e5b3d44bc3 fixed calculating hash 2023-09-04 19:55:54 +03:00
Maria-Sukhova
715c21f090 added ko, sk 2023-09-04 18:21:40 +03:00
MaksimChegulov
63e0f44964 Merge branch 'develop' into feature/tag-new-optimization 2023-09-04 14:32:04 +03:00
MaksimChegulov
e09e6cc3a6 refactoring 2023-09-04 13:39:15 +03:00
MaksimChegulov
1f3d63be3d optimized socket notification on tag changes 2023-09-04 13:20:32 +03:00
MaksimChegulov
4439425625 fix Bug 63942 2023-09-01 16:00:56 +03:00
pavelbannov
3e6a417d19 Merge branch 'hotfix/v1.1.2' into develop 
# Conflicts:
#	common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
#	migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
#	packages/client/src/components/panels/SelectFileDialog/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js
#	packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
#	packages/client/src/store/ProfileActionsStore.js
#	packages/common/api/files/index.js
#	packages/common/store/AuthStore.js
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	yarn.lock
 2023-09-01 15:33:39 +03:00
Anton Sukhorukov
ee7d9be570 reference data improovement 2023-09-01 13:24:10 +03:00
pavelbannov
4969b04fab Merge branch 'develop' into feature/json-7 2023-08-31 18:24:12 +03:00
MaksimChegulov
4632b44767 optimized updating new tags 2023-08-30 14:13:18 +03:00
pavelbannov
86e635cd51 Merge branch 'develop' into feature/backup-s3-tar 
# Conflicts:
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
 2023-08-29 14:31:16 +03:00
pavelbannov
24d4e38494 fix 2023-08-29 14:14:06 +03:00
MaksimChegulov
4eb5aaa2c0 added batch tag insertion 2023-08-29 13:08:25 +03:00
pavelbannov
a299837f8f fix backup for dropbox 2023-08-29 12:48:24 +03:00
MaksimChegulov
a93aaa2a1c increased performance in access checking 2023-08-29 12:15:47 +03:00
MaksimChegulov
c2b1b5cf90 split UserOrGroup subject type 2023-08-29 12:11:46 +03:00
MaksimChegulov
e51afe903e optimized check for full access to room 2023-08-29 11:48:32 +03:00
pavelbannov
bc6b0d9e0d Merge branch 'hotfix/v1.1.2' into develop 
# Conflicts:
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/Billing/ITariffService.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Notify/EmailSenderSink.cs
#	common/ASC.Core.Common/Notify/JabberSenderSink.cs
#	common/ASC.Core.Common/Notify/PushSenderSink.cs
#	common/ASC.Core.Common/Notify/Telegram/TelegramSenderSink.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/Tools/ASC.Migration.Creator/ASC.Migration.Creator.csproj
#	migrations/mysql/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
#	migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs
#	migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
#	migrations/mysql/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
#	migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
#	migrations/postgre/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/Files.jsx
#	packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/backup-list/index.js
#	packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/client/src/pages/PortalSettings/categories/security/index.js
#	packages/client/src/pages/Profile/Section/Header/index.js
#	packages/common/store/SettingsStore.js
#	packages/components/drop-down/index.js
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/SecurityController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	products/ASC.Files/Server/Api/TagsController.cs
#	products/ASC.People/Server/Api/ThirdpartyController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/FeedController.cs
#	web/ASC.Web.Api/Api/PaymentsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Core/DnsSettings.cs
#	web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs
#	web/ASC.Web.Api/GlobalUsings.cs
#	web/ASC.Web.Core/CookiesManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
#	yarn.lock
 2023-08-28 18:53:10 +03:00
Anton Sukhorukov
15d345d428 fix oneDrive checkAccess 2023-08-28 17:37:05 +03:00
pavelbannov
6fce6a8a3c fix bug 63843 2023-08-28 16:43:16 +03:00
Eloncase
0b1bae9780 Files: move initialization from constructor to getter 2023-08-22 13:39:26 +03:00
pavelbannov
e435a1ba3a Files: fixed removing folders 2023-08-21 18:57:26 +03:00
pavelbannov
628efca83f Files: fixed restore from trash 2023-08-21 18:41:13 +03:00
pavelbannov
41b0062c23 Merge branch 'develop' into feature/region-audit 2023-08-21 12:51:52 +03:00
MaksimChegulov
4e80646399 Merge branch 'develop' into feature/accounts-optimization 
# Conflicts:
#	products/ASC.People/Server/Api/UserController.cs
 2023-08-21 12:09:14 +03:00
MaksimChegulov
c64f6b0f66 Bug 63646 2023-08-21 10:53:33 +03:00
Alexey Bannov
720a2817f8 fix bug 63687: added rate limiting for api 2023-08-18 18:47:23 +03:00
pavelbannov
621bcb6bca Api: hidden methods 2023-08-18 14:33:48 +03:00
pavelbannov
82f2ef39ad Files: hidden share methods 2023-08-18 14:26:05 +03:00