Commit Graph

27677 Commits

Author SHA1 Message Date
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
Akmal Isomadinov
d6a0019763 Web:Components:Themes: Update size height button theme 2022-11-03 14:56:54 +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
TimofeyBoyko
5b2735a907 Web:Client: delete console log 2022-11-03 12:55:36 +05:00
TimofeyBoyko
f2fac464ff Web:Client: delete console log 2022-11-03 12:55:11 +05:00
TimofeyBoyko
71ee8f0cd8 Web:Common:FilterInput: fix long tag 2022-11-03 12:52:45 +05:00
71ea20f9d4 Web: Re-rendering of the page when renaming for mobile devices has been removed. 2022-11-03 10:51:04 +03:00
TimofeyBoyko
c1e8383e84 Web:Client:Home: fix filter for me and other room owners 2022-11-03 12:42:58 +05:00
TimofeyBoyko
3700193ddb Web:Client:Accounts: fix managaer role at filter 2022-11-03 12:39:25 +05:00
TimofeyBoyko
24aa891d20 Web:Client:Accounts: fix filter selection after reload page 2022-11-03 12:33:14 +05:00
TimofeyBoyko
1292cc6712 Web:Client:Accounts: fix filter role translation keys 2022-11-03 12:25:15 +05:00
a7b761aaaa Merge branch 'develop' into feature/whitelabel 2022-11-02 19:17:48 +03:00
dec50174e6
Merge pull request #965 from ONLYOFFICE/feature/rooms-access-rights
Feature/rooms access rights
2022-11-02 19:14:39 +03:00
TimofeyBoyko
31b75fdeae Merge branch 'develop' into feature/rooms-access-rights 2022-11-02 21:06:18 +05:00
e5393096a7
Merge pull request #972 from ONLYOFFICE/bugfix/rooms
Bugfix/rooms
2022-11-02 19:05:17 +03:00
1916c4d994 Merge branch 'develop' into feature/whitelabel 2022-11-02 18:09:37 +03:00
9b368efb53 Update build.backend.docker.sh 2022-11-02 18:09:08 +03:00
Viktor Fomin
28846ea77d Common: Article: fix position with smart banner 2022-11-02 17:13:23 +05:00
38950f567d Fix stop/restart and build docker backend
+ Changed DOCUMENT_SERVER_IMAGE_NAME to current release
2022-11-02 14:29:41 +03:00
803d1e1185 Update start.backend.docker.sh 2022-11-02 14:23:11 +03:00
6e64a7525f Create ds.dev.yml
+ Added opportunity to map license file inside Data/
2022-11-02 14:23:00 +03:00
ea132e83fc Create clear.backend.docker.sh 2022-11-02 14:22:05 +03:00
186f7e14b1
Merge pull request #919 from ONLYOFFICE/feature/recalculate-user-quota
Feature/recalculate user quota
2022-11-02 14:08:06 +03:00
07937d9beb fix 2022-11-02 14:07:27 +03:00
7d1717ac3e fix 2022-11-02 14:06:05 +03:00
Viktor Fomin
aaad6d8a7f Merge branch 'develop' into feature/whitelabel 2022-11-02 15:58:41 +05:00
798746c239
Merge pull request #975 from ONLYOFFICE/bugfix/treenode-select
Bugfix/treenode select
2022-11-02 13:56:04 +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
e16da4849e
Merge pull request #911 from ONLYOFFICE/feature/letters
Feature/letters
2022-11-02 13:27:22 +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
Viktor Fomin
8d9632602c Components: Tag: fix style 2022-11-02 15:15:08 +05:00
Viktor Fomin
0ef4129c99 Client: PortalSettings: fix select common node 2022-11-02 14:58:02 +05:00
Viktor Fomin
7d306d6bde Client: PortalSettings: fix tree node select 2022-11-02 14:53:43 +05:00
d6656b0aa9
Merge pull request #968 from ONLYOFFICE/feature/delete-cultureMiddleware-from-api-system
Feature/delete culture middleware from api system
2022-11-02 11:55:17 +03:00
61171d009c
Merge pull request #973 from ONLYOFFICE/bugfix/info-option-archive-header-menu
Bugfix/info option archive header menu
2022-11-02 11:35:08 +03:00
TimofeyBoyko
8d84bf7faf Web:Client: fix showInfoPanel 2022-11-02 13:31:57 +05:00
TimofeyBoyko
dbf83d0a8d Merge branch 'develop' into feature/rooms-access-rights 2022-11-02 13:28:24 +05:00
TimofeyBoyko
0d5f37f316 Merge branch 'develop' into bugfix/info-option-archive-header-menu 2022-11-02 13:25:17 +05:00
TimofeyBoyko
475467a507 Web:Client: fix archive group menu 2022-11-02 13:21:26 +05:00
Viktor Fomin
6ebfa4d559 Merge branch 'develop' into feature/whitelabel 2022-11-02 13:20:18 +05:00
65acd5657e
Merge pull request #970 from ONLYOFFICE/bugfix/banner
Bugfix/banner
2022-11-02 11:19:44 +03:00
TimofeyBoyko
2c6239f7b9 Web:Client: add show-info option to archived rooms at header group menu for mobile devices 2022-11-02 13:18:53 +05:00
Viktor Fomin
de0aecddbd Merge branch 'develop' into bugfix/banner 2022-11-02 13:16:52 +05:00
Viktor Fomin
7cb855c9d7 Client: SmartBanner: fix style 2022-11-02 13:15:54 +05:00
097ce33ea6 ASC.Socket.IO: added yarn.lock 2022-11-02 11:14:01 +03:00