|
9937ecccee
|
fix
|
2023-01-19 18:32:37 +03:00 |
|
|
8ad635ba25
|
merge from release/rc-v1.2.0. fixed problem and update dll
|
2023-01-19 15:47:09 +03:00 |
|
|
bff2128b5f
|
Resources renamed
|
2023-01-18 18:53:09 +03:00 |
|
Vashchuk Nikita
|
bfe7524dde
|
fix create, update methods
|
2023-01-18 11:24:44 +05:00 |
|
|
2f29eb444f
|
fix 60163
|
2023-01-13 14:28:44 +03:00 |
|
|
92f786c572
|
fix 60163
|
2023-01-12 12:09:01 +03:00 |
|
|
a8bcc8e558
|
Payment: fix
|
2023-01-10 20:56:38 +03:00 |
|
|
5c828d4124
|
upload .ico for favicon
|
2022-12-27 13:49:07 +03:00 |
|
|
00b32e638a
|
fix Bug 60214
|
2022-12-23 21:00:05 +03:00 |
|
|
a1daacb4d0
|
fix
|
2022-12-21 12:38:47 +03:00 |
|
|
426a11d080
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-12 19:33:41 +03:00 |
|
|
965867e3f5
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-12-12 17:22:03 +03:00 |
|
|
143a4d01ec
|
removed unused variables
|
2022-12-09 17:47:46 +03:00 |
|
|
6e45bc5aa8
|
removed unused variables
|
2022-12-09 16:34:00 +03:00 |
|
|
7e52c309c1
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-09 15:13:43 +03:00 |
|
|
e8e75dfa8a
|
Merge pull request #1110 from ONLYOFFICE/fix/tests
Fix/tests
|
2022-12-09 13:16:21 +03:00 |
|
|
966364da9e
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-09 12:14:48 +03:00 |
|
|
ccfc8d0e47
|
Auth: added confirm data
|
2022-12-08 17:53:39 +03:00 |
|
|
0e6d5405d2
|
fix web.api tests
|
2022-12-07 13:38:35 +03:00 |
|
|
2d1a5f1fb2
|
Web.Api: changed permissions validation logic
|
2022-12-06 01:58:03 +03:00 |
|
|
b693486b46
|
merge from develop
|
2022-12-01 14:52:46 +03:00 |
|
|
a378763860
|
Web.Api: changed validation
|
2022-11-29 12:00:17 +03:00 |
|
Viktor Fomin
|
366d92abb2
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-28 12:09:11 +03:00 |
|
|
e39f42288a
|
AllowNotPayment for colortheme method
|
2022-11-25 20:41:47 +03:00 |
|
|
db7dffe624
|
refactoring
|
2022-11-24 17:22:34 +03:00 |
|
|
8d421a3b24
|
refactoring
|
2022-11-24 17:21:34 +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 |
|
Vlada Gazizova
|
5884fa7acd
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-21 11:15:55 +03:00 |
|
|
b227a68b5f
|
CustomColorThemesSetting: fix
|
2022-11-18 19:39:10 +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 |
|
|
f8901ce291
|
Wizard: fix complete
|
2022-11-18 11:59:30 +03:00 |
|
|
999e892b7e
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-17 17:30:46 +03:00 |
|
|
d39666df9d
|
fix
|
2022-11-16 18:27:07 +03:00 |
|
|
2f7fdaf00a
|
Merge pull request #971 from ONLYOFFICE/feature/refactoring-saveUserInfo
Feature/remove .wait and .result
|
2022-11-16 18:24:29 +03:00 |
|
|
6747d4d763
|
Api: allownotpayment, owner check for suspend and delete methods
|
2022-11-16 17:40:00 +03:00 |
|
|
ea946ccfea
|
union whitelabel/logos with whitelabel/sizes
|
2022-11-15 17:01:47 +03:00 |
|
|
b379931d1f
|
fix whitelabel
|
2022-11-15 14:11:44 +03:00 |
|
|
fed6d30095
|
Api: added TenantDto
|
2022-11-14 17:17:57 +03:00 |
|
|
d4808dcba0
|
Revert "whitelabel: ext only png"
This reverts commit 7392e62395 .
|
2022-11-14 17:09:05 +03:00 |
|
|
b686ca1632
|
Merge pull request #1030 from ONLYOFFICE/develop
merge from develop
|
2022-11-14 12:55:07 +04:00 |
|
|
301e64a34a
|
GetWhiteLabelLogos dark and light when isDark null
|
2022-11-13 02:00:35 +03:00 |
|
|
2e21cc5735
|
remove IsDefault
|
2022-11-13 00:54:37 +03:00 |
|
|
75ca934448
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-11 22:22:40 +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 |
|
|
2314dce176
|
fix apisystem
|
2022-11-10 18:07:11 +03:00 |
|
|
a4fd81b404
|
migrate from .net6 to .net7
|
2022-11-10 13:10:18 +03:00 |
|
|
b999f6dbc5
|
fix PasswordChange
|
2022-11-09 20:26:59 +03:00 |
|
|
7392e62395
|
whitelabel: ext only png
|
2022-11-09 16:48:42 +03:00 |
|
|
d733880485
|
dark whitelabel
|
2022-11-09 16:30:56 +03:00 |
|
|
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 |
|
|
2ae75ec762
|
fix ide001
|
2022-11-07 12:49:29 +03:00 |
|
|
ca85ef1d49
|
fix usings
|
2022-11-07 12:34:50 +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 |
|
|
141bed97b4
|
Merge branch 'develop' into feature/refactoring-saveUserInfo
|
2022-11-02 11:16:29 +03:00 |
|
|
342343a1e1
|
Merge pull request #925 from ONLYOFFICE/feature/rights-rework
Feature/rights rework
|
2022-10-27 19:59:03 +04:00 |
|
|
ef7215fbe3
|
fix
|
2022-10-27 14:06:37 +03:00 |
|
|
f4ecdf9fa3
|
Merge branch 'develop' into feature/refactoring-saveUserInfo
|
2022-10-27 13:55:30 +03:00 |
|
|
deb0c5beb7
|
remove .wait and .result
|
2022-10-27 13:49:42 +03:00 |
|
|
29ee2b04b2
|
Api: whitelabel/logos AllowAnonymous
|
2022-10-27 11:53:44 +03:00 |
|
|
92ef73eb86
|
async UpdateUserInfo and SaveUserInfo
|
2022-10-25 18:27:56 +03:00 |
|
|
277ca1c2cb
|
fixed field number generator
|
2022-10-25 16:08:23 +03:00 |
|
|
5e8d06846e
|
Api: fix activeconnections.
|
2022-10-25 14:19:53 +03:00 |
|
|
42b4787899
|
refactoring saveUserInfo
|
2022-10-24 18:30:17 +03:00 |
|
|
e39248457e
|
fix /api/2.0/portal/continue.json
|
2022-10-24 14:34:37 +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 |
|
|
22a24de659
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-19 15:31:14 +03:00 |
|
|
7569a741d8
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-19 15:21:18 +03:00 |
|
|
afc9d1ce17
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-19 14:18:52 +03:00 |
|
|
16bb42d0af
|
fix ASC.Data.Storage.Encryption
|
2022-10-19 13:12:33 +03:00 |
|
|
b9968f8b5a
|
Whitelabel: fix payment
|
2022-10-19 11:38:12 +03:00 |
|
|
9df8c0d69f
|
Quota: fix
|
2022-10-18 21:37:16 +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 |
|
|
3550e0fef6
|
add greetingsettings/isdefault
|
2022-10-18 12:06:08 +03:00 |
|
|
a5165d09cf
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-18 10:31:15 +03:00 |
|
|
19ad5b0ef2
|
fix api system
|
2022-10-17 12:15:44 +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 |
|
|
481d1a1de0
|
add greetingsettings/isDefault
|
2022-10-14 13:00:22 +03:00 |
|
|
421ae1885d
|
unblock logotext and sizes
|
2022-10-14 11:48:37 +03:00 |
|
|
cd25dcc8b3
|
Merge branch 'develop' into feature/apisystem
|
2022-10-14 11:27:19 +03:00 |
|
|
5fbd701ffe
|
Merge branch 'feature/company-info-settings' of github.com:ONLYOFFICE/AppServer into feature/company-info-settings
|
2022-10-13 15:56:05 +03:00 |
|
|
28d918464f
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-13 15:48:31 +03:00 |
|
|
23c41d86ef
|
add IsDefault in response
api/2.0/settings/rebranding/company and api/2.0/settings/rebranding/additional
|
2022-10-12 15:51:07 +03:00 |
|
|
90575890d0
|
fixed PortalRemove
|
2022-10-12 12:50:57 +03:00 |
|
|
42c12ca706
|
Added AllowSuspendedFilter
|
2022-10-12 12:29:08 +03:00 |
|
|
d6755db551
|
Rebraing: added isDefault
|
2022-10-12 11:38:18 +03:00 |
|
|
dc2cfbc614
|
Merge branch 'develop' into feature/apisystem
# Conflicts:
# web/ASC.Web.Core/PublicResources/Resource.resx
|
2022-10-11 13:53:31 +03:00 |
|
|
cf2547e030
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/common/constants/index.js
|
2022-10-11 10:20:42 +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 |
|
mushka
|
415c620574
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-10 17:27:16 +03:00 |
|
|
397af4e55d
|
refactoring
|
2022-10-10 14:32:48 +03:00 |
|
|
a563bbe3cf
|
Merge branch 'develop' into feature/two-factor-authentication
# Conflicts:
# web/ASC.Web.Api/Api/AuthenticationController.cs
|
2022-10-09 21:32:14 +03:00 |
|
|
75aebdd9b2
|
optimization
|
2022-10-09 19:35:59 +03:00 |
|