Commit Graph

11819 Commits

Author SHA1 Message Date
f4e2f76fff Web: Editor: fixed goBack 2023-07-25 18:27:43 +03:00
a1a2d5aa4a Web: Files: fixed files open 2023-07-25 17:59:25 +03:00
7917549533 Web: Files: fixed double share url 2023-07-25 17:44:56 +03:00
2e42741e4b Web: Files: fixed public-room error after added new file 2023-07-25 17:27:11 +03:00
7d727e0842 Merge branch 'develop' into feature/public-room
# Conflicts:
#	packages/client/src/components/dialogs/index.js
#	packages/client/src/components/panels/UploadPanel/index.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/client/src/store/FilesStore.js
2023-07-25 13:01:21 +03:00
3958e9f156 Web: Client: Fixed FilesFilter 2023-07-24 17:50:40 +03:00
5a893a8a0a Web: Files: Public-room fixed access for users with authorization, refactoring 2023-07-24 14:41:26 +03:00
997ce4945c Merge branch 'fix-conflicts-merge' of github.com:ONLYOFFICE/DocSpace into fix-conflicts-merge 2023-07-21 16:52:02 +03:00
545bacfaf0 Merge branch 'develop' into fix-conflicts-merge
# Conflicts:
#	packages/client/src/pages/VersionHistory/Section/Body/index.js
#	products/ASC.Files/Core/Configuration/FilesSettings.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Security/FileShareOptions.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
2023-07-21 16:51:49 +03:00
Viktor Fomin
461112a7f3 Client: Profile: fix warning 2023-07-21 12:38:57 +03:00
4df4b2939c Web: Section: Fixed wrong location of close icon. 2023-07-21 12:31:30 +03:00
e88d23cf50 Web: InvitePanel: Deleted useless ref code. 2023-07-21 12:15:01 +03:00
5bb6c6a8f4 Web: Fixed display of files loading during operations on it. 2023-07-21 11:14:18 +03:00
Viktor Fomin
69d002d44a Client: fix accountLoginType empty screen 2023-07-20 14:30:50 +03:00
Viktor Fomin
7dbef13bc1 Client: return changeOwner route 2023-07-20 13:38:42 +03:00
695be3d804 Web:Client: fix redirect from /accounts 2023-07-20 13:33:52 +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
6edf7ad916 web: Fix file's version history open 2023-07-20 12:52:05 +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
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
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