|
|
fc8897a79b
|
Merge branch 'develop' into feature/room-share-optimization
|
2023-09-26 11:47:56 +04:00 |
|
|
|
fe51f00a4f
|
Web: Files: fixed resendEmailInvitations
|
2023-09-25 17:07:25 +03:00 |
|
|
|
f4bc2d7575
|
Web: Files: fixed external link creation
|
2023-09-25 16:45:36 +03:00 |
|
|
|
95b095a386
|
Merge branch 'feature/room-share-optimization' of github.com:ONLYOFFICE/AppServer into feature/room-share-optimization
|
2023-09-25 16:37:45 +03:00 |
|
|
|
67bd4632ad
|
Web: Files: InviteInput: fixed search
|
2023-09-25 16:37:37 +03:00 |
|
|
|
796cbf3265
|
Merge branch 'develop' into feature/room-share-optimization
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2023-09-25 15:58:53 +03:00 |
|
|
|
e59a189a84
|
Web: Files: MembersList: fixed mobile view
|
2023-09-25 15:38:22 +03:00 |
|
|
|
c0b36735dd
|
Web: Applied server changes in api
|
2023-09-25 16:28:31 +04:00 |
|
|
|
81612b04ef
|
Web: Files: InfoPanel: fixed MembersList height
|
2023-09-25 15:00:05 +03:00 |
|
|
|
0db3fcc492
|
Web: Files: fixed MembersList height
|
2023-09-25 14:42:38 +03:00 |
|
|
|
ee809f380d
|
Web: Files: fixed AddUsersPanel
|
2023-09-25 13:55:37 +03:00 |
|
gazizova-vlada
|
62516a36bd
|
Web:Client:Added that if a room is created from one folder, then only the contents of the folder are copied to the room, and not the folder itself.
|
2023-09-25 10:58:18 +03:00 |
|
|
|
b14d6c8ef0
|
Merge branch 'hotfix/v1.1.3' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
# config/appsettings.json
# config/nlog.config
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
# packages/client/src/pages/Confirm/sub-components/createUser.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/common/components/MoreLoginModal/index.tsx
# packages/login/src/client/components/sub-components/LoginForm.tsx
# products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Core/CspSettingsHelper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-09-25 10:53:06 +03:00 |
|
|
|
fd383577a0
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-25 08:53:04 +03:00 |
|
|
|
70be87e984
|
Merge branch 'develop' into bugfix/invitePanel-searchList
|
2023-09-22 17:27:38 +02:00 |
|
|
|
ec495bb299
|
Web: Files: MembersList: fixed styles
|
2023-09-22 17:57:04 +03:00 |
|
|
|
9d4cfd2b76
|
Web: Files: fixed members list
|
2023-09-22 17:54:56 +03:00 |
|
|
|
2c318669db
|
Merge branch 'develop' into feature/creating-room-from-data
|
2023-09-22 18:39:56 +04:00 |
|
gazizova-vlada
|
0df4122c08
|
Web:Client:Change create to createRoom.
|
2023-09-22 17:31:45 +03:00 |
|
gazizova-vlada
|
3405508312
|
Web:Client:Refactoring.
|
2023-09-22 17:24:28 +03:00 |
|
gazizova-vlada
|
8703e6fc63
|
Web:Client:Fix bufferSelection.
|
2023-09-22 17:03:09 +03:00 |
|
|
|
573afcb448
|
Web: Files: PublicRoom: fixed external link actions
|
2023-09-22 16:46:14 +03:00 |
|
|
|
3c9dfca8c8
|
Web: Removed useless translations
|
2023-09-22 17:16:52 +04:00 |
|
|
|
a6d9ea95e9
|
Web: Removed useless key DNSSettingsTooltip
|
2023-09-22 17:13:57 +04:00 |
|
|
|
c91a2dfc36
|
Web: Added new SettingsDSConnect loader
|
2023-09-22 17:09:07 +04:00 |
|
gazizova-vlada
|
6a085a65c1
|
Web:Client:Add CatalogRoomsReactSvgUrl, translation.
|
2023-09-22 16:03:09 +03:00 |
|
gazizova-vlada
|
0c394ee1d2
|
Web:Client:Add Create room in getGroupContextOptions.
|
2023-09-22 15:55:27 +03:00 |
|
gazizova-vlada
|
9965519c89
|
Web:Client:Fixed function availability.
|
2023-09-22 15:48:09 +03:00 |
|
|
|
8371330d3c
|
Web: Applied new design
|
2023-09-22 16:39:08 +04:00 |
|
|
|
269e76bbec
|
Web: moved const creation into condition block
|
2023-09-22 16:26:51 +04:00 |
|
|
|
a4a89ed1c4
|
web: Fix DocumentServiceLocationHeaderInfo value + auto refactoing
|
2023-09-22 16:25:41 +04:00 |
|
|
|
5dab788680
|
Web: Files: InfoPanel: added infinite-loader to members list
|
2023-09-22 15:10:48 +03:00 |
|
|
|
f5e0260558
|
Web: Client: fix closing dropdown after click on input
(bug 60655 does not appear)
|
2023-09-22 13:44:02 +02:00 |
|
|
|
0a12dbef57
|
Web: Applied isDefault
|
2023-09-22 14:53:52 +04:00 |
|
gazizova-vlada
|
a1d2c7565b
|
Web:Client:Add t, processCreatingRoomFromData, fix selections.
|
2023-09-22 13:35:43 +03:00 |
|
|
|
03f323660f
|
Web: Changed button label
|
2023-09-21 19:58:05 +04:00 |
|
|
|
43a945939e
|
Web: Fix translation key name (test issue)
|
2023-09-21 18:32:49 +04:00 |
|
|
|
556ce3de0a
|
Web: Rename ids, param apiUrl to docServiceUrl and placeholder
|
2023-09-21 18:32:19 +04:00 |
|
gazizova-vlada
|
9a7e99a65f
|
Wed:Client:Add create room for data selected.
|
2023-09-21 17:10:57 +03:00 |
|
|
|
6322290d58
|
Web: Added displaying loading process
|
2023-09-21 18:00:47 +04:00 |
|
|
|
b19ef29e25
|
Web: Fix onSubmit/onReset
|
2023-09-21 17:42:22 +04:00 |
|
|
|
35e40f617f
|
Web: Added get DocumentService location settings
|
2023-09-21 17:28:15 +04:00 |
|
|
|
76252e407f
|
Web: Hide DocumentServices for SAAS
|
2023-09-21 17:22:40 +04:00 |
|
|
|
24a5bd2402
|
Web: Client: show inviteInputPanel after 2nd typed symbol
|
2023-09-21 13:35:04 +02:00 |
|
|
|
70b5c6e111
|
MErge branch 'develop' into feature/web-plugins
|
2023-09-21 14:30:04 +03:00 |
|
|
|
44dbeb48cd
|
Merge branch 'develop' into feature/document-service-location
|
2023-09-21 13:38:25 +04:00 |
|
Viktor Fomin
|
343dfaa20d
|
Client: PortalSettings: integration: fix align
|
2023-09-21 12:03:24 +03:00 |
|
|
|
2176cb65bb
|
Merge branch 'develop' into bugfix/invitePanel-searchList
|
2023-09-20 18:12:26 +02:00 |
|
|
|
abad1401f3
|
Web: Client: block showing addEmailPanel before searching
|
2023-09-20 18:00:12 +02:00 |
|
|
|
d1c3bb66bb
|
Merge branch 'develop' into bugfix/fix-static-images
|
2023-09-20 19:53:29 +04:00 |
|
|
|
9c9f33cf12
|
Merge pull request #1746 from ONLYOFFICE/feature/split-invite
Feature/split invite
|
2023-09-20 19:46:48 +04:00 |
|
Viktor Fomin
|
5f57f796e1
|
Login: Invalid: fix tKey
|
2023-09-20 17:36:37 +03:00 |
|
Viktor Fomin
|
ad177109a6
|
Client: PublicRoom: RoomErrors: fix tKey
|
2023-09-20 17:36:17 +03:00 |
|
Viktor Fomin
|
b3023358f2
|
Client: delete useless
|
2023-09-20 17:35:56 +03:00 |
|
Viktor Fomin
|
c0d87940f0
|
Web: move ExpiredLink translate to Common
|
2023-09-20 17:35:38 +03:00 |
|
|
|
1abbdd85f3
|
Web: Client: fix usersList blinking when type 3rd symbol
|
2023-09-20 16:27:55 +02:00 |
|
gazizova-vlada
|
69961e6900
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 17:19:12 +03:00 |
|
|
|
f1da568484
|
Merge branch 'develop' into feature/split-invite
|
2023-09-20 18:16:31 +04:00 |
|
gazizova-vlada
|
a061d42f29
|
Web:Add dataReassignmentUrl.
|
2023-09-20 17:03:31 +03:00 |
|
Viktor Fomin
|
6cc1b68702
|
Client: Confirm: CreateUser: add redirect to room
|
2023-09-20 17:03:31 +03:00 |
|
Viktor Fomin
|
33a7bce641
|
Merge branch 'develop' into feature/split-invite
|
2023-09-20 16:50:26 +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 |
|
|
|
b25b39da14
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-20 14:55:39 +03:00 |
|
Viktor Fomin
|
c5b982d239
|
Client: PortalSettings: Integration: fix style
|
2023-09-20 14:48:38 +03:00 |
|
|
|
3d20697ac0
|
Web: Translation: Fix UTC key duplication + sorting
|
2023-09-20 15:36:34 +04:00 |
|
|
|
cc966ed58a
|
Web: Restored usefull code
|
2023-09-20 14:57:41 +04: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 |
|
|
|
52460ab0b1
|
Web: Files: removed useless someDialogIsOpen
|
2023-09-20 13:29:59 +03:00 |
|
|
|
925451db9d
|
Web: Files: fixed leave-room for user
|
2023-09-20 13:29:18 +03:00 |
|
|
|
913f409f03
|
Merge branch 'feature/leave-room' of github.com:ONLYOFFICE/AppServer into feature/leave-room
|
2023-09-20 13:10:26 +03:00 |
|
|
|
06846b07d2
|
Web: Files: Leave-room: fix
|
2023-09-20 13:10:15 +03:00 |
|
|
|
3a1bf92291
|
Merge branch 'develop' into feature/leave-room
|
2023-09-20 13:20:56 +04:00 |
|
|
|
e356f361f3
|
Merge pull request #1757 from ONLYOFFICE/feature/rtl-cron
Feature/rtl cron
|
2023-09-20 13:10:36 +04:00 |
|
Akmal Isomadinov
|
539db1caf1
|
Web:Cron Added namespace for translation
|
2023-09-20 13:51:52 +05:00 |
|
Akmal Isomadinov
|
4dde3cfdad
|
Web:Cron: Added localization of the week
|
2023-09-20 13:42:33 +05:00 |
|
Akmal Isomadinov
|
c1983fcfa6
|
Web:Cron Added translation
|
2023-09-20 13:34:26 +05:00 |
|
Viktor Fomin
|
67864b8eec
|
Client: PortalSettings: Integration: add free/paid consumers
|
2023-09-20 11:31:32 +03:00 |
|
Akmal Isomadinov
|
a223d684f7
|
Web:Cron Optimizing rendering
|
2023-09-20 13:30:37 +05:00 |
|
Viktor Fomin
|
915eef9d91
|
Client: add translate
|
2023-09-20 11:30:28 +03:00 |
|
Viktor Fomin
|
73118da8f2
|
Merge branch 'develop' into feature/split-invite
|
2023-09-20 10:52:17 +03:00 |
|
Viktor Fomin
|
2085f23a60
|
Client: PortalSettings: SSO: fix infinite loader
|
2023-09-20 10:48:24 +03:00 |
|
|
|
4f136e61b4
|
Web: Increased height of Textarea
|
2023-09-19 20:09:04 +04:00 |
|
|
|
2e7fc53dcf
|
Web: Fix crash on thirdpartiesLogo undefined
|
2023-09-19 19:22:07 +04:00 |
|
Akmal Isomadinov
|
976dc207a7
|
Web:Cron Added localization of digits depending on locale
|
2023-09-19 16:53:17 +05:00 |
|
Akmal Isomadinov
|
4b54a0b5e3
|
Web:Cron Fixed ts warning
|
2023-09-19 16:49:48 +05:00 |
|
Akmal Isomadinov
|
0b103ec1bf
|
Web:Cron Added local
|
2023-09-19 16:49:02 +05:00 |
|
|
|
516f034571
|
Merge pull request #1752 from ONLYOFFICE/bugfix/fix-submenu-line
bugfix/fix-submenu-line
|
2023-09-19 15:46:18 +04:00 |
|
|
|
6766a28c19
|
Merge branch 'develop' into bugfix/fix-root-selection
|
2023-09-19 15:40:49 +04:00 |
|
Viktor Fomin
|
19e1b51887
|
Merge branch 'develop' into feature/split-invite
|
2023-09-19 14:04:18 +03:00 |
|
|
|
bf48ce5393
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 14:02:42 +03:00 |
|
mushka-n
|
b5d23aaf62
|
added request canceling
|
2023-09-19 13:27:22 +03:00 |
|
|
|
fb6d0b06a9
|
edited 'Move to Trash' description
|
2023-09-19 12:29:04 +03:00 |
|
|
|
4e38a5a987
|
Web: Applied new formGallery config
|
2023-09-19 13:12:40 +04:00 |
|
|
|
1c1ab16fa8
|
Web: Removed useless import
|
2023-09-19 13:12:02 +04:00 |
|
|
|
2b41d47d0f
|
Web:Client: delete console log
|
2023-09-19 11:42:28 +03:00 |
|
|
|
238b86bce5
|
Web: Files: fixed wsModifyFolderUpdate
|
2023-09-19 11:31:25 +03:00 |
|
|
|
849ca096fd
|
Web:Client: fix click on back
|
2023-09-19 11:17:49 +03:00 |
|
gazizova-vlada
|
b45e59a1df
|
Merge branch 'feature/reassign-data' of https://github.com/ONLYOFFICE/DocSpace into feature/reassign-data
|
2023-09-19 11:06:20 +03:00 |
|
gazizova-vlada
|
b30b20f733
|
Web:Client:Print error to toastr.
|
2023-09-19 11:06:03 +03:00 |
|
gazizova-vlada
|
dd35e54ca6
|
Web:Delete scale props in Submenu, BottomLine width to 100%.
|
2023-09-19 10:55:35 +03:00 |
|
|
|
89e590e30f
|
Web: Files: hidden context menu option to mute/unmute if user is not in the room
|
2023-09-19 10:52:47 +03:00 |
|
|
|
2cbd3e05b8
|
Web:Client:Article: remove selection after change root folder
|
2023-09-19 10:49:20 +03:00 |
|
|
|
ca76336fc3
|
Merge branch 'develop' into feature/leave-room
|
2023-09-19 10:44:07 +03:00 |
|
|
|
922a90e963
|
Web: Files: fixed leave-room context option
|
2023-09-19 10:41:16 +03:00 |
|
|
|
ec89036236
|
Web:Client:Plugins: add check for props
|
2023-09-19 10:29:52 +03:00 |
|
Vlada Gazizova
|
3471bbf09f
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-19 09:54:45 +03:00 |
|
gazizova-vlada
|
600482c94d
|
Web:Client:Fix.
|
2023-09-19 09:53:26 +03:00 |
|
gazizova-vlada
|
191a781225
|
Web:Fix.
|
2023-09-19 09:49:39 +03:00 |
|
|
|
d364748d84
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 09:23:13 +03:00 |
|
|
|
8dc0507a03
|
Web:Client:Plugins: fix client after change system plugin
|
2023-09-19 09:17:59 +03:00 |
|
gazizova-vlada
|
c34f60577d
|
Web:Client:Add translation.
|
2023-09-19 09:08:14 +03:00 |
|
|
|
91ae0883e9
|
Web:Client:Plugins: fix plugin dialog
|
2023-09-19 08:58:48 +03:00 |
|
gazizova-vlada
|
21bd975674
|
Web:Client:Fix styles.
|
2023-09-19 08:58:04 +03:00 |
|
gazizova-vlada
|
4d1fc192d0
|
Web:Client:Change translation Account list to List accounts.
|
2023-09-18 18:43:18 +03:00 |
|
gazizova-vlada
|
be2861f110
|
Web:Client:Add timerId.
|
2023-09-18 18:38:34 +03:00 |
|
gazizova-vlada
|
f8d623d3ef
|
Web:Add dataReassignmentUrl.
|
2023-09-18 18:17:02 +03:00 |
|
mushka-n
|
9d418bff4b
|
fixed selector closing logic
|
2023-09-18 17:59:44 +03:00 |
|
mushka-n
|
b6ca0ad826
|
fix rtl
|
2023-09-18 17:40:26 +03:00 |
|
mushka-n
|
0956461ec5
|
revert to old selector behaviour
|
2023-09-18 17:30:55 +03:00 |
|
mushka-n
|
e51e712fb4
|
added DOCXF-only filtering to selector
|
2023-09-18 17:15:27 +03:00 |
|
mushka-n
|
d98680b350
|
moved translations and updated selector
|
2023-09-18 17:10:16 +03:00 |
|
mushka-n
|
87ac20c1fd
|
added SubmitToGalleryTile save on close
|
2023-09-18 17:09:34 +03:00 |
|
mushka-n
|
2fd546f697
|
fixed formData naming
|
2023-09-18 17:09:14 +03:00 |
|
gazizova-vlada
|
34a7c068a7
|
Web:Client:Add onStartAgain, onTerminate.
|
2023-09-18 16:55:03 +03:00 |
|
mushka-n
|
aa074fab8e
|
update on file selector closing behaviour
|
2023-09-18 16:01:12 +03:00 |
|
mushka-n
|
6459d37c5b
|
cleaned up logs
|
2023-09-18 15:49:43 +03:00 |
|
mushka-n
|
f28c328c54
|
Merge branch 'feature/submit-to-form-gallery' of https://github.com/ONLYOFFICE/DocSpace into feature/submit-to-form-gallery
|
2023-09-18 15:37:45 +03:00 |
|
mushka-n
|
d3bebdbda0
|
update dark theme
|
2023-09-18 15:37:40 +03:00 |
|
|
|
74f9ea784b
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-18 16:31:27 +04:00 |
|
|
|
9fe5fdd464
|
Merge pull request #1744 from ONLYOFFICE/feature/mobile-sdk
Feature/mobile sdk
|
2023-09-18 16:22:45 +04:00 |
|
mushka-n
|
068f89ce2c
|
fix onClose error 2
|
2023-09-18 15:21:59 +03:00 |
|
mushka-n
|
903cb39e3f
|
fix onClose error
|
2023-09-18 15:18:07 +03:00 |
|
|
|
250c88725f
|
Web: Client: add missing whitespace between sdk description and link
|
2023-09-18 14:12:12 +02:00 |
|
mushka-n
|
ae899c0264
|
fix submit to gallery context option
|
2023-09-18 15:09:43 +03:00 |
|
|
|
1e020592e2
|
Web: Client: fix space in sdk tab
|
2023-09-18 14:01:38 +02:00 |
|
Viktor Fomin
|
e49f0818c5
|
Merge branch 'develop' into feature/split-invite
|
2023-09-18 14:46:10 +03:00 |
|
Viktor Fomin
|
7250c923d0
|
Client: PortalSettings: SSO: fix style
|
2023-09-18 14:31:23 +03:00 |
|
|
|
2f1f2ef4fa
|
Web: Client: fix long text in theme edit button
|
2023-09-18 13:28:32 +02:00 |
|
mushka-n
|
4a6b1b7f0d
|
tarnslations + link popup unblock
|
2023-09-18 14:28:25 +03:00 |
|
|
|
33091f9304
|
Web: Client: fix long text in copy button
|
2023-09-18 12:55:29 +02:00 |
|
|
|
84f77d3b3d
|
Web: Files: removed someDialogIsOpen
|
2023-09-18 13:52:51 +03:00 |
|
|
|
e0b4b232df
|
Web: Files: Leave-room: fixed translations
|
2023-09-18 13:50:33 +03:00 |
|
|
|
95424d49f9
|
Web: Added ru translations + autofixes
|
2023-09-18 14:17:00 +04:00 |
|
mushka-n
|
da7aec7445
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-18 13:06:39 +03:00 |
|
|
|
0deac4bf00
|
Merge branch 'develop' into feature/mobile-sdk
|
2023-09-18 13:45:20 +04:00 |
|
Viktor Fomin
|
571b94f842
|
Merge branch 'develop' into feature/split-invite
|
2023-09-18 12:35:23 +03:00 |
|
