|
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 |
|
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 |
|
|
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 |
|