|
|
d9b02f3f49
|
removed slnf
|
2022-11-07 19:23:31 +03:00 |
|
|
|
c3c19aba39
|
fix migration
|
2022-11-07 13:43:49 +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 |
|
|
|
d7abe3b9da
|
Merge pull request #963 from ONLYOFFICE/feature/whitelabel
Feature/whitelabel
|
2022-11-03 20:10:06 +03:00 |
|
|
|
e4180ef643
|
Merge pull request #966 from ONLYOFFICE/feature/info-panel-update
feature/info-panel-update
|
2022-11-03 20:02:08 +03:00 |
|
mushka
|
516c972dd8
|
fixed membersView rerender methods
|
2022-11-03 19:53:31 +03:00 |
|
mushka
|
1929d6630d
|
403 bug push
|
2022-11-03 19:35:55 +03:00 |
|
|
|
4182594d86
|
healthcheck: changed default timeout
|
2022-11-03 19:23:11 +03:00 |
|
mushka
|
1a0a1e7988
|
fixed user context options and noItem view
|
2022-11-03 18:18:09 +03:00 |
|
mushka
|
b1413f5d02
|
cleaned up console.logs
|
2022-11-03 17:37:54 +03:00 |
|
mushka
|
1045d0550a
|
fixed accounts imports
|
2022-11-03 17:37:42 +03:00 |
|
mushka
|
4371a859be
|
fixed too many rerenders issue
|
2022-11-03 17:30:22 +03:00 |
|
mushka
|
83ecc297b8
|
Merge branch 'develop' into feature/info-panel-update
|
2022-11-03 17:09:41 +03:00 |
|
mushka
|
7ea5907259
|
fixed resend invitations api call and implemented it in members view
|
2022-11-03 17:06:13 +03:00 |
|
mushka
|
75c8f03149
|
added SuccessSentMultipleInvitatios translation keys to en/ and ru/
|
2022-11-03 17:05:26 +03:00 |
|
|
|
e81e0d07b4
|
Merge pull request #984 from ONLYOFFICE/bugfix/toast-styles
Bugfix/toast styles
|
2022-11-03 16:58:45 +03:00 |
|
Viktor Fomin
|
48c01a82fb
|
Web: revert
|
2022-11-03 18:41:59 +05:00 |
|
|
|
4abaa35bbe
|
Web: Added a transparent background to the button according to the layouts.
|
2022-11-03 16:38:55 +03:00 |
|
|
|
6b68af16bf
|
Merge pull request #983 from ONLYOFFICE/bugfix/room-access-constraints
Files: fix rooms constraints
|
2022-11-03 17:36:45 +04:00 |
|
|
|
a4476b6aa5
|
Web: Components: Removed the double display of toasts for mobile.
|
2022-11-03 16:33:52 +03:00 |
|
mushka
|
063bcfc6a7
|
Added user deletion option
|
2022-11-03 16:28:47 +03:00 |
|
|
|
6d61e2013e
|
Files: fix rooms constraints
|
2022-11-03 16:07:41 +03:00 |
|
|
|
05f4c4c436
|
Merge pull request #982 from ONLYOFFICE/bugfix/fixed-arcticle-height
Bugfix/fixed arcticle height
|
2022-11-03 16:05:06 +03:00 |
|
Viktor Fomin
|
58d1ad31b5
|
Client: PortalSettings: Whitelabel: fix logo style
|
2022-11-03 17:54:40 +05:00 |
|
|
|
c24976d7a9
|
Web: Files: added RoomPinned RoomUnpinned translations
|
2022-11-03 15:47:35 +03:00 |
|
|
|
6dd55c2643
|
Web: Common: fixed article height
|
2022-11-03 15:46:56 +03:00 |
|
Viktor Fomin
|
b28001140f
|
Client: About: fix size
|
2022-11-03 17:40:25 +05:00 |
|
Viktor Fomin
|
67d6ce5378
|
Common: Article: fix size
|
2022-11-03 17:40:16 +05:00 |
|
Viktor Fomin
|
5ad59fd1ee
|
Merge branch 'develop' into feature/whitelabel
|
2022-11-03 17:16:36 +05:00 |
|
Viktor Fomin
|
2c9b4ffd5a
|
Client: About: fix height
|
2022-11-03 17:13:01 +05:00 |
|
|
|
537d891bf6
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
|
2022-11-03 15:09:39 +03:00 |
|
|
|
3a9fc421c8
|
ASC.WePlugins: added support CloudWatch
|
2022-11-03 15:09:24 +03:00 |
|
|
|
8dae4184ce
|
Merge pull request #981 from ONLYOFFICE/bugfix/uploading
Bugfix/uploading
|
2022-11-03 15:07:22 +03:00 |
|
|
|
9b38f39057
|
Web: Fixed styles.
|
2022-11-03 14:52:19 +03:00 |
|
mushka
|
bb16de4ed9
|
Merge branch 'develop' into feature/info-panel-update and solved merge conflict
|
2022-11-03 14:52:11 +03:00 |
|
|
|
c1e3e7ec50
|
Web: Removed an empty file from the array for conversion.
|
2022-11-03 14:52:02 +03:00 |
|
Viktor Fomin
|
84f137593b
|
Merge branch 'develop' into feature/whitelabel
|
2022-11-03 16:45:55 +05:00 |
|
Viktor Fomin
|
e512015e70
|
Common: Article: fix img size
|
2022-11-03 16:44:54 +05:00 |
|
|
|
2f2b1dcf12
|
ASC.WebDav: added support CloudWatch
|
2022-11-03 14:40:05 +03:00 |
|
Viktor Fomin
|
28d55699c0
|
Client: PortalSettings: fix font color
|
2022-11-03 16:39:08 +05:00 |
|
|
|
68e3f26d90
|
ASC.UrlShortener: added support CloudWatch
|
2022-11-03 14:37:17 +03:00 |
|
|
|
41ad5643ec
|
ASC.SsoAuth: added support CloudWatch
|
2022-11-03 14:33:36 +03:00 |
|
|
|
59133b122e
|
ASC.Socket.IO: added support CloudWatch
|
2022-11-03 14:26:07 +03:00 |
|
|
|
1a362181a1
|
Merge pull request #980 from ONLYOFFICE/feature/add-logs
add logs
|
2022-11-03 13:30:30 +03:00 |
|
|
|
30fa1816f6
|
add logs
|
2022-11-03 13:27:41 +03:00 |
|
Viktor Fomin
|
b8e2e49bd0
|
Merge branch 'develop' into feature/whitelabel
|
2022-11-03 15:05:41 +05:00 |
|
|
|
92fb78ddca
|
Merge pull request #977 from ONLYOFFICE/bugfix/fix-accounts-filter
Bugfix/fix filter
|
2022-11-03 11:18:41 +03:00 |
|
|
|
393460ba35
|
Merge pull request #976 from ONLYOFFICE/bugfix/loaders
Bugfix/loaders
|
2022-11-03 11:10:54 +03:00 |
|
