Commit Graph

27627 Commits

Author SHA1 Message Date
e5863dddcc fix 2022-11-15 17:07:51 +03:00
e17ef78c00 fix 2022-11-15 14:22:53 +03:00
56ad3d2287 fix 2022-11-15 13:53:53 +03:00
61b401d906 fix 2022-11-15 13:28:25 +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
59ff978ea1
Merge pull request #1000 from ONLYOFFICE/bugfix/displaying-info-panel-information
Bugfix/displaying info panel information
2022-11-09 11:39:02 +03:00
90c38d0d66 Web: Added checks. 2022-11-09 11:28:23 +03:00
e13f140e19 Web: Removed the ability to invite users to the archive room. 2022-11-09 11:19:40 +03:00
4e57850572 Web: Added cursor style for Archived room. 2022-11-09 10:53:21 +03:00
c0cd2eb59a Web: Deleted useless code. 2022-11-09 10:32:22 +03:00
67d7febc9b Web: Returned of the members menu. 2022-11-09 10:31:07 +03:00
3a8e1e4267 Web: Changed translation. 2022-11-09 10:26:11 +03:00
8830d7c8ea
Merge pull request #994 from ONLYOFFICE/bugfix/border-style
Bugfix/border style
2022-11-08 21:07:43 +03:00
20bd6e36e1 Merge branch 'develop' into bugfix/border-style 2022-11-08 20:51:56 +03:00
3dc887bb34
Merge pull request #987 from ONLYOFFICE/bugfix/badge
bugfix: badge style
2022-11-08 20:45:50 +03:00
9031572a63 Merge branch 'develop' into bugfix/badge 2022-11-08 20:40:27 +03:00
a8b77242b6
Merge pull request #998 from ONLYOFFICE/feature/added-new-hotkeys
Web: Files: added create, delete, move to archive room hotkeys
2022-11-08 18:51:47 +03:00
cc4b69c51c Web: Files: fixed hotkeys list 2022-11-08 18:49:27 +03:00
c3ee84d464 Web: Files: Hotkeys: fixed room creation, fixed translation 2022-11-08 18:29:06 +03:00
594b03dd5d Web: Files: Hotkeys: fixed user rights 2022-11-08 18:21:34 +03:00
5a2532f06f Merge branch 'feature/added-new-hotkeys' of github.com:ONLYOFFICE/AppServer into feature/added-new-hotkeys 2022-11-08 18:18:02 +03:00
fff8c7eae9 Web: Files: fixed hotkeys 2022-11-08 18:17:47 +03:00
a2a23f56a9 Merge branch 'develop' into feature/added-new-hotkeys 2022-11-08 17:49:29 +03:00
5d2c14c5b3 Added api-system to docker dev 2022-11-08 17:44:09 +03:00
3175554fed Web: Files: added create, delete, move to archive room hotkeys 2022-11-08 17:34:32 +03:00
bfa927fcf8 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop 2022-11-08 15:38:04 +03:00
991620468d change format logs for CloudWatch 2022-11-08 15:37:52 +03:00
649444d5b8
Merge pull request #997 from ONLYOFFICE/bugfix/fixed-room-visitor-rights
Bugfix/fixed room visitor rights
2022-11-08 14:44:19 +03:00
f1f4128e66
Merge pull request #996 from ONLYOFFICE/bugfix/fix-row-description
Bugfix/fix row room description
2022-11-08 14:24:39 +03:00
85dae6bf4c Fix warning of import TrashIcon (File not found) 2022-11-08 14:14:33 +03:00
1ea534f6e6 Web: Files: fixed rights for users 2022-11-08 14:12:18 +03:00
cc64fc9887 Web: Files: fixed selectionParentRoom error 2022-11-08 14:11:17 +03:00
209e283283 Merge branch 'develop' of https://github.com/ONLYOFFICE/DocSpace into develop 2022-11-08 13:58:05 +03:00
a9fc7a14ed Removed old code 2022-11-08 13:57:51 +03:00
TimofeyBoyko
c3897224f6 Web:Components:RowContent: fix 2022-11-08 13:43:56 +03:00
TimofeyBoyko
22308acc29 Web:Components:RowContent: fix truncate for tablet side info 2022-11-08 13:39:24 +03:00
24829b5d9e Audit: fix 2022-11-08 13:38:33 +03:00
TimofeyBoyko
3cb9538e76 Web:Client:Home: delete useless code for row view 2022-11-08 13:24:05 +03:00
TimofeyBoyko
3c481aa724 Merge branch 'develop' into bugfix/fix-row-description 2022-11-08 13:21:12 +03:00
TimofeyBoyko
f676e8feda Web:Client:Section: fix description for rooms at row view 2022-11-08 13:20:09 +03:00
a8f2015877
Merge pull request #995 from ONLYOFFICE/bugfix/access-rights
Bugfix/access rights
2022-11-08 12:58:07 +03:00
Eugene Kozyrev
a49f3074be
Add enterprise build for Windows (#988) 2022-11-08 10:26:46 +02:00
a0766d931e Web: Fixes styles. 2022-11-08 10:47:06 +03:00
126ab097e9 Web: Removed the ability to invite users according to access rights. 2022-11-08 10:35:51 +03:00
dfb1509961 Update more-login.tsx
Added logging
2022-11-07 22:43:22 +03:00
0518c19426
Merge pull request #819 from ONLYOFFICE/feature/remove-waste
Feature/remove waste
2022-11-07 19:32:24 +03:00
d9b02f3f49 removed slnf 2022-11-07 19:23:31 +03:00
Elyor Djalilov
74ef2c3ad2 Merge branch 'develop' into bugfix/border-style 2022-11-07 20:55:14 +05:00
ede75ced63 Merge branch 'develop' of https://github.com/ONLYOFFICE/DocSpace into develop 2022-11-07 18:53:12 +03:00
0f88170316 Fix yarn deploy on MacOS 2022-11-07 18:52:57 +03:00