Commit Graph

21818 Commits

Author SHA1 Message Date
56ba38e1fa Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-15 18:07:16 +03:00
3a6eb0c8de Web: Files: removed table-row z-index 2022-06-15 17:25:53 +03:00
Vashchuk Nikita
c1097acbb8 fix static, braces, log 2022-06-15 15:39:37 +03:00
f2bcfb401a
Merge pull request #692 from ONLYOFFICE/bugfix/fix-private-room
bugfix/fix-private-room
2022-06-15 15:08:17 +03:00
7afa355015 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-15 15:06:28 +03:00
6836f2ea64 Web: Client: fixed Layout height 2022-06-15 15:03:21 +03:00
33a6eeb98c Web: Components: fixed table-container_header z-index 2022-06-15 14:53:39 +03:00
59f50effc5
Merge branch 'develop' into bugfix/fix-private-room 2022-06-15 14:48:49 +03:00
2321806548 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-15 14:40:41 +03:00
f36d8a93c8 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-15 14:36:33 +03:00
32bb1ef3f5 Web: Files: fixed table header when hovering over row element, added z-index to table header 2022-06-15 14:36:25 +03:00
mushka
78cdd52e94 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-15 14:25:45 +03:00
mushka
f2d7a02288 added decoding for unicode characters in InfoPanel 2022-06-15 14:25:33 +03:00
f3f3ed96ae moved from ddf515b8 2022-06-15 12:46:21 +03:00
20b85665e1
Merge pull request #691 from ONLYOFFICE/feature/refactoring-file-converter
fileconverter: moved timer to separete worker service
2022-06-15 13:32:59 +04:00
e3fd726cd6 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-15 12:21:17 +03:00
Sergey Kirichenko
753cc8adab Fix node image build 2022-06-15 12:20:18 +03:00
f40c3c0486 Web: Common: fixed getOforms 2022-06-15 11:25:46 +03:00
Sergey Kirichenko
0cd8c7dd3d Fix run node 2022-06-15 11:23:52 +03:00
c37af416da Files: fix 404 2022-06-15 10:41:59 +03:00
Sergey Kirichenko
060251afb4 Add kafka run config 2022-06-15 10:23:52 +03:00
77ecf6f988 Files: fix 2022-06-14 18:12:37 +03:00
7194fec848 Files: fix 2022-06-14 13:30:12 +03:00
00d1b59efb Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-14 12:52:03 +03:00
d4622ee902 Web: Files: added error handling for create/edit operations 2022-06-14 12:51:54 +03:00
a875a35962 fix 2022-06-14 11:45:57 +03:00
9d8f479b00 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-14 11:34:19 +03:00
02635e0e2e fix bug 57535 2022-06-14 11:33:12 +03:00
Sergey Kirichenko
06a91659bc Fix build 2022-06-14 11:27:15 +03:00
35bebe49f9 moved from ddf515b8 2022-06-14 11:11:41 +03:00
fd58a436c2 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-14 10:58:14 +03:00
c2b7f99f16 refactoring get thumbnailFile 2022-06-14 10:45:52 +03:00
49233efe66 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-14 10:35:42 +03:00
5d89337132 Web:Studio:Added branding page. Added the CompanyInfoSettings and AdditionalResources settings to the Branding page. 2022-06-14 10:33:50 +03:00
e9b86623d6 Web:Studio:Moved WhiteLabel to settingsBranding folder. 2022-06-14 10:31:27 +03:00
3c077c023d Web:Replaced light_small_general and dark_general logotypes with doc_space for WhiteLabel. 2022-06-14 10:31:11 +03:00
722f3568bb refactoring get ThumbnailFile 2022-06-14 10:28:57 +03:00
a49814beff Web:Replaced light_small_general and dark_general logotypes with doc_space for WhiteLabel. 2022-06-14 10:28:32 +03:00
Sergey Kirichenko
fc7fb4edcc Modify config files copying 2022-06-14 10:06:44 +03:00
a98eb791e8 Files: refactor 2022-06-14 01:33:37 +03:00
de36de1870 Files: fix 2022-06-14 00:04:45 +03:00
269cdd9825 Files: refactor 2022-06-13 21:50:49 +03:00
f68585bf9d Files: fix 2022-06-13 21:04:51 +03:00
3e2483a016 Files: added rooms folder cache clearing 2022-06-13 17:41:13 +03:00
5be6e7cbee Files: fix 2022-06-13 17:40:34 +03:00
2336dc9762 Files: refactor 2022-06-13 17:40:25 +03:00
239d1803c7 FIles: refactor 2022-06-13 17:32:24 +03:00
e618f7f450 Files: fix filter, added clearing rooms cache 2022-06-10 22:32:21 +03:00
d370c797bb Files: added virtual rooms default share 2022-06-10 22:31:24 +03:00
2811e694c6 Files: fix System.NullReferenceException 2022-06-10 22:30:49 +03:00