IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,467 Commits 38 Branches 22 Tags 359 MiB
304df579ce
Commit Graph

410 Commits

Author SHA1 Message Date
NikolayRechkin
f1668a3b43 Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar 2021-07-27 12:43:01 +03:00
pavelbannov
2d75554b0d DbContext: optimization 2021-07-15 13:07:47 +03:00
NikolayRechkin
5060e81b5f Calendar: core: api 2021-06-30 09:37:17 +03:00
Ilya Oleshko
6118e95028 Merge branch 'develop' into feature/personal 2021-06-17 14:25:09 +03:00
Alexey Bannov
e314f6ff1c
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate 
Feature/crm migrate
 2021-06-16 17:02:46 +03:00
AlexeySafronov
65378cc089 Merge branch 'develop' into feature/personal 
# Conflicts:
#	products/ASC.CRM/Client/public/index.html
#	products/ASC.Calendar/Client/public/index.html
#	products/ASC.Files/Client/public/index.html
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Mail/Client/public/index.html
#	products/ASC.People/Client/public/index.html
#	products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.Projects/Client/public/index.html
 2021-06-15 11:49:39 +03:00
pavelbannov
637be57e84 People: resize fix 2021-06-11 14:48:49 +03:00
AlexeySafronov
bac090e180 Merge branch 'develop' into feature/personal 
# Conflicts:
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
 2021-06-11 13:11:08 +03:00
pavelbannov
e257012a9a Notify: fix 2021-06-10 11:47:58 +03:00
Alexey Bannov
b925943cb6 merge from develop 2021-06-07 17:23:25 +03:00
Viktor Fomin
54d5c658bd
Merge branch 'develop' into feature/two-factor-auth 2021-06-07 11:54:06 +03:00
pavelbannov
374f34a78e Personal: fix login 2021-06-03 12:34:28 +03:00
Viktor Fomin
c6f85ef4ce
Merge branch 'develop' into feature/two-factor-auth 2021-06-02 23:57:00 +03:00
pavelbannov
76d8ebb459 Tests moved to separate projects. 
Removed unused dependepcies
 2021-06-01 12:21:51 +03:00
Alexey Bannov
2018820472 Merge branch 'develop' into feature/crm-migrate 2021-05-31 19:37:51 +03:00
pavelbannov
570ede7bba Merge branch 'develop' into feature/11.5.2 
# Conflicts:
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
 2021-05-31 13:32:51 +03:00
pavelbannov
d0bbcb8d5a Files: moved from 08a01422 2021-05-28 11:22:35 +03:00
pavelbannov
527a650601 WebStudio: resources 2021-05-27 21:30:15 +03:00
pavelbannov
bda786f844 WebStudio: moved from 08a01422 2021-05-27 20:13:24 +03:00
pavelbannov
d8adef733c ASC.Files: moved from 08a01422 2021-05-26 16:54:46 +03:00
pavelbannov
f6fbe33814 Web.Core: moved from 08a01422 2021-05-24 20:41:31 +03:00
pavelbannov
90c67cac13 ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422 2021-05-24 13:26:13 +03:00
Viktor Fomin
4e57f2a47f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-05-20 00:47:45 +03:00
pavelbannov
b9c52c526e Fixed DistributedTask 2021-05-18 21:24:22 +03:00
Alexey Bannov
4b4b03f2a4 Merge branch 'develop' into feature/crm-migrate 2021-05-18 19:06:54 +03:00
Vashchuk Nikita
82abf11109 Merge branch 'develop' into feature/calendar 
# Conflicts:
#	ASC.Web.sln
#	config/autofac.products.json
#	config/nginx/onlyoffice.conf
#	products/ASC.Calendar/Server/ASC.Calendar.csproj
#	products/ASC.Calendar/Server/Controllers/CalendarController.cs
#	products/ASC.Calendar/Server/Program.cs
#	products/ASC.Calendar/Server/Properties/launchSettings.json
#	products/ASC.Calendar/Server/Resources/CalendarAddonResource.Designer.cs
#	products/ASC.Calendar/Server/Resources/CalendarAddonResource.resx
#	products/ASC.Calendar/Server/Startup.cs
 2021-05-18 13:24:02 +03:00
Vashchuk Nikita
94047ab0a1 Fix Calendar 2021-05-17 21:35:23 +03:00
pavelbannov
8a3db93d0d Backup: moved from 08a01422 2021-05-17 21:27:39 +03:00
pavelbannov
6867ded281 Merge branch 'develop' into feature/remove-wq 
# Conflicts:
#	common/ASC.Common/DIHelper.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Common/Threading/Progress/ProgressQueue.cs
#	common/ASC.Common/Threading/Workers/WorkerQueue.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
 2021-05-13 11:23:44 +03:00
Viktor Fomin
7a27280dc3 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-05-07 14:49:44 +03:00
AlexeySafronov
37f8bdd872 Merge branch 'master' into develop 2021-05-05 20:52:06 +03:00
Viktor Fomin
261e6d8b4c Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-05-05 15:09:59 +03:00
Alexey Bannov
c86257cf67 Merge branch 'develop' into feature/crm-migrate 2021-05-04 11:25:27 +03:00
Alexey Bannov
0dbadc6394 from Microsoft.NET.Sdk.Web to Microsoft.NET.Sdk for ClassLibrary Projects 2021-04-30 18:42:10 +03:00
pavelbannov
c8f48d1861 Resource: profile removed 2021-04-30 17:43:26 +03:00
Alexey Bannov
8816e535c1 merge from develop 2021-04-28 19:50:59 +03:00
Viktor Fomin
0128b01518 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 
# Conflicts:
#	products/ASC.People/Client/public/locales/en/Profile.json
#	products/ASC.People/Client/public/locales/ru/Profile.json
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Client/public/locales/en/Confirm.json
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Confirm.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
 2021-04-26 15:57:19 +03:00
pavelbannov
f11f18dffb Auth: check tfa 2021-04-26 14:56:38 +03:00
pavelbannov
a66a454462 Settings: added tfaapp method 2021-04-25 18:06:56 +03:00
AlexeySafronov
d2588270cf Merge branch 'master' into develop 2021-04-23 20:16:42 +03:00
AlexeySafronov
cd699e37e2 Files: Fix opening of version 2021-04-23 18:00:05 +03:00
Alexey Safronov
6c8654ba77
Merge branch 'develop' into feature/team-template 2021-04-19 16:47:52 +03:00
Alexey Bannov
5f2998af87 refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00
Alexey Bannov
3aae413e12 replace Path.Combine to CrossPlatform.PathCombine 2021-04-16 16:26:26 +03:00
pavelbannov
2f38b2ec33 Settings: fixed custom schemaName 2021-04-14 21:08:27 +03:00
pavelbannov
038fd58d7c Settings: fixed custom schemaName 2021-04-14 16:21:37 +03:00
pavelbannov
a30915f618 Settings: post and put customschemas 2021-04-13 21:11:38 +03:00
NikitaVashchuk
b56fc15f51 fix calendar 2021-04-13 11:40:31 +03:00
Alexey Bannov
c0582c1130 merge from develop 2021-04-01 16:28:36 +03:00
pavelbannov
18a2c0a53d Merge branch 'develop' into feature/dotnet5 
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
#	common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
#	common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
#	common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
#	common/ASC.Core.Common/EF/Model/DbipLocation.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
#	common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
#	common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResData.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
#	common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
#	common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTag.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
 2021-03-25 21:50:09 +03:00