|
|
44dbeb48cd
|
Merge branch 'develop' into feature/document-service-location
|
2023-09-21 13:38:25 +04:00 |
|
|
|
d1c3bb66bb
|
Merge branch 'develop' into bugfix/fix-static-images
|
2023-09-20 19:53:29 +04:00 |
|
gazizova-vlada
|
69961e6900
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 17:19:12 +03:00 |
|
gazizova-vlada
|
a061d42f29
|
Web:Add dataReassignmentUrl.
|
2023-09-20 17:03:31 +03:00 |
|
gazizova-vlada
|
183b32c2aa
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 16:27:26 +03:00 |
|
gazizova-vlada
|
dd3e9d3363
|
Web:Client:Fix update accounts list after delete, delete dataReassignmentUrl.
|
2023-09-20 16:20:28 +03:00 |
|
|
|
bdabb35e55
|
Merge branch 'feature/leave-room' of github.com:ONLYOFFICE/AppServer into feature/leave-room
# Conflicts:
# public/locales/en/Common.json
|
2023-09-20 15:03:02 +03:00 |
|
|
|
940338fd9d
|
Web: Files: Leave-room: bugs fixed
|
2023-09-20 15:02:34 +03:00 |
|
|
|
4e588759d9
|
Web: Fix warning: Unsatisfied version 5.21.4 from @docspace/client of shared singleton module react-tooltip (required =5.21.1)
|
2023-09-20 14:50:03 +04:00 |
|
|
|
292f92e818
|
Web:Client: fix import images from image-helpers
|
2023-09-20 13:42:43 +03:00 |
|
|
|
3a1bf92291
|
Merge branch 'develop' into feature/leave-room
|
2023-09-20 13:20:56 +04:00 |
|
mushka-n
|
b5d23aaf62
|
added request canceling
|
2023-09-19 13:27:22 +03:00 |
|
|
|
4e38a5a987
|
Web: Applied new formGallery config
|
2023-09-19 13:12:40 +04:00 |
|
Vlada Gazizova
|
3471bbf09f
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-19 09:54:45 +03:00 |
|
gazizova-vlada
|
f8d623d3ef
|
Web:Add dataReassignmentUrl.
|
2023-09-18 18:17:02 +03:00 |
|
mushka-n
|
2fd546f697
|
fixed formData naming
|
2023-09-18 17:09:14 +03:00 |
|
mushka-n
|
4a6b1b7f0d
|
tarnslations + link popup unblock
|
2023-09-18 14:28:25 +03:00 |
|
|
|
84f77d3b3d
|
Web: Files: removed someDialogIsOpen
|
2023-09-18 13:52:51 +03:00 |
|
mushka-n
|
da7aec7445
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-18 13:06:39 +03:00 |
|
mushka-n
|
2fa0561238
|
fixed submit method (no cors-anywhere)
|
2023-09-18 11:46:37 +03:00 |
|
|
|
00c3d8a367
|
Merge branch 'develop' into feature/leave-room
# Conflicts:
# public/locales/en/Common.json
|
2023-09-15 18:46:34 +03:00 |
|
mushka-n
|
c717324d37
|
applied submit method (temp cors-anywhere)
|
2023-09-15 18:42:24 +03:00 |
|
|
|
a5662b7cdd
|
Merge branch 'develop' into feature/leave-room
# Conflicts:
# packages/client/public/locales/en/Files.json
|
2023-09-15 16:54:26 +03:00 |
|
gazizova-vlada
|
cf930e37bc
|
Web:Client:Fix id to userId.
|
2023-09-15 11:31:42 +03:00 |
|
gazizova-vlada
|
e205fb5d78
|
Web:Client:Add onTerminate.
|
2023-09-15 10:32:12 +03:00 |
|
mushka-n
|
cf735a6fbe
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-15 00:43:58 +03:00 |
|
mushka-n
|
6b9e132ae4
|
upload form update (need to test, no cors)
|
2023-09-15 00:39:43 +03:00 |
|
|
|
46c6454d88
|
Web:Common:Section: fix padding for tablet and mobile window size
|
2023-09-14 19:26:49 +03:00 |
|
|
|
f477080db2
|
Merge branch 'develop' into bugfix/trash-navigation
|
2023-09-14 13:20:17 +04:00 |
|
gazizova-vlada
|
6c3ee273b6
|
Web:Common:Add DataReassignmentLoader.
|
2023-09-13 18:38:37 +03:00 |
|
|
|
09b012d4e9
|
Web:Client: fix blinking trash navigation
|
2023-09-13 15:52:04 +03:00 |
|
|
|
410f5f6257
|
Web:Common:Navigation: delete useless
|
2023-09-13 11:50:52 +03:00 |
|
|
|
eebc415d81
|
Web: Common: Navigation: fixed public-room icon
|
2023-09-13 09:52:14 +03:00 |
|
|
|
675590854c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data
# Conflicts:
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
# products/ASC.People/Server/Api/UserController.cs
|
2023-09-12 15:18:27 +03:00 |
|
mushka-n
|
ae5f1d2287
|
fixed submit to gallery alert not showing up
|
2023-09-12 02:03:26 +03:00 |
|
mushka-n
|
95e3bc8f36
|
merge develop + merge fix
|
2023-09-11 13:52:47 +03:00 |
|
mushka-n
|
d96911a37c
|
merge develop + merge fix
|
2023-09-11 13:26:58 +03:00 |
|
|
|
1f77cf82a2
|
Merge branch 'develop' into feature/leave-room
|
2023-09-11 13:28:56 +04:00 |
|
|
|
8d2a2526de
|
Merge branch 'develop' into bugfix/trash-navigation
|
2023-09-08 18:18:50 +02:00 |
|
|
|
60e7c125ad
|
Merge branch 'develop' into feature/copy-paste-hotkeys
|
2023-09-08 19:55:35 +04:00 |
|
|
|
1e615924ae
|
Merge branch 'develop' into feature/sso-mobile-layout
|
2023-09-08 18:36:25 +04:00 |
|
|
|
8196a60005
|
Merge branch 'develop' into bugfix/trash-navigation
|
2023-09-08 13:36:23 +02:00 |
|
Akmal Isomadinov
|
7051e55778
|
Merge branch 'feature/copy-paste-hotkeys' of github.com:ONLYOFFICE/DocSpace into feature/copy-paste-hotkeys
|
2023-09-08 15:28:00 +05:00 |
|
Akmal Isomadinov
|
15673efae5
|
Web:MediaViewer Added hot keys
|
2023-09-08 15:27:43 +05:00 |
|
|
|
5a76bd2bcf
|
Merge branch 'develop' into feature/new-settings-description
|
2023-09-08 12:05:20 +04:00 |
|
|
|
c5731bd8a8
|
Merge branch 'develop' into bugfix/tooltip
|
2023-09-08 11:28:42 +04:00 |
|
mushka-n
|
e1d989c6d2
|
merge develop + merge fix
|
2023-09-08 03:27:39 +03:00 |
|
Akmal Isomadinov
|
8dca5302af
|
Merge branch 'develop' into bugfix/tooltip
|
2023-09-07 18:46:47 +05:00 |
|
|
|
8ac6241c7e
|
Merge branch 'develop' into feature/new-settings-description
|
2023-09-07 17:13:02 +04:00 |
|
|
|
bf7e88da34
|
Merge branch 'develop' into feature/new-settings-description
|
2023-09-07 15:40:14 +03:00 |
|
