Commit Graph

36627 Commits

Author SHA1 Message Date
9b14175dd5 License: fix 2023-07-20 13:32:01 +03:00
bc3e3faf13 Web: Files: fixed AccessSelector 2023-07-20 12:00:48 +03:00
04eb7e21b9 Merge branch 'fix-conflicts-merge' of github.com:ONLYOFFICE/AppServer into fix-conflicts-merge 2023-07-20 11:55:46 +03:00
5db98f425e Web: Files: fixed selection-area 2023-07-20 11:55:39 +03:00
d390a953ae Merge branch 'fix-conflicts-merge' of https://github.com/ONLYOFFICE/DocSpace into fix-conflicts-merge 2023-07-20 12:52:16 +04:00
6edf7ad916 web: Fix file's version history open 2023-07-20 12:52:05 +04:00
aae09df47d fixed migration 2023-07-20 11:49:11 +03:00
a1db7d19eb Update yarn.lock 2023-07-20 11:40:31 +04:00
4f38afca73 Merge branch 'develop' into feature/public-room 2023-07-20 10:07:19 +03:00
22f8448bd6 Web:Client:PortalSettings: fix after merge master 2023-07-19 18:38:48 +03:00
f74e19d5e1 Web:Components:Slider: fix props 2023-07-19 18:38:23 +03:00
3607946ac7 fixed migrations 2023-07-19 18:29:17 +03:00
ee7461718d fix Bug 63381 - letter "Discover business subscription" for saas only 2023-07-19 17:37:52 +03:00
ad34f42bf8 Web: Files: fix after merge 2023-07-19 16:58:45 +03:00
05fb6bb1ab Web: Files: fixed isRoot 2023-07-19 16:44:40 +03:00
a2ddfb54f1 Web: Files: added LINKS_LIMIT_COUNT, fixed bugs 2023-07-19 16:43:21 +03:00
902cac11ae Web: Client: SDK: Restored params for sdk 2023-07-19 15:50:10 +03:00
8c5819e953 Web: Files: fixed header external-links 2023-07-19 15:43:22 +03:00
a3b04adeef Web: Files: fixed onShowInfoPanel 2023-07-19 15:34:27 +03:00
c805d5dd19 Web:Common:PrivateRoute: fix 2023-07-19 15:32:27 +03:00
4ed82765f9 Web: Client: SDK: Fixed selector inject 2023-07-19 15:29:10 +03:00
17be338ccf Web: Files: fixed empty links context-menu 2023-07-19 15:24:05 +03:00
a5aa17dd5c Web:Routes: fix 2023-07-19 15:04:40 +03:00
57aa77c56f fix build 2023-07-19 14:34:00 +03:00
Vladimir Khvan
af744d3dff Merge branch 'feature/public-room' of github.com:ONLYOFFICE/DocSpace into feature/public-room 2023-07-19 16:10:47 +05:00
Vladimir Khvan
1d342e6cfc incorrect time reset was fixed 2023-07-19 16:10:17 +05:00
183fc90d99 Web: Files: fixed LimitTimeBlock 2023-07-19 14:03:12 +03:00
Vladimir Khvan
732f94560b Merge branch 'feature/public-room' of github.com:ONLYOFFICE/DocSpace into feature/public-room 2023-07-19 15:51:58 +05:00
Vladimir Khvan
aa3fe0dc1d wrong prop was substituted with initialTime 2023-07-19 15:50:43 +05:00
9a9d789bdf Web: Files: Public-room: fixed isExpiredDate, fixed minDate 2023-07-19 13:30:59 +03:00
6b5669eca0 Web: Components: DateTimePicker: added initialTime prop support 2023-07-19 13:30:29 +03:00
584d643f51 Web:Client: update routes after merge 2023-07-19 13:23:17 +03:00
896c3796c9 Web: Files: fixed EnterPassword translation 2023-07-19 13:12:58 +03:00
b2501a5dfa Web:Client:Home: restore after merge master 2023-07-19 13:11:18 +03:00
e15b111e36 Web: Files: fixed LinkDeletedSuccessfully translation 2023-07-19 13:11:07 +03:00
a0690b4025 Web: Files: hidden copy external links for info-panel 2023-07-19 13:06:12 +03:00
72011b556c Web:Client:Routes: restore portal settings after merge master 2023-07-19 12:57:49 +03:00
023d81d8c2 Web: Files: fixed public-room description after merge 2023-07-19 12:53:41 +03:00
b06ad0dd8d Web:Client: remove withRouter and history after merge master 2023-07-19 12:11:32 +03:00
c25acc4b0d Web:Client: fix after merge 2023-07-19 12:04:10 +03:00
a5c12c692a Web: Files: fixed copy-external-link 2023-07-19 11:28:18 +03:00
Nasrullo Nurullaev
100bc3e871
fix Bug 63380 - Update node.js version (#1561) 2023-07-19 13:17:18 +05:00
4242e3b638 Web:Common:Article: fix after merge master 2023-07-19 11:03:03 +03:00
Nasrullo Nurullaev
f9bd1b47c1
fix Bug 63384 - Fix issue with portal notifications (#1560) 2023-07-19 13:02:10 +05:00
e291807d8b Web: Files: added onLoad support to context-menu 2023-07-19 10:44:03 +03:00
Nasrullo Nurullaev
d594179b5e
fix Bug 63366 - Remove duplicated x86 prerequisites (#1558) 2023-07-19 12:42:03 +05:00
8e77c379f6 Web:Components:Selector: fix types after merge master 2023-07-19 10:28:05 +03:00
92a42b6c9c Web:Client:Confirm: restore EmpInvite route after merge master 2023-07-19 10:16:52 +03:00
43c7b85a14 logger: used only nlog logger provider. 2023-07-18 20:08:55 +03:00
918f8a0618 logger: used only nlog logger provider. 2023-07-18 20:05:07 +03:00