42e8b739f3
fix Bug 61992
2023-04-11 17:52:39 +03:00
Vashchuk Nikita
2b94d5dfa5
changed notification image format to png,
...
images are sent in notifications as attacment,
fix images size,
fix attachment serialization,
fix work with cache
2023-03-23 00:25:15 +05:00
29abce027d
Merge branch 'develop' into feature/notifications
...
# Conflicts:
# packages/client/src/pages/Accounts.jsx
# packages/client/src/store/FilesActionsStore.js
# packages/common/constants/index.js
# products/ASC.People/Server/Api/UserController.cs
2023-03-06 15:37:45 +03:00
Vashchuk Nikita
082c5f968c
fix mentions letter format, added roomsNotificationSettings check
2023-03-01 19:15:35 +05:00
Vashchuk Nikita
9e0a5e91cb
fix letter format, mute attribute, tags counter
2023-02-21 14:19:26 +05:00
Vashchuk Nikita
efa04ae8ba
added functionality for notifying users about events via AuditEvent,
...
fix notifyEngine,
edited letter format,
added method for getting roomsId and roomsTitle from a file/folder inside the room,
added method for getting sharing info from foldersIds and userGuid
2023-02-21 13:35:01 +05:00
c1e3d9fb95
Web.Core: refactor
2023-02-20 11:16:03 +03:00
Viktor Fomin
1fb1228dbd
Merge branch 'develop' into feature/fix-whitelable
2022-11-24 02:33:13 +05:00
c3e32fac2f
WhiteLabel: fix async
2022-11-23 17:23:46 +03:00
4b180094e8
Whitelabel: rename
2022-11-22 18:03:59 +03:00
ebd4cd6293
CustomColorThemesSettings: removed black and grey theme
2022-11-18 19:27:23 +03:00
35e22fe8c8
Merge branch 'develop' into feature/fix-whitelable
...
# Conflicts:
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
# web/ASC.Web.Core/LogoUploader.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-11-18 16:48:19 +03:00
b379931d1f
fix whitelabel
2022-11-15 14:11:44 +03:00
201b0b2bd0
fix
2022-11-11 16:58:52 +03:00
29ebaa020c
Api: CustomColorThemesSettingsItem. Added name, added new theme
2022-11-11 16:05:21 +03:00
38e93b30bc
CustomColorThemesSettings: added new settings
2022-11-11 12:22:41 +03:00
d7949c9b65
CustomColorThemesSettings: added new settings
2022-11-11 12:18:57 +03:00
d733880485
dark whitelabel
2022-11-09 16:30:56 +03:00
14a64f4ad0
Merge branch 'develop' into feature/remove-waste
...
# Conflicts:
# common/services/ASC.ApiSystem/GlobalUsings.cs
# common/services/ASC.ApiSystem/Program.cs
# common/services/ASC.ApiSystem/Startup.cs
# products/ASC.CRM/Server/Classes/Global.cs
# products/ASC.Files/Server/ProductEntryPoint.cs
# web/ASC.Web.Core/QuotaSync.cs
2022-11-07 11:25:54 +03:00
ac05302b21
Merge branch 'develop' into feature/rights-rework
2022-10-21 13:14:00 +03:00
f01376cc56
Merge branch 'develop' into feature/remove-waste
2022-10-20 11:24:20 +03:00
afc9d1ce17
Merge branch 'develop' into feature/remove-waste
2022-10-19 14:18:52 +03:00
1a5c273825
refactor
2022-10-18 14:43:31 +03:00
7af080486c
Merge branch 'develop' into feature/rights-rework
2022-10-18 14:32:17 +03:00
a2d144514d
refactor
2022-10-18 14:22:02 +03:00
a5165d09cf
Merge branch 'develop' into feature/company-info-settings
2022-10-18 10:31:15 +03:00
ed22136269
Merge branch 'develop' into feature/remove-waste
2022-10-17 14:31:57 +03:00
16af78a2a2
fix is default
2022-10-14 23:59:18 +03:00
e2ccab3c97
ApiSystem: fix
2022-10-14 17:52:00 +03:00
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
75aebdd9b2
optimization
2022-10-09 19:35:59 +03:00
fe2dd3c394
Merge branch 'develop' into feature/login-settings
...
# Conflicts:
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
2022-10-07 17:47:24 +03:00
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
5740b578db
Payment: rename
2022-09-19 18:20:21 +03:00
5848bf5cd3
Api: payments check
2022-09-19 17:56:45 +03:00
d05071110d
Merge branch 'develop' into feature/room-security
2022-09-19 11:54:55 +03:00
6b728a0fca
refactoring
2022-09-15 18:58:05 +03:00
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
0f2378b0fc
Web.Core: added confirm type
2022-09-14 14:50:03 +03:00
40702707bd
refactoring
2022-09-14 14:21:25 +03:00
7ccfe9547f
Web.Api: refactor, changed links logic
2022-09-13 16:01:04 +03:00
d2f4ea2fcb
Web.Core: added confirmation link generation
2022-09-09 17:30:44 +03:00
25ae19d601
Merge branch 'develop' into feature/remove-waste
2022-09-09 11:52:13 +03:00
Vashchuk Nikita
57726421f2
Merge branch 'develop' into feature/login-settings
...
# Conflicts:
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
2022-09-06 12:17:10 +04:00
7bc95a826a
Web.Core: changed user profile url
2022-09-05 13:13:37 +03:00
7b623c4e30
Merge branch 'develop' into feature/stripe
...
# Conflicts:
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/common/store/AuthStore.js
# packages/components/slider/index.js
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
2022-09-05 10:19:52 +03:00
Vashchuk Nikita
6fbc6c8b78
fix
2022-09-02 15:13:10 +04:00
bf52f50ad3
remove waste in asc.web.core
2022-08-31 17:46:11 +03:00
ea2d97b6f5
Api: removed unused columns
2022-08-30 19:01:12 +03:00
641695ec51
Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController
2022-08-25 23:09:12 +03:00
