a26384cc96
Web: Files: fixed files upload
2023-03-06 14:17:21 +03:00
977ef4f43a
Merge branch 'develop' into feature/send-again
2023-03-06 15:12:02 +04:00
Vladimir Khvan
2c8560a3c0
webhook's actions were added
2023-03-06 16:03:22 +05:00
Vladimir Khvan
2b6705a755
webhooks store was added
2023-03-06 16:02:31 +05:00
Vladimir Khvan
93bfc64fe1
functions were substituted with webhooks's actions
2023-03-06 16:02:06 +05:00
Vladimir Khvan
2897160faf
webhook's actions functions were added
2023-03-06 16:01:21 +05:00
Vladimir Khvan
dfe17a207c
id was added to webhook object
2023-03-06 16:00:39 +05:00
Vladimir Khvan
dff264e97c
webhooks store was integrated / webhooks interaction functions were added
2023-03-06 15:58:28 +05:00
Vladimir Khvan
5475c80893
set document title to developer tools
2023-03-06 15:57:22 +05:00
8d45abeffe
Merge branch 'feature/send-again' of github.com:ONLYOFFICE/AppServer into feature/send-again
2023-03-06 13:21:45 +03:00
b219ebb07b
Web:Client:Fix styles.
2023-03-06 13:21:37 +03:00
43e465697d
Fix Bug 61481 - Accounts. The email of the portal owner is not confirmed
2023-03-06 14:20:59 +04:00
Elyor Djalilov
b28f8e793b
Web: PortalSettings: fix backup fields
2023-03-06 14:43:16 +05:00
Elyor Djalilov
d4fd62e2ec
fix bad merge
2023-03-06 14:29:09 +05:00
Elyor Djalilov
fdaf0aa9e9
Merge branch 'develop' into bugfix/61157
...
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
# packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
# packages/client/src/pages/PortalSettings/categories/common/Customization/portal-renaming.js
# packages/client/src/pages/PortalSettings/categories/common/Customization/welcome-page-settings.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/index.js
2023-03-06 14:20:25 +05:00
83c03823aa
Fix confirmLink activeEmail
2023-03-06 12:35:49 +04:00
2a503cfc47
Merge branch 'develop' into feature/send-again
2023-03-06 10:59:42 +04:00
Vladimir Khvan
cd0c7e7adf
webhooks store was created
2023-03-06 09:56:24 +05:00
6cf2a16c39
Merge branch 'develop' into feature/send-again
2023-03-05 12:18:02 +03:00
bfeda8f9e9
Web:Client:Fixed styles because the send link again did not fit in the plate.
2023-03-05 12:17:42 +03:00
b341ddfb62
Fix socket operations
2023-03-05 11:39:44 +04:00
Elyor Djalilov
44c04c5131
Web: PortalSettings: fix appearance color
2023-03-04 19:44:39 +05:00
Elyor Djalilov
668be2e17d
Web: PortalSettings: fix single sign-on fields
2023-03-04 13:10:53 +05:00
Elyor Djalilov
4cecc2c3a9
Web: PortalSettings: fix styles
2023-03-04 11:36:04 +05:00
Elyor Djalilov
728ba4ea5b
Web: PortalSettings: fix automatic backup fields
2023-03-04 11:19:06 +05:00
Elyor Djalilov
6ded261462
Web: PortalSettings: fix company logos
2023-03-04 10:18:44 +05:00
c91f6c9e5d
Merge branch 'develop' into feature/fix-back-button-rooms
2023-03-03 18:03:29 +04:00
964300cd19
Merge branch 'develop' into bugfix/oforms-context-info
2023-03-03 17:02:35 +04:00
68ce5c8764
Merge branch 'bugfix/settings-backup' of github.com:ONLYOFFICE/AppServer into bugfix/settings-backup
2023-03-03 14:46:21 +03:00
f4d8972358
Web: Renaming.
2023-03-03 14:46:01 +03:00
8acbf0bd64
Merge branch 'develop' into bugfix/settings-backup
2023-03-03 15:23:05 +04:00
Mushka Nikita
bc2eda8a4c
fiixed erasure sorting
2023-03-03 14:21:25 +03:00
Mushka Nikita
00d44aad43
added russian translation to erasure functionality
2023-03-03 14:21:17 +03:00
Viktor Fomin
b2edb13072
Client: AccountsHome: add ResetApplicationDialog
2023-03-03 14:03:32 +03:00
Viktor Fomin
c7aa870767
Client: init reset auth
2023-03-03 14:03:02 +03:00
Viktor Fomin
4d60816027
Client: ResetApplicationDialog: add success toast
2023-03-03 14:01:10 +03:00
Viktor Fomin
c6e1c58e97
Client: add translates
2023-03-03 14:00:53 +03:00
Mushka Nikita
5171aeceb8
fiixed infoPanel closing on category switch
2023-03-03 13:34:03 +03:00
3448048b2b
Web: PortalSettings: Restore: Deleted useless code.
2023-03-03 13:06:21 +03:00
d49f5ead91
Web: PortalSettings: Deleted useless code.
2023-03-03 12:56:38 +03:00
f8000cdc2a
Web: PortalSettings: Backup: Fixed component display by direct url.
2023-03-03 12:54:22 +03:00
23b5689205
Web:Client:Fix.
2023-03-03 11:17:58 +03:00
Timofey Boyko
f4f7a1b3ad
Web:Client: move FilterGroups and FilterKeys constants to common
2023-03-03 11:05:26 +03:00
00e385f193
Web:Client:Fixed repeated push of the same url in Customization settings.
2023-03-03 10:47:07 +03:00
8e025f4afb
Web:Client:Fixed the lack of highlighting of the portal settings menu items when clicking back in the browser. Fixed substitution of the URL of the customization page when going to the branding page when there was a direct link download of the appearance page.
2023-03-03 10:12:00 +03:00
43dcb4dcd7
Web: Added clear storage.
2023-03-03 09:55:44 +03:00
0f22feed6e
Merge branch 'develop' into bugfix/fixed-render-list
2023-03-02 19:59:01 +04:00
655add486d
Hide ResetAuth option
2023-03-02 19:56:38 +04:00
4eed07ffe1
Hide concole
2023-03-02 19:51:27 +04:00
fb101bfabe
Web: Files: fixed moveToCopyTo operation
2023-03-02 18:39:23 +03:00
baed7a67aa
Web:Client:Remove unnecessary code since the handling of the popstate event is in the submenu.
2023-03-02 18:23:53 +03:00
b59aec3807
Web: PortalSettings: Backup: Delete useless code.
2023-03-02 17:59:33 +03:00
Timofey Boyko
0f82f5436a
Web:Client:MainBar: delete useless code
2023-03-02 17:24:01 +03:00
Timofey Boyko
ad2398ddd0
Web:Client:Profile: fix double invite request
2023-03-02 17:22:50 +03:00
Timofey Boyko
d8e2b2c03a
Merge branch 'develop' into bugfix/accounts-filter
2023-03-02 17:16:30 +03:00
Mushka Nikita
da794c6a0f
Merge branch 'bugfix/oforms-context-info' of github.com:ONLYOFFICE/AppServer into bugfix/oforms-context-info
2023-03-02 16:50:33 +03:00
Mushka Nikita
0569c1faab
fixed styling in info-panel accounts empty view
2023-03-02 16:50:18 +03:00
Mushka Nikita
caeaf69406
fixed accounts home header-container styling
2023-03-02 16:49:32 +03:00
2da50109bb
Merge branch 'develop' into bugfix/oforms-context-info
2023-03-02 17:37:51 +04:00
a4d3ff43bf
Merge branch 'develop' into bugfix/mobile-loader
2023-03-02 17:26:32 +04:00
bdb784b250
Merge pull request #1264 from ONLYOFFICE/bugfix/avatar-size
...
Web:Client:Removed the transfer of the size of the avatar so that the…
2023-03-02 17:18:27 +04:00
Timofey Boyko
477015697d
Web:Client:MainBar: fix link style
2023-03-02 16:17:35 +03:00
Viktor Fomin
ba81ad25b9
Merge branch 'develop' into bugfix/mobile-loader
2023-03-02 16:13:00 +03:00
b47ed9ea40
Merge branch 'develop' into bugfix/Bug61218
2023-03-02 17:08:47 +04:00
1a73aa630e
Merge pull request #1270 from ONLYOFFICE/bugfix/fixed-cancel-upload
...
Web: Files: fixed cancel upload
2023-03-02 17:03:21 +04:00
7ea61d3c5b
Web:Client:Added popstate event handling for accounts and settings.
2023-03-02 16:01:11 +03:00
Timofey Boyko
6fcabb5e2b
Web:Client:Profile: fix styles for main-profile
2023-03-02 15:56:27 +03:00
cad06d79a1
Web: Client: InviteLinksStore: Added runInAction for getting links action
2023-03-02 15:39:34 +03:00
Viktor Fomin
fbcd2500fe
Merge branch 'develop' into bugfix/mobile-loader
2023-03-02 15:03:31 +03:00
Viktor Fomin
12109ee711
Merge branch 'develop' into bugfix/Bug61218
2023-03-02 15:03:18 +03:00
Viktor Fomin
e498f32200
Client: Shell: delete useless
2023-03-02 14:49:08 +03:00
c6cdd69be1
Web: TreeFolders: Deleted error.
2023-03-02 14:24:32 +03:00
2bdaaa9b09
Web: PortalSettings: Backup: Fixed translation.
2023-03-02 14:10:48 +03:00
74b19e27f2
Web: Files: fixed cancel upload
2023-03-02 13:54:05 +03:00
Mushka Nikita
27a2f8a330
refactored ws modify-folder
2023-03-02 13:37:38 +03:00
Viktor Fomin
0dbcec1fe6
Merge branch 'develop' into bugfix/Bug61218
2023-03-02 13:35:50 +03:00
Viktor Fomin
e7043b3f8d
Client: HOCs: withLoader: fix mobile loader
2023-03-02 13:35:37 +03:00
f3675ee897
Merge branch 'develop' into bugfix/redesign-author-filter
2023-03-02 13:05:11 +04:00
0b88e40b0e
Web: Files: fixed removeFiles
2023-03-02 11:51:12 +03:00
765abfb554
Merge branch 'develop' into feature/fix-back-button-rooms
2023-03-02 11:05:14 +03:00
4fef567cca
Web:Client:Adding popstate event handling.
2023-03-02 11:01:28 +03:00
74eeff430b
Web:Client:Removing popstate event handling. Adding the onClickBack function from the store.
2023-03-02 11:00:42 +03:00
c6ef965306
Web:Client:Fixing the onClickBack function when the back button is clicked. Moving functions to storage. Added an id definition for the backToParentFolder function.
2023-03-02 10:59:08 +03:00
411195264f
Web:Client:Adding a url check to avoid pushing the same url into history.
2023-03-02 10:54:42 +03:00
80437509cc
Web:Client:Removing re-adding the url to the history when clicking on the menu items.
2023-03-02 10:53:44 +03:00
fa12ff1b56
Web:Client:Add new constants Settings and Accounts. Fix for incorrect definition of categoryType for Trash. Adding a categoryType definition for Settings and Accounts.
2023-03-02 10:52:22 +03:00
Timofey Boyko
98bf25f105
Merge branch 'develop' into bugfix/accounts-filter
2023-03-02 10:20:12 +03:00
ce34065a9e
Web:Client:Removed the transfer of the size of the avatar so that the picture is not cropped.
2023-03-02 08:42:04 +03:00
Viktor Fomin
6ca3170843
Fix Bug 61218: get keepNewFileName from server
2023-03-02 01:22:25 +03:00
DmitrySychugov
ce9e972d22
Merge branch 'develop' into bugfix/redesign-author-filter
2023-03-01 20:16:52 +05:00
DmitrySychugov
d030c658bb
Web: Client: fixed subjectId room filter for new filter design
2023-03-01 20:15:24 +05:00
Mushka Nikita
003826d581
testing code cleanup
2023-03-01 17:56:11 +03:00
Mushka Nikita
839a406615
Merge branch 'develop' into bugfix/oforms-context-info
2023-03-01 17:54:49 +03:00
Viktor Fomin
47172aad39
Client: Components: MainButton: fix missing main button
2023-03-01 17:49:45 +03:00
Mushka Nikita
518533656a
fixed members role combobx interaction with scroll
2023-03-01 17:34:09 +03:00
Mushka Nikita
5ca628cc84
added some filesCount and foldersCount update to modify-folder socket functionality
2023-03-01 17:29:48 +03:00
Timofey Boyko
7af2d9040c
Web:Accounts: fix filter for pending user
2023-03-01 17:09:31 +03:00
Timofey Boyko
691e80941c
Web:Client:InvitePanel: add filter for getUserList method
2023-03-01 15:36:42 +03:00
Timofey Boyko
86e158469b
Merge branch 'develop' into bugfix/accounts-list
2023-03-01 15:18:07 +03:00
Timofey Boyko
1150f512e7
Web:Client:InfoPanel: fix tooltip for DocSpace owner
2023-03-01 15:17:26 +03:00
Timofey Boyko
c8ccbe0a0e
Web:Client:InvitePanel: get user list after invite new users
2023-03-01 15:14:57 +03:00
Timofey Boyko
b97ed4a10e
Web:Client:Accounts: disable change user type for disabled users
2023-03-01 14:58:28 +03:00
Vlada Gazizova
b8d742599a
Merge branch 'develop' into feature/open-location
2023-03-01 11:37:31 +03:00
Timofey Boyko
a6561df0a0
Merge branch 'develop' into bugfix/chage-user-type
2023-03-01 11:24:10 +03:00
Timofey Boyko
65850ca29e
Fixed Bug 61322 and Bug 61324
2023-03-01 11:21:59 +03:00
f1e9c000fc
Merge pull request #1243 from ONLYOFFICE/bugfix/fixed-files-conversion
...
Web: Files: fixed conversion
2023-03-01 11:18:13 +03:00
93c81da865
Web:Client:Rename setHighlightFileId to setHighlightFile.
2023-03-01 11:06:19 +03:00
DmitrySychugov
1783b6a43d
Merge branch 'develop' into bugfix/redesign-author-filter
2023-03-01 13:04:35 +05:00
DmitrySychugov
982c5f65cb
Web: changed the property to show selector
2023-03-01 13:03:54 +05:00
b4676496ee
Web:Client:Fix.
2023-03-01 11:02:39 +03:00
a676f1f2a8
Merge branch 'feature/open-location' of github.com:ONLYOFFICE/AppServer into feature/open-location
2023-03-01 10:56:08 +03:00
f8d6676aef
Web:Client:Optimized the search for a file in a folder by deleting repeated fetchFiles.
2023-03-01 10:55:09 +03:00
Timofey Boyko
7238b23d89
Web:Client:ChangeUserTypeEvent: add new type 'Collaborator'
2023-03-01 10:38:59 +03:00
aa14878d1e
Merge branch 'develop' into feature/section-header-upload-files
2023-02-28 21:57:34 +04:00
18a15cf704
Merge pull request #1250 from ONLYOFFICE/bugfix/61043
...
Bugfix/61043
2023-02-28 21:54:49 +04:00
805d6676f9
Merge pull request #1253 from ONLYOFFICE/bugfix/61269
...
Bugfix/61269
2023-02-28 21:52:34 +04:00
Timofey Boyko
dbcadd06a2
Fixed Bug 61193
2023-02-28 19:03:02 +03:00
86535b41d3
Web: Files: fixed upload
2023-02-28 18:41:08 +03:00
213bb2351f
Web: Files: fixed dnd
2023-02-28 18:40:07 +03:00
Elyor Djalilov
7b44e8063c
Merge branch 'develop' into bugfix/61157
2023-02-28 20:16:21 +05:00
3605e62938
Merge branch 'develop' into bugfix/fixed-files-conversion
2023-02-28 18:12:37 +03:00
Elyor Djalilov
07f945b3b1
fix don't ask again setting for a user without file creation permission
2023-02-28 20:10:13 +05:00
0a30837b50
Web: Files: fixed conversion
2023-02-28 17:59:16 +03:00
8ef0ac5951
Merge branch 'develop' into feature/dnd-to-trash
2023-02-28 18:52:15 +04:00
DmitrySychugov
a893457663
Web: changed the author filter
2023-02-28 19:45:13 +05:00
Timofey Boyko
223d229932
Web:Client:Home: add upload files and upload folder to section haeder
2023-02-28 17:42:17 +03:00
Vlada Gazizova
851c3ca8c2
Merge branch 'develop' into feature/open-location
2023-02-28 17:38:01 +03:00
ff4d815d59
Web:Client:Removed unnecessary request.
2023-02-28 17:34:54 +03:00
Elyor Djalilov
5a9bbcac84
fix unreadable characters instead of name in Info/Details
2023-02-28 19:23:57 +05:00
d561e27b5d
Web: Files: fixed conversion progress
2023-02-28 17:19:15 +03:00
8114f8a710
Merge branch 'develop' into feature/browserlist
2023-02-28 18:11:49 +04:00
b46967d2de
Web: Files: fixed upload percent
2023-02-28 14:40:46 +03:00
05249ddf77
Merge branch 'develop' into feature/browserlist
2023-02-28 13:48:19 +03:00
c1a89733c4
Web: Added new translations
2023-02-28 14:22:29 +04:00
c932d935fa
Merge branch 'develop' into feature/colloborator
2023-02-28 13:48:08 +04:00
Timofey Boyko
a12252e3eb
Web:Client:InfoPanel: fix history block for collaborator
2023-02-28 12:27:34 +03:00
faf316e6cc
Web: Files: added drag-and-drop to trash folder
2023-02-28 12:14:23 +03:00
Timofey Boyko
7cc87a6853
Web:Client:InfoPanel: add tooltip for user role
2023-02-28 11:38:46 +03:00
b03d20a0f5
Web: Files: fixed conversion
2023-02-28 10:59:56 +03:00
Timofey Boyko
fcf71e3c94
Web:Client:Utils: fix filterUserRoleOptions
2023-02-28 10:51:14 +03:00
1a3dfba635
Fix Bug 61108 - Accounts. Uncaught (in promise) Error: Request aborted on logout in FireFox browser
2023-02-28 11:21:01 +04:00
Elyor Djalilov
ce6fa5b45f
Web: PortalSettings: fix additional resources fields
2023-02-28 12:18:07 +05:00
Vladimir Khvan
e7b4dffc97
reset hint is set visible only if it is settings modal
2023-02-28 11:08:08 +05:00
Vladimir Khvan
17c5758237
html skelet of webhook history page was created
2023-02-28 00:49:55 +05:00
Vladimir Khvan
bcb663f3f5
delete and setting webhook dialog windows were added/context items were passed correctly
2023-02-28 00:49:17 +05:00
Vladimir Khvan
d2feb4bc29
consumer context was added/table component was fixed
2023-02-28 00:48:12 +05:00
Vladimir Khvan
986ab12b8d
webhook dialog wasa created
2023-02-28 00:47:08 +05:00
Vladimir Khvan
20888f99b6
reset hint is showing before changing password input
2023-02-28 00:46:44 +05:00
Vladimir Khvan
448356a343
name, value, and onchange props were added
2023-02-28 00:46:11 +05:00
Vladimir Khvan
adc559fdeb
Delete webhook dialog was created
2023-02-28 00:45:15 +05:00
Vladimir Khvan
32ab7dde5e
folder was renamed to webhookDialog
2023-02-28 00:44:58 +05:00
Vladimir Khvan
ce6b946a22
webhooks were placed into useState/webhooksList is rendered if it has elements
2023-02-28 00:26:58 +05:00
Timofey Boyko
56d778dd39
Merge branch 'develop' into feature/colloborator
2023-02-27 18:37:18 +03:00
9bdc7cc49d
Merge branch 'feature/open-location' of github.com:ONLYOFFICE/AppServer into feature/open-location
2023-02-27 17:09:50 +03:00
ccd38a2714
Web:Client:Removed repeated search for files if it is the same file when clicking on the Open Location button. Fixed first request with default file filter with count 25.
2023-02-27 17:09:39 +03:00
6224902959
Web: Files: Upload panel: fixed files list
2023-02-27 16:41:54 +03:00
Elyor Djalilov
ada19b49d3
Web: PortalSettings: fix company info settings fields
2023-02-27 18:41:13 +05:00
Timofey Boyko
8e59451b4a
Merge branch 'develop' into feature/colloborator
2023-02-27 15:22:21 +03:00
Timofey Boyko
abe88e6ddd
Web:Client: fix access options for DocSpace admins and DocSpace owner
2023-02-27 15:21:28 +03:00
Timofey Boyko
bcec1a9617
Web:Client:Utils: add filterUserRoleOptions function
2023-02-27 14:57:05 +03:00
Timofey Boyko
c55c2ffab2
Web:Client:AddUsersPanel: add correct role for DocSpace admin and DocSpace owner
2023-02-27 14:18:44 +03:00
Timofey Boyko
ed407991d3
Web:Client:PeopleSelector: add isOwner, isAdmin, isVisitor, isCollaborator for user
2023-02-27 13:53:19 +03:00
Elyor Djalilov
afc16a1465
Web: PortalSettings: refactoring company information settings
2023-02-27 15:47:20 +05:00
Timofey Boyko
ff547ea1e5
Web:Client:InfoPanel:Members: show active user role
2023-02-27 12:25:32 +03:00
091c24a979
Merge branch 'develop' into feature/open-location
2023-02-27 12:43:50 +04:00
0526bab217
Web: Files: fixed upload-panel progress
2023-02-27 11:20:13 +03:00
ead94f371e
Merge branch 'develop' into feature/notifications
2023-02-27 10:29:50 +03:00
Elyor Djalilov
02e7a92b6e
Merge branch 'develop' into bugfix/61157
2023-02-27 11:28:48 +05:00
0b744d7250
Web: Fixed parameter.
2023-02-27 09:15:58 +03:00
Elyor Djalilov
a85d51fb40
Web: PortalSettings: fix branding name
2023-02-24 15:34:45 +05:00
0d24c1a2ab
Web:Added content change in submenu when clicking the back button in the browser.
2023-02-24 12:36:59 +03:00
Vladimir Khvan
6b0c1d163c
Merge branch 'develop' into feature/webhooks-page
2023-02-23 23:01:14 +05:00
Vladimir Khvan
e38fedb757
ssl verification button group was created
2023-02-23 22:45:06 +05:00
Vladimir Khvan
897bab3a4a
secret key input was created
2023-02-23 22:44:43 +05:00
Vladimir Khvan
9ac3650ad5
labled input component was created
2023-02-23 22:44:26 +05:00
Vladimir Khvan
cf6edbbd14
modal dialog sidebar was created
2023-02-23 22:44:06 +05:00
Vladimir Khvan
12c8575692
hint component was re-exported
2023-02-23 22:41:42 +05:00
Vladimir Khvan
3e26d84319
hint styled component was created
2023-02-23 22:41:27 +05:00
Vladimir Khvan
e138a59638
create webhook dialog window was created
2023-02-23 22:40:19 +05:00
8983ed8312
Web:Client:Fixed when animating a file in a table view, the background overlapped twice due to the fact that the padding width was superimposed on the quick buttons container.
2023-02-23 18:22:25 +03:00
Elyor Djalilov
27b710d87b
Web: PortalSettings: fix backup fields
2023-02-23 14:24:34 +05:00
Elyor Djalilov
69e8e0aee2
Web: PortalSettings: fix storage period fields
2023-02-22 20:54:34 +05:00
Timofey Boyko
3a280b8486
Web:Client:EmptyContainer: update empty screen for collaborator
2023-02-22 17:14:24 +03:00
Timofey Boyko
5ac78e3eb4
Web: disable routes for collaborator
2023-02-22 16:53:59 +03:00
be48cd2996
Merge branch 'develop' into feature/browserlist
2023-02-22 16:39:09 +03:00
aad577d0cc
Merge pull request #1236 from ONLYOFFICE/feature/invite-panel-texts
...
Web: Client: InvitePanel: Added descriptions
2023-02-22 16:36:52 +03:00
d69084d736
Web: Client: InvitePanel: Fixed translations
2023-02-22 16:35:43 +03:00
Timofey Boyko
e8119fbbf2
Web:Client:InfoPanel: add new type and role
2023-02-22 16:26:55 +03:00
Timofey Boyko
7c6d99d122
Web:Client:Accounts: add new user type for filter
2023-02-22 16:10:17 +03:00
Timofey Boyko
f5c8b9d051
Web:Client: add new type and role at invite panel
2023-02-22 15:57:27 +03:00
Timofey Boyko
89bf5322a5
Web:Client: add new translation key for collaborator
2023-02-22 15:56:51 +03:00
216a6480c8
Merge branch 'develop' into feature/notifications
...
# Conflicts:
# packages/common/constants/index.js
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# yarn.lock
2023-02-22 15:50:55 +03:00
Timofey Boyko
dda368ace1
Web:Client:InfoPanel: add new type to acctounts view
2023-02-22 15:47:29 +03:00
Timofey Boyko
97cd50eb87
Web:Client:Accounts: add new user type 'Collaborator
2023-02-22 15:36:57 +03:00
Timofey Boyko
9c1a5d9aed
Web:Client:AccessRightsStore: add new role 'Collaborator'
2023-02-22 15:36:34 +03:00
1c27a1276b
Web: Added import.
2023-02-22 15:31:33 +03:00
6ee6ce7d21
Web: Client: InvitePanel: Added descriptions
2023-02-22 15:16:45 +03:00
7fcdf899cf
Web: Notifications: Changed styles to match layouts.
2023-02-22 15:07:34 +03:00
Timofey Boyko
3373b84bd9
Web:Client:UsersStore: fix user context menu
2023-02-22 14:51:58 +03:00
Timofey Boyko
e60e6ce01d
Web:Client:UsersStore: fix user list
2023-02-22 14:40:44 +03:00
Timofey Boyko
cfd53207a1
Web:Client:UsersStore: update with new role and type
2023-02-22 14:08:17 +03:00
5784da44ca
Fixed Bug 61315 - Files.Convert. Fixed duplicate files in the list after conversion
2023-02-22 14:07:29 +03:00
Timofey Boyko
9b08b4f4f8
Web:Client:Article: delete useless code and change collaborator icon
2023-02-22 13:43:10 +03:00
Timofey Boyko
5a5b63d099
Web:Client:Header: remove custom checks and add security
2023-02-22 13:36:35 +03:00
Timofey Boyko
df968b758e
Web:Client:Article: remove custom check for disabled state
2023-02-22 12:58:53 +03:00
94b871dd70
Merge pull request #1234 from ONLYOFFICE/bugfix/empty-images-size
...
bugfix/empty-images-size
2023-02-22 13:45:45 +04:00
Viktor Fomin
5dd19ad757
Client: InfoPanel: fix images size
2023-02-22 12:42:53 +03:00
Timofey Boyko
0e388d4407
Web:Client: delete useless store
2023-02-22 12:29:57 +03:00
Timofey Boyko
396cb474b1
Web:Client:Article: fix disable state for main button and fix for new user type
2023-02-22 12:27:30 +03:00
c7bfe8e1cf
Web:Client:Add runInAction.
2023-02-22 12:22:29 +03:00
5f10f28b0d
Merge branch 'feature/multi-file-upload' of github.com:ONLYOFFICE/AppServer into feature/multi-file-upload
2023-02-22 12:11:23 +03:00
3ec8038046
Web: Files: fixed upload
2023-02-22 12:11:19 +03:00
992613b03e
Merge branch 'feature/open-location' of github.com:ONLYOFFICE/AppServer into feature/open-location
2023-02-22 11:59:06 +03:00
ebb7a26004
Web:Client:Fixed numeric id conversion for third-party files since they can be strings.
2023-02-22 11:58:56 +03:00
7ff895a739
Merge branch 'develop' into feature/multi-file-upload
2023-02-22 12:58:44 +04:00
94698a0794
Web: Files: fixed upload
2023-02-22 11:45:50 +03:00
8a879e2bb1
Merge branch 'develop' into feature/open-location
2023-02-22 12:25:52 +04:00
c6f46c044a
Merge pull request #1231 from ONLYOFFICE/bugfix/Bug-61327
...
Bugfix/Fixed Bug 61327 - Files.Search. Horizontal scroll on the Search Options panel, if the Author has selected a user with a high level of characters in the name in the group of elements.
2023-02-22 12:13:27 +04:00
d22ed67065
Merge pull request #1229 from ONLYOFFICE/bugfix/delete-extra-group-search
...
Fixed Bug 61280 - Web: Client: added a check for the trash section to…
2023-02-22 12:11:48 +04:00
Timofey Boyko
97dead7a73
Web:Common:Article: hide accounts for collaborator
2023-02-22 10:44:51 +03:00
b630ec1041
Merge branch 'develop' into feature/browserlist
2023-02-22 10:12:11 +03:00
Timofey Boyko
069c79485c
Web:Client:Profile: add truncate and change width for long user name
2023-02-21 18:04:26 +03:00
bff91bed95
Web: Files: fixed folders upload
2023-02-21 17:15:52 +03:00
0cdd727b1e
Web: Files: Fixed Bug 61274 - Files. ‘Something went wrong’ when going to My Documents after opening the Info panel in the Recycle Bin.
2023-02-21 14:28:48 +03:00
449d0c64c5
Merge branch 'develop' into feature/browserlist
2023-02-21 13:55:50 +03:00
9cb5022d0b
Merge pull request #1226 from ONLYOFFICE/bugfix/trash-room-title
...
Fixed Bug 61270 - Web: Client: added a dash if there is no title in t…
2023-02-21 14:38:13 +04:00
Mushka Nikita
c080e352b0
fixed sortButton in trash lacking sorting options
2023-02-21 13:35:48 +03:00
Mushka Nikita
90c40d83a1
changed getTitleWithoutExst method to now return exsts if title is empty
2023-02-21 13:23:59 +03:00
DmitrySychugov
fbbc2af27a
Fixed Bug 61280 - Web: Client: added a check for the trash section to the condition
2023-02-21 15:22:00 +05:00
Mushka Nikita
b51bfb2450
fixed info-panel accounts title component
2023-02-21 13:09:24 +03:00
b362851047
Fix Bug 61275 - Files.Trash.Info. Extra separator line in the file menu in the Info panel.
2023-02-21 13:46:38 +04:00
Vladimir Khvan
0e281fe82d
webhooks list component was created
2023-02-21 13:30:49 +05:00
Vladimir Khvan
346347cd14
tabel component was created
2023-02-21 13:30:23 +05:00
Vladimir Khvan
51eaf68eff
success badge was created
2023-02-21 13:29:54 +05:00
Vladimir Khvan
0f6e26b92f
info component was created
2023-02-21 13:29:10 +05:00
Vladimir Khvan
d00d33f5b6
styled components were re-exported
2023-02-21 13:28:54 +05:00
Vladimir Khvan
88069aa21b
fail badge component was created
2023-02-21 13:28:29 +05:00
Vladimir Khvan
61fdaf2f3e
modal dialog was copied
2023-02-21 13:28:07 +05:00
Vladimir Khvan
24da17f014
styled link was created
2023-02-21 13:27:44 +05:00
Vladimir Khvan
f0b13d3ecd
styled component for wrapper was created
2023-02-21 13:27:31 +05:00
Vladimir Khvan
13a4345518
styled component wfor infoText wasa created
2023-02-21 13:27:20 +05:00
Vladimir Khvan
6b403d8a4e
base webhooks page was created
2023-02-21 13:26:48 +05:00
Vladimir Khvan
742f0a26c2
sso loader was copied
2023-02-21 13:26:15 +05:00
Vladimir Khvan
328eb5869f
Javascript sdk was moved to separate folder
2023-02-21 13:25:59 +05:00
Vladimir Khvan
dfbdfafb97
submenu for js sdk and webhooks was added
2023-02-21 13:25:33 +05:00
Vladimir Khvan
2f42dc3564
developer tools routes were added
2023-02-21 13:24:49 +05:00
Viktor Fomin
9aba24e4e8
Client: PeopleSelector: fix translate, use dark image
2023-02-21 11:14:45 +03:00
Elyor Djalilov
4a1fdd0c3f
Web: PortalSettings: fix text reminding of unsaved changes
2023-02-21 13:05:26 +05:00
DmitrySychugov
0f34d4e9b8
Web: Client: replaced the component with a dash
2023-02-21 12:36:47 +05:00
Elyor Djalilov
d91cc4cc16
Web: PortalSettings: fix translate
2023-02-21 11:06:36 +05:00
