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 |
|
|
|
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 |
|
|
|
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 |
|
