Commit Graph

241 Commits

Author SHA1 Message Date
NikitaVashchuk
22fc47ecb1 do not send mail with confirmation email when registering by email link 2023-04-19 13:08:09 +05:00
759fe5624a fix 2023-04-17 14:24:59 +03:00
5ef5fbded9 UserPhotoManager: fixed problem with cache 2023-04-13 18:53:23 +03:00
2b17d2eed0 people: fixed generate thumbnails 2023-04-13 14:44:22 +03:00
4f12380445 people: update last_modified in core_user table after set user photo 2023-04-12 22:27:16 +03:00
c85caa5651 people: fixed response for POST {userid}/photo/thumbnails method 2023-04-12 19:18:40 +03:00
e35e8f1369 Merge branch 'release/v1.0.0' into feature/quota-via-websocket 2023-04-05 11:20:45 +04:00
NikitaVashchuk
1827dead7e fix problems with notify about count paid users 2023-04-04 17:23:46 +05:00
Vashchuk Nikita
91606f1962 small fix 2023-04-03 16:38:23 +05:00
Vashchuk Nikita
0db7c335bf socket notification when archiving a room,
changed file_size id to total_size when added/deleted files,
fix notification when adding paid users,
fix notification when block/unblock users,
fix problem with change-quota-feature-value notification when updating quota
2023-04-03 16:31:14 +05:00
Vashchuk Nikita
604b67fa58 functionality for notification ASC.Socket.IO about quota changes 2023-03-30 19:13:13 +05:00
a79c5420b6 fixed user deleting 2023-03-29 09:43:09 +03:00
f95c56198e thumbnail: bump ImageSharp from v2.0.0 to 3.0.0, optimization, refactoring 2023-03-03 22:49:36 +03:00
308802eeb6 optional size in api method /people/${profileId}/photo/thumbnails.json 2023-03-01 14:46:26 +03:00
Timofey Boyko
8e59451b4a Merge branch 'develop' into feature/colloborator 2023-02-27 15:22:21 +03:00
03a4dc89dc Settings: refactoring 2023-02-24 17:19:10 +03:00
068be391cd Web.Core: fixed invite 2023-02-21 19:00:12 +03:00
94062792d5 People: added collaborator, refactor 2023-02-21 16:35:57 +03:00
c1e3d9fb95 Web.Core: refactor 2023-02-20 11:16:03 +03:00
13fbd58dc8 Web: added collaborator, refactor 2023-02-17 17:51:55 +03:00
44804e34db fixed cache room logo/user photo 2022-12-29 11:31:22 +03:00
9f198ef31d fixed user avatar/room logo cache 2022-12-27 18:20:05 +03:00
5c828d4124 upload .ico for favicon 2022-12-27 13:49:07 +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
6e45bc5aa8 removed unused variables 2022-12-09 16:34:00 +03:00
42b376dd8d Web.Core: changed permissions validation logic 2022-12-06 01:58:15 +03:00
5fd4bded2f Web.Core: added unique name for invited user 2022-12-05 14:07:46 +03:00
00c782fcb3 Web.Core: removed unnecessary check, changed validation 2022-11-29 12:11:13 +03:00
c3e32fac2f WhiteLabel: fix async 2022-11-23 17:23:46 +03:00
60ee6a9d49 WhiteLabel: fixed support img types 2022-11-23 12:59:47 +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
0fb1e343a5 fix 2022-11-16 11:34:21 +03:00
b379931d1f fix whitelabel 2022-11-15 14:11:44 +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
141bed97b4 Merge branch 'develop' into feature/refactoring-saveUserInfo 2022-11-02 11:16:29 +03:00
434a34c021 Merge branch 'develop' into bugfix/rooms 2022-11-02 10:48:26 +03:00
d450457703 removed unnecessary call when inviting a user that reduces performance 2022-11-01 14:06:31 +03:00
7a01578f0c
Merge pull request #939 from ONLYOFFICE/feature/remove-new-TenantQuotaController
remove  "new TenantQuotaController"
2022-10-31 13:03:28 +03:00
0baa36c1c0 GetDataStore tenant string to int 2022-10-28 15:23:51 +03:00
86daa32280 People: fix 2022-10-28 10:34:03 +03:00
78bd9f0e13 Merge branch 'develop' into feature/invite-accounts 2022-10-27 19:18:07 +03:00
deb0c5beb7 remove .wait and .result 2022-10-27 13:49:42 +03:00
6529ae25e7 Web.Core: added manager count check 2022-10-26 17:39:24 +03:00
a7f75bcffe Web.Core: added inviting users 2022-10-25 23:18:36 +03:00
92ef73eb86 async UpdateUserInfo and SaveUserInfo 2022-10-25 18:27:56 +03:00
a2d144514d refactor 2022-10-18 14:22:02 +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
5848bf5cd3 Api: payments check 2022-09-19 17:56:45 +03:00