ead94f371e
Merge branch 'develop' into feature/notifications
2023-02-27 10:29:50 +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
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
53b3a580fd
Web: added count of collaborators, refactor
2023-02-20 11:11:16 +03:00
b0b3e6df71
Web: refactor
2023-02-17 17:53:41 +03:00
13fbd58dc8
Web: added collaborator, refactor
2023-02-17 17:51:55 +03:00
ca2906ebee
Merge branch 'develop' into feature/notifications
...
# Conflicts:
# packages/client/src/store/FilesStore.js
2023-02-08 12:44:15 +03:00
f52f32a6af
Merge branch 'develop' into feature/asc.apicache
...
# Conflicts:
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/Tools/ASC.Migration.Creator/Program.cs
# common/Tools/ASC.Migration.Runner/Program.cs
# common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs
# common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs
2023-02-07 17:07:20 +03:00
Vashchuk Nikita
a8a633c2e8
small fix
2023-02-06 17:42:11 +05:00
Vashchuk Nikita
b928966550
added settings for configure RoomsNotification, added mute field for files and folders
2023-02-06 16:15:51 +05:00
Vashchuk Nikita
ab7f24a68b
Merge branch 'release/rc-v1.2.0' into feature/notifications
2023-02-02 18:48:48 +05:00
Vashchuk Nikita
f6ca8e3c78
added methods for configuring notifications
2023-01-26 19:12:12 +05:00
8a8143950d
replace CreateScope() => CreateScopeAsync()
2023-01-24 20:33:27 +03:00
667b10e874
Merge pull request #1149 from ONLYOFFICE/feature/dotnet7
...
Feature/dotnet7
2023-01-19 22:00:57 +03:00
4ddf7d521c
update external dependency
2023-01-19 19:05:07 +03:00
9937ecccee
fix
2023-01-19 18:32:37 +03:00
fccdbed5a8
fix 60659
2023-01-19 18:20:50 +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
0090561fb6
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
2023-01-10 14:47:27 +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
846aa53583
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
2022-12-26 12:19:54 +03:00
1ae54147ce
Files: added warning message, added demotion on invitation
2022-12-26 12:19:37 +03:00
0d4000df46
fixed warning
2022-12-25 20:11:06 +03:00
00b32e638a
fix Bug 60214
2022-12-23 21:00:05 +03:00
d35120e501
fix SendToApiAsync
2022-12-21 11:16:11 +03:00
0cf90e45be
Poeple: simplified time cutting
2022-12-14 10:10:46 +03:00
905fae583f
Web.Core: fix pattern
2022-12-13 17:55:12 +03:00
6c75f8be0f
Web.Core: added rounding to seconds
2022-12-13 16:06:06 +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
a03b50bd7c
Merge branch 'develop' into release/rc-v1.2.0
2022-12-07 16:20:29 +03:00
61f7765a4f
Merge branch 'develop' into feature/api-origin
2022-12-06 21:47:56 +03:00
7d0cc5a396
Merge pull request #1099 from ONLYOFFICE/bugfix/room-admin-permissions
...
Bugfix/room admin permissions
2022-12-06 15:22:47 +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
b693486b46
merge from develop
2022-12-01 14:52:46 +03:00
eee9c05d9a
ASC.Web.Core: Notify: fix email templates
2022-11-30 18:40:01 +03:00
1a565b559e
ASC.Web.Core: Notify: added missing email templates
2022-11-30 17:28:38 +03:00
00c782fcb3
Web.Core: removed unnecessary check, changed validation
2022-11-29 12:11:13 +03:00
Viktor Fomin
366d92abb2
Merge branch 'develop' into feature/fix-whitelable
2022-11-28 12:09:11 +03:00
3ef3ffb617
fixed telegram resources
2022-11-25 20:37:48 +03:00
903227ba7d
Whitelabel: fix
2022-11-24 11:08:53 +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
236583718c
Whitelabel: fix
2022-11-23 13:59:48 +03:00
60ee6a9d49
WhiteLabel: fixed support img types
2022-11-23 12:59:47 +03:00
4b180094e8
Whitelabel: rename
2022-11-22 18:03:59 +03:00
ffe0fbde97
Cors: fix
2022-11-21 12:44:28 +03:00
9bcaf62b9a
temp
2022-11-18 21:54:05 +03:00
ebd4cd6293
CustomColorThemesSettings: removed black and grey theme
2022-11-18 19:27:23 +03:00
1a3b5d9a2f
fix cookie name
2022-11-18 18:40:56 +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
76b644d9e8
logging
2022-11-18 15:12:36 +03:00
34d7f58dbb
Core: cookie for origin
2022-11-18 13:20:50 +03:00
999e892b7e
Merge branch 'develop' into feature/custom-theme
2022-11-17 17:30:46 +03:00
0fb1e343a5
fix
2022-11-16 11:34:21 +03:00
ea946ccfea
union whitelabel/logos with whitelabel/sizes
2022-11-15 17:01:47 +03:00
3785ce3b9d
fix whitelabel
2022-11-15 16:46:08 +03:00
f77f042741
add check CanBeDark
2022-11-15 16:22:12 +03:00
636aedd1d6
refactoring
2022-11-15 15:24:08 +03:00
a5da3b7f20
fix whitelabel
2022-11-15 15:14:27 +03:00
b379931d1f
fix whitelabel
2022-11-15 14:11:44 +03:00
d4808dcba0
Revert "whitelabel: ext only png"
...
This reverts commit 7392e62395
2022-11-14 17:09:05 +03:00
9dfcd25033
backend: update dependency dll
2022-11-14 14:11:10 +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
a4fd81b404
migrate from .net6 to .net7
2022-11-10 13:10:18 +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
58e745b59f
Update TenantWhiteLabelSettings.cs
2022-11-07 12:45:30 +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
e5393096a7
Merge pull request #972 from ONLYOFFICE/bugfix/rooms
...
Bugfix/rooms
2022-11-02 19:05:17 +03:00
34bda20eb0
Merge branch 'develop' into feature/recalculate-user-quota
...
# Conflicts:
# products/ASC.People/Server/Api/UserController.cs
2022-11-02 13:40:53 +03:00
cec0473d1b
Merge branch 'develop' into feature/letters
...
# Conflicts:
# web/ASC.Web.Core/Notify/Actions.cs
# web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
2022-11-02 13:25:49 +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
fa24e98df6
fix IpSecurityFilter
2022-10-28 10:58:13 +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
342343a1e1
Merge pull request #925 from ONLYOFFICE/feature/rights-rework
...
Feature/rights rework
2022-10-27 19:59:03 +04:00
dbaf6bb264
remove unused resources
2022-10-27 16:15:08 +03:00
95a1743258
Revert "remove unused resources"
...
This reverts commit 2d99753676
2022-10-27 16:01:32 +03:00
0f3490b977
DoJob return task
2022-10-27 14:14:41 +03:00
deb0c5beb7
remove .wait and .result
2022-10-27 13:49:42 +03:00
edf9fb3111
Web.Core: added DocSpace email notify
2022-10-26 17:40:18 +03:00
