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

504 Commits

Author SHA1 Message Date
pavelbannov
bff2128b5f Resources renamed 2023-01-18 18:53:09 +03:00
MaksimChegulov
6c112da511 Core: fixed user status change 2022-12-14 14:38:40 +03:00
MaksimChegulov
effed62662 People: fixed user status change 2022-12-13 22:59:52 +03:00
Alexey Safronov
426a11d080 Merge branch 'develop' into release/rc-v1.2.0 2022-12-12 19:33:41 +03:00
MaksimChegulov
33de49463a People: fix permissions checking 2022-12-08 14:56:05 +03:00
MaksimChegulov
837cee5b8f People: changed permissions validation logic 2022-12-06 01:57:55 +03:00
MaksimChegulov
094e8d41ff Merge branch 'develop' into feature/room-admin-permissions 2022-12-05 11:15:15 +03:00
Alexey Bannov
b693486b46 merge from develop 2022-12-01 14:52:46 +03:00
Viktor Fomin
8f97413d1d Merge branch 'develop' into feature/fix-whitelable 2022-11-30 12:33:31 +03:00
MaksimChegulov
bacde66b72 Merge branch 'develop' into feature/users-payments-filter 2022-11-29 22:24:50 +03:00
MaksimChegulov
c32e90f9ef People: changed validation 2022-11-29 11:59:33 +03:00
MaksimChegulov
475deff8b9 People: added option to disable validation 2022-11-29 11:52:59 +03:00
Viktor Fomin
366d92abb2 Merge branch 'develop' into feature/fix-whitelable 2022-11-28 12:09:11 +03:00
pavelbannov
8d421a3b24 refactoring 2022-11-24 17:21:34 +03:00
pavelbannov
c3e32fac2f WhiteLabel: fix async 2022-11-23 17:23:46 +03:00
pavelbannov
60ee6a9d49 WhiteLabel: fixed support img types 2022-11-23 12:59:47 +03:00
Pavel Bannov
2f7fdaf00a
Merge pull request #971 from ONLYOFFICE/feature/refactoring-saveUserInfo 
Feature/remove .wait and .result
 2022-11-16 18:24:29 +03:00
pavelbannov
782b928ef0 People: allowNotPayment 2022-11-16 18:14:47 +03:00
pavelbannov
f974bb0655 fix 2022-11-15 19:30:52 +03:00
MaksimChegulov
13eb4fec1b People: added filtering users by paid 2022-11-10 17:14:03 +03:00
Alexey Bannov
a4fd81b404 migrate from .net6 to .net7 2022-11-10 13:10:18 +03:00
pavelbannov
789ab8f956 Merge branch 'develop' into feature/refactoring-saveUserInfo 
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Service/Core/FilesModule.cs
#	products/ASC.Files/Service/Core/FoldersModule.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
 2022-11-09 12:57:16 +03:00
pavelbannov
2ae75ec762 fix ide001 2022-11-07 12:49:29 +03:00
pavelbannov
ca85ef1d49 fix usings 2022-11-07 12:34:50 +03:00
pavelbannov
34bda20eb0 Merge branch 'develop' into feature/recalculate-user-quota 
# Conflicts:
#	products/ASC.People/Server/Api/UserController.cs
 2022-11-02 13:40:53 +03:00
SuhorukovAnton
141bed97b4 Merge branch 'develop' into feature/refactoring-saveUserInfo 2022-11-02 11:16:29 +03:00
MaksimChegulov
78bd9f0e13 Merge branch 'develop' into feature/invite-accounts 2022-10-27 19:18:07 +03:00
SuhorukovAnton
ef7215fbe3 fix 2022-10-27 14:06:37 +03:00
SuhorukovAnton
deb0c5beb7 remove .wait and .result 2022-10-27 13:49:42 +03:00
MaksimChegulov
06f8917b77 People: added link logging 2022-10-26 18:20:37 +03:00
MaksimChegulov
f137df85cc People: added resend docspace invite 2022-10-26 18:16:46 +03:00
MaksimChegulov
3e1b1bbe6a People: fix links security, refactor 2022-10-26 17:40:43 +03:00
MaksimChegulov
fffde238d6 People: added employee type parameter 2022-10-26 17:39:44 +03:00
MaksimChegulov
3adb7d5e8e People: added api for inviting users 2022-10-25 23:18:07 +03:00
SuhorukovAnton
92ef73eb86 async UpdateUserInfo and SaveUserInfo 2022-10-25 18:27:56 +03:00
Nikolay Rechkin
128527a809 Merge branch 'develop' into feature/recalculate-user-quota 2022-10-25 17:33:56 +03:00
Nikolay Rechkin
4ad83e7258 Quota: quota recalculation check function 2022-10-25 17:31:25 +03:00
SuhorukovAnton
42b4787899 refactoring saveUserInfo 2022-10-24 18:30:17 +03:00
MaksimChegulov
22a24de659 Merge branch 'develop' into feature/rights-rework 2022-10-19 15:31:14 +03:00
Nikolay Rechkin
ac0e87e581 Quota: fix 2022-10-19 14:48:48 +03:00
pavelbannov
9df8c0d69f Quota: fix 2022-10-18 21:37:16 +03:00
MaksimChegulov
1a5c273825 refactor 2022-10-18 14:43:31 +03:00
MaksimChegulov
a2d144514d refactor 2022-10-18 14:22:02 +03:00
Nikolay Rechkin
7280d2d52b Merge branch 'develop' into feature/recalculate-user-quota 2022-10-17 14:20:31 +03:00
pavelbannov
44149d47b7 Users: trash, favorites, recent folders 2022-10-12 18:53:48 +03:00
Nikolay Rechkin
b1bd5a100f Quota: recalculate user quota 2022-10-12 14:23:57 +03:00
pavelbannov
4dbf1e70b7 Merge branch 'develop' into feature/stripe 
# Conflicts:
#	common/ASC.ActiveDirectory/GlobalUsings.cs
#	common/ASC.Data.Storage/StorageFactory.cs
#	common/ASC.Data.Storage/TenantQuotaController.cs
#	migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs
#	packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Core/PublicResources/Resource.resx
#	web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
 2022-10-10 19:16:03 +03:00
pavelbannov
5b96dbdb55 removed DbUsersQuotaRow 2022-10-07 16:37:57 +03:00
Nikolay Rechkin
00bd41ad0a Merge branch 'develop' into feature/user-quota 2022-09-23 17:15:49 +03:00
Nikolay Rechkin
28802b6926 Quota: fix 2022-09-23 17:14:55 +03:00
pavelbannov
fffdc56a80 fix 2022-09-23 16:22:02 +03:00
pavelbannov
7f1d946269 Merge branch 'develop' into feature/stripe 
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
#	packages/client/src/pages/PortalSettings/index.js
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
 2022-09-23 16:11:23 +03:00
pavelbannov
9c8bf9708a Payment: UsersInRoomStatistic 2022-09-20 23:22:27 +03:00
Alexey Safronov
eeb94810f1 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/DocSpace into feature/stripe 2022-09-19 18:40:08 +03:00
pavelbannov
5740b578db Payment: rename 2022-09-19 18:20:21 +03:00
Alexey Safronov
6448b63318 Merge branch 'develop' into feature/stripe 
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/constants/index.js
#	web/ASC.Web.Api/Program.cs
 2022-09-19 18:16:34 +03:00
pavelbannov
4b0fc12efc Payment: rename 2022-09-19 18:03:25 +03:00
pavelbannov
5848bf5cd3 Api: payments check 2022-09-19 17:56:45 +03:00
MaksimChegulov
d05071110d Merge branch 'develop' into feature/room-security 2022-09-19 11:54:55 +03:00
Alexey Bannov
7f7d7e5200 merge from develop 2022-09-16 00:03:52 +03:00
pavelbannov
6b728a0fca refactoring 2022-09-15 18:58:05 +03:00
Alexey Bannov
ee27ad4437 nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property 2022-09-15 17:44:04 +03:00
Tatiana Lopaeva
bec4f11dcd Merge branch 'develop' into feature/stripe 
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/components/Loaders/index.js
#	packages/common/store/AuthStore.js
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	packages/login/webpack.config.js
#	products/ASC.Files/Service/Program.cs
#	web/ASC.Web.Api/Program.cs
 2022-09-15 17:16:04 +03:00
Nikolay Rechkin
cfb0c957e9 Quota: user quota storage core_user -> webstudio_settings 2022-09-15 15:38:31 +03:00
pavelbannov
40702707bd refactoring 2022-09-14 14:21:25 +03:00
MaksimChegulov
923a45ed8c Files: refactor 2022-09-14 13:00:08 +03:00
MaksimChegulov
1726057d95 People: fix, refactor 2022-09-14 12:59:55 +03:00
MaksimChegulov
d573733800 People: added invite by link 2022-09-13 23:47:35 +03:00
Nikolay Rechkin
14dfc1f5a7 Merge branch 'feature/user-quota' of https://github.com/ONLYOFFICE/DocSpace into feature/user-quota 2022-09-13 00:41:59 +03:00
Nikolay Rechkin
068e3c051b Quota: Quota limit string -> long 2022-09-13 00:40:10 +03:00
pavelbannov
23731e8eab UserQuota: fix 2022-09-10 18:07:50 +03:00
pavelbannov
1ab51406cd Merge branch 'develop' into feature/user-quota 
# Conflicts:
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
 2022-09-09 18:47:38 +03:00
MaksimChegulov
f16da6e3ad refactor 2022-09-09 17:31:56 +03:00
Nikolay Rechkin
2a7e15b9cb Quota: fix quota setting 2022-09-09 11:54:17 +03:00
MaksimChegulov
950266a3d6 People: changed invite by link 2022-09-07 18:23:08 +03:00
Tatiana Lopaeva
09a02d01ff Api: method without payment. 2022-09-06 12:48:09 +03:00
Alexey Bannov
1a1b2c68b0 backend: refactoring start application 2022-09-06 11:29:01 +03:00
Tatiana Lopaeva
9477006b9f Api: method without payment. 2022-09-01 14:02:04 +03:00
Nikolay Rechkin
54ff8de78b Quota: moved UserQuotaSettings 2022-08-30 16:03:14 +03:00
Nikolay Rechkin
33d3520505 Quota: fix 2022-08-30 14:16:10 +03:00
Nikolay Rechkin
bf7f4f04da Merge branch 'develop' into feature/user-quota 2022-08-30 11:04:49 +03:00
Nikolay Rechkin
7e74d4efaa Quota: set default quota 2022-08-30 10:26:55 +03:00
Nikolay Rechkin
8e5fcfc3c8 Quota: errors 2022-08-29 23:35:25 +03:00
Nikolay Rechkin
933a4129fa Quota: string representation of quota 2022-08-29 20:20:58 +03:00
Nikolay Rechkin
ff8cfa3737 Quota: api 2022-08-29 15:03:36 +03:00
MaksimChegulov
4dcd9be041 fix: removed IOptionsSnapshot 2022-08-25 13:29:08 +03:00
pavelbannov
92942fbcf6 People: fix 2022-08-15 14:30:50 +03:00
pavelbannov
0973f4e8d1 Files: removed .result 2022-08-12 16:26:57 +03:00
Alexey Bannov
870c3cf3c4 warm up services 2022-08-08 19:25:22 +03:00
pavelbannov
fe5c8b0b13 fixed tests and tools 2022-07-29 20:23:19 +03:00
pavelbannov
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
Vashchuk Nikita
6507c4b999 Merge branch 'develop' into feature/migrations-fix 
# Conflicts:
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	web/ASC.Web.Core/GlobalUsings.cs
 2022-07-14 11:56:07 +03:00
pavelbannov
ee9e381b26 fixed async 2022-07-13 20:09:43 +03:00
pavelbannov
72caeb475c People: fixed change theme mathod 2022-07-12 20:45:12 +03:00
Vashchuk Nikita
e49d082fa3 Merge branch 'develop' into feature/migrations-fix 
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Core/Acl.cs
#	common/ASC.Core.Common/GlobalUsings.cs
#	common/ASC.Core.Common/Messaging/EventMessage.cs
#	common/ASC.Core.Common/Messaging/LoginEvent.cs
#	common/ASC.Core.Common/Messaging/MessageTarget.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20220708104402_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/CoreDbContextPostgreSql/20211012145321_CoreDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/TenantDbContextPostgreSql/20211012145343_TenantDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20211012145323_UserDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20220708104403_UserDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/PostgreSqlUserDbContextModelSnapshot.cs
#	common/ASC.Data.Backup.Core/Migrations/MySql/BackupsContextMySql/20220708104422_BackupsContextMySql.Designer.cs
#	common/ASC.Data.Backup.Core/Migrations/PostgreSql/BackupsContextPostgreSql/20220708104423_BackupsContextPostgreSql.Designer.cs
#	common/ASC.MessagingSystem/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.MessagingSystem/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Resource.Manager/ResourceData.cs
#	common/services/ASC.AuditTrail/GlobalUsings.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyAccount.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/20211022170841_FilesDbContextPostgreSql.cs
#	products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	web/ASC.Web.Api/GlobalUsings.cs
 2022-07-11 13:28:49 +03:00
pavelbannov
7af929fee8 Merge branch 'release/v1.2' into develop 
# Conflicts:
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	products/ASC.People/Server/Models/MemberModel.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
 2022-07-07 17:41:41 +03:00
pavelbannov
a04ae63a82 MemberModel: CultureName 2022-07-07 12:05:31 +03:00
SuhorukovAnton
1218d31a42 enum generator 2022-07-05 16:58:11 +03:00
Vashchuk Nikita
5a0acc8eaa Renaming folders for contexts and models 2022-07-01 14:23:07 +03:00
MaksimChegulov
aad8a92b4c RoomInvite replaced by LinkInvite 2022-06-21 20:33:05 +03:00