Commit Graph

31316 Commits

Author SHA1 Message Date
1c3d3bf132 Merge branch 'develop' into feature/fix-webhooks-second
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
2023-02-21 14:33:26 +03:00
0cdd727b1e Web: Files: Fixed Bug 61274 - Files. ‘Something went wrong’ when going to My Documents after opening the Info panel in the Recycle Bin. 2023-02-21 14:28:48 +03:00
Sergey Kirichenko
44f6912f50
Add tag prefix for docker images (#1217) 2023-02-21 16:26:59 +05:00
3269d48e15 added new table 2023-02-21 14:22:34 +03:00
449d0c64c5 Merge branch 'develop' into feature/browserlist 2023-02-21 13:55:50 +03:00
4e18e0dcbc Web: Client: Scripts: Added SamsungBrowser and AscDesktopEditor detecting at browserDetector 2023-02-21 13:43:24 +03:00
9cb5022d0b
Merge pull request #1226 from ONLYOFFICE/bugfix/trash-room-title
Fixed Bug 61270 - Web: Client: added a dash if there is no title in t…
2023-02-21 14:38:13 +04:00
DmitrySychugov
fbbc2af27a Fixed Bug 61280 - Web: Client: added a check for the trash section to the condition 2023-02-21 15:22:00 +05:00
b362851047 Fix Bug 61275 - Files.Trash.Info. Extra separator line in the file menu in the Info panel. 2023-02-21 13:46:38 +04:00
125a0169cf
Merge pull request #1228 from ONLYOFFICE/bugfix/Bug61132
Bugfix/bug61132
2023-02-21 12:41:29 +04:00
Viktor Fomin
9aba24e4e8 Client: PeopleSelector: fix translate, use dark image 2023-02-21 11:14:45 +03:00
Viktor Fomin
214cb0a89c Components: Themes: fix color 2023-02-21 11:13:45 +03:00
Viktor Fomin
84533d7ca0 Web: delete useless images 2023-02-21 10:52:24 +03:00
DmitrySychugov
34bca3442a Merge branch 'develop' into bugfix/trash-room-title 2023-02-21 12:39:53 +05:00
DmitrySychugov
0f34d4e9b8 Web: Client: replaced the component with a dash 2023-02-21 12:36:47 +05:00
Viktor Fomin
b172b5a1f4 Client: InfoPanel: fix style 2023-02-21 08:57:07 +03:00
Viktor Fomin
013427b909 Client: InfoPanel: fix margin 2023-02-21 08:47:34 +03:00
Viktor Fomin
81cd9cb6e5 Client: fix translate 2023-02-21 08:46:17 +03:00
Viktor Fomin
dbc8ad4373 Merge branch 'develop' into bugfix/Bug61132 2023-02-21 02:31:38 +03:00
Viktor Fomin
823eb4724e Client: InfoPanel: redesign empty state 2023-02-21 02:31:32 +03:00
0a5d19a8f4 nlog: refactoring. added tenant info when httpcontext exist 2023-02-20 23:13:18 +03:00
5e9f12a797 backend: refactoring 2023-02-20 23:10:49 +03:00
42f1db849e Revert "Fix Bug 61274 - Files. ‘Something went wrong’ when going to My Documents after opening the Info panel in the Recycle Bin."
This reverts commit cee9f0a5f1.
2023-02-20 23:44:06 +04:00
cee9f0a5f1 Fix Bug 61274 - Files. ‘Something went wrong’ when going to My Documents after opening the Info panel in the Recycle Bin. 2023-02-20 23:33:33 +04:00
Viktor Fomin
00fd531d79 Merge branch 'develop' into bugfix/Bug61132 2023-02-20 21:43:29 +03:00
Viktor Fomin
739ed41465 Client: InfoPanel: use dark images 2023-02-20 21:43:23 +03:00
DmitrySychugov
b8ad1fd4e9 Web: Client: fixed styled empty room title padding 2023-02-20 23:29:10 +05:00
7bfca4d7fb
Merge pull request #1225 from ONLYOFFICE/bugfix/fixed-dbclick-zoom
Bugfix/fixed dbclick zoom
2023-02-20 22:24:08 +04:00
DmitrySychugov
d05d7271dc Merge branch 'develop' into bugfix/fixed-dbclick-zoom 2023-02-20 23:14:35 +05:00
f716fc6a78 Merge branch 'develop' into bugfix/trash-room-title 2023-02-20 22:09:39 +04:00
75401a064d
Merge pull request #1218 from ONLYOFFICE/bugfix/Bug-61100
Bugfix/bug 61100
2023-02-20 21:54:59 +04:00
08aa59812c Update media-error.js 2023-02-20 21:53:50 +04:00
ae7b8f240f Update media-error.js 2023-02-20 21:53:04 +04:00
9b73c337a3 Merge branch 'develop' into bugfix/Bug-61100 2023-02-20 21:40:23 +04:00
DmitrySychugov
9f7b76ea5e Fixed Bug 61270 - Web: Client: added a dash if there is no title in the room column 2023-02-20 20:15:14 +05:00
c7465e420a Merge branch 'develop' into feature/browserlist 2023-02-20 17:41:23 +03:00
ff3e302ff7 Web: Client: Scripts: Added browserDetector.js 2023-02-20 17:40:32 +03:00
9d88b1caba Web: Client: Images: Added browsers icons 2023-02-20 17:39:47 +03:00
fa3bab5e4b Web: Files: fixed folders upload 2023-02-20 17:32:48 +03:00
Viktor Fomin
9124709643 Merge branch 'develop' into bugfix/Bug61132 2023-02-20 17:19:51 +03:00
Viktor Fomin
ab2f8aae6b Client: InfoPanel: use dark images 2023-02-20 17:19:44 +03:00
7a5b5e3e12 Web: Files: added multi-file upload 2023-02-20 17:08:37 +03:00
DmitrySychugov
f829931b5a Merge branch 'develop' into bugfix/fixed-dbclick-zoom 2023-02-20 16:27:57 +05:00
2691d2cac0
Merge pull request #1224 from ONLYOFFICE/bugfix/fixed-duplicate-files
Web: Files: fixed duplicate files when uploading and resizing at the …
2023-02-20 13:12:37 +03:00
DmitrySychugov
75fbfa1fcf Merge branch 'develop' into bugfix/fixed-dbclick-zoom 2023-02-20 14:56:31 +05:00
b41c926279 Web: Files: fixed duplicate files when uploading and resizing at the same time 2023-02-20 12:49:30 +03:00
bcc0866830 Files: ban on creating rooms fro collaborator 2023-02-20 12:12:29 +03:00
6fb4f73110 Api.Core: added IsCollaborator in user dto 2023-02-20 11:51:21 +03:00
4f165d61eb
Merge pull request #1222 from ONLYOFFICE/feature/refactoring-viewer
Feature/refactoring viewer
2023-02-20 11:35:13 +03:00
6f34d873ee People: refactor 2023-02-20 11:16:44 +03:00