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

36 Commits

Author SHA1 Message Date
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
Nikolay Rechkin
00bd41ad0a Merge branch 'develop' into feature/user-quota 2022-09-23 17:15:49 +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
pavelbannov
5848bf5cd3 Api: payments check 2022-09-19 17:56:45 +03:00
pavelbannov
6b728a0fca refactoring 2022-09-15 18:58:05 +03:00
MaksimChegulov
923a45ed8c Files: refactor 2022-09-14 13:00:08 +03:00
MaksimChegulov
d573733800 People: added invite by link 2022-09-13 23:47:35 +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
950266a3d6 People: changed invite by link 2022-09-07 18:23:08 +03:00
Alexey Bannov
1a1b2c68b0 backend: refactoring start application 2022-09-06 11:29:01 +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
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
Vashchuk Nikita
5a0acc8eaa Renaming folders for contexts and models 2022-07-01 14:23:07 +03:00
MaksimChegulov
b693779ea1 Merge branch 'develop' into feature/docspace-pin 2022-06-08 16:38:16 +03:00
pavelbannov
e7886aff2c Log: refactoring 2022-05-26 12:01:54 +03:00
MaksimChegulov
018e77258f added room inviting 2022-05-15 23:19:03 +03:00
SuhorukovAnton
5d3013f44d add logger 2022-05-13 14:24:01 +03:00
pavelbannov
13bbce8ea4 Custom logger replaced with Microsoft.Extensions.Logging 2022-04-26 20:53:48 +03:00
pavelbannov
6ecc8e7071 code cleanup 2022-04-14 22:42:15 +03:00
MaksimChegulov
244e345ac6 Merge 'feature/backend-refactor' into feature/builder-extensions 2022-03-22 15:57:46 +03:00
MaksimChegulov
65db98f65c added new license headers 2022-03-15 21:00:53 +03:00
MaksimChegulov
5e2f575483 added builders extensions 2022-03-10 20:30:29 +03:00
MaksimChegulov
bededa43f7 Merge branch 'feature/people-refactor' of github.com:ONLYOFFICE/AppServer into feature/people-refactor 2022-03-05 16:28:52 +03:00
MaksimChegulov
51475c0c51 People: removed engines 2022-03-05 15:57:46 +03:00
pavelbannov
475269ee84 Merge branch 'feature/backend-refactor' into feature/people-refactor 
# Conflicts:
#	products/ASC.Files/Core/Model/FileEntryWrapper.cs
#	products/ASC.Files/Core/Model/FileShareWrapper.cs
#	products/ASC.Files/Core/Model/FileWrapper.cs
#	products/ASC.Files/Core/Model/FolderWrapper.cs
#	products/ASC.People/Server/GlobalUsings.cs
 2022-03-05 11:27:58 +03:00
pavelbannov
99378a027e Csproj: ImplicitUsings 2022-03-05 11:20:05 +03:00
MaksimChegulov
2719149f3d People: used imlicit usings 2022-03-01 14:58:37 +03:00
MaksimChegulov
b21891ef78 People: logic transferred to engines 2022-03-01 14:52:52 +03:00
MaksimChegulov
8474cb8d37 refactor 2022-02-28 23:25:25 +03:00
MaksimChegulov
c887362ea3 People: separated people controller 2022-02-28 22:23:39 +03:00
MaksimChegulov
1665fe7bf6 People: refactor 2022-02-28 21:54:08 +03:00
MaksimChegulov
9fe4971055 add mapping, project reorganization 2022-02-21 18:35:57 +03:00
SuhorukovAnton
ff854ae971 refactoring: add globalusings: people 2022-01-30 01:13:42 +03:00