|
3ef14d6f22
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-12 10:00:10 +03:00 |
|
|
199e3faa65
|
Web: Components: Fixed styles.
|
2022-10-11 17:11:27 +03:00 |
|
|
c11e1e489d
|
Web: PortalSettings: Removed the touch selection.
|
2022-10-11 16:43:52 +03:00 |
|
|
4f9d126f73
|
Web: PortalSettings: Added missed prop.
|
2022-10-11 16:40:56 +03:00 |
|
|
0231a501c0
|
Web: Removed dialog duplication.
|
2022-10-11 16:39:26 +03:00 |
|
|
69c5a50fa9
|
Web: PortalSettings: Added missed prop.
|
2022-10-11 16:13:07 +03:00 |
|
|
c677d98627
|
Web: Client: InvitePanel: Fixed property name
|
2022-10-11 14:26:46 +03:00 |
|
|
32cca0377d
|
Web: Client: InvitePanel: Added checking errors after change items
|
2022-10-11 14:26:09 +03:00 |
|
TimofeyBoyko
|
0540e6fce7
|
Web:Client: add manager user type for DocSpace
|
2022-10-11 16:11:37 +05:00 |
|
TimofeyBoyko
|
e3b4979daa
|
Web:Common:Api: update user roles
|
2022-10-11 16:07:36 +05:00 |
|
TimofeyBoyko
|
d557354690
|
Web:Components:Avatar: add new role 'manager'
|
2022-10-11 15:22:11 +05:00 |
|
|
1515c95af4
|
Web: Fixed styles.
|
2022-10-11 13:03:55 +03:00 |
|
|
2f64da592e
|
Merge branch 'develop' into bugfix/backup
|
2022-10-11 12:52:13 +03:00 |
|
TimofeyBoyko
|
7a1ddd3c20
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-11 14:04:42 +05:00 |
|
|
a47ce3d8c0
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-11 11:58:25 +03:00 |
|
|
f013c74475
|
Web: Added additional units for measuring the amount of information, added verification.
|
2022-10-11 10:58:10 +03:00 |
|
|
cf2547e030
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/common/constants/index.js
|
2022-10-11 10:20:42 +03:00 |
|
|
0d7f77a18a
|
Merge pull request #897 from ONLYOFFICE/bugfix/accounts-filter
Bugfix/accounts filter
|
2022-10-11 10:12:57 +03:00 |
|
TimofeyBoyko
|
fe8b7ec257
|
Web:Client: add 'DocSpaceAdmin' translation key
|
2022-10-11 12:12:38 +05:00 |
|
TimofeyBoyko
|
4f03d67b58
|
Web:Client:InfoPanel: fix user role
|
2022-10-11 12:05:58 +05:00 |
|
TimofeyBoyko
|
da14ffd656
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-11 11:52:34 +05:00 |
|
mushka
|
09ece8865d
|
removed old unused methods
|
2022-10-11 09:51:21 +03:00 |
|
mushka
|
0da82b28eb
|
added mechanism of searcing an account on its link click
|
2022-10-10 19:41:09 +03:00 |
|
|
4dbf1e70b7
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.ActiveDirectory/GlobalUsings.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
|
2022-10-10 19:16:03 +03:00 |
|
mushka
|
0608694746
|
fixed account email text truncation
|
2022-10-10 18:47:33 +03:00 |
|
mushka
|
edb3f894f6
|
fixed selected folder path parts error
|
2022-10-10 18:38:52 +03:00 |
|
mushka
|
415c620574
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-10 17:27:16 +03:00 |
|
mushka
|
946c4a8408
|
selectionParentRoom setting mechanism fix
|
2022-10-10 17:21:43 +03:00 |
|
mushka
|
be3bb23144
|
fixed loader error in accounts
|
2022-10-10 17:19:19 +03:00 |
|
TimofeyBoyko
|
998c06d0ea
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-10 19:04:53 +05:00 |
|
TimofeyBoyko
|
2bafe2c590
|
Web:Client: disable 'Move to' button to the current folder
|
2022-10-10 18:59:28 +05:00 |
|
TimofeyBoyko
|
0e9ccf9f12
|
Web:Client: disable 'Move to' button to the current folder
|
2022-10-10 18:58:49 +05:00 |
|
TimofeyBoyko
|
cebab845cd
|
Merge branch 'develop' into bugfix/block-move-to-button
|
2022-10-10 18:32:19 +05:00 |
|
TimofeyBoyko
|
df103904d5
|
Web:Client:Components: disable move to button of selection panel body while loading folders tree
|
2022-10-10 18:20:28 +05:00 |
|
mushka
|
27d7f9678f
|
fixed openLocationAction not defined issue on opne file location from history
|
2022-10-10 16:14:49 +03:00 |
|
mushka
|
f6f6bd871e
|
fixed members blinking on room change
|
2022-10-10 16:02:36 +03:00 |
|
|
19e336f734
|
Web: Components: fixed combo-button
|
2022-10-10 15:57:38 +03:00 |
|
|
368a23fd4e
|
Web: Common: fixed action button styles, removed useless code
|
2022-10-10 15:11:43 +03:00 |
|
mushka
|
513f1aab67
|
deleted unused console.log
|
2022-10-10 15:01:44 +03:00 |
|
mushka
|
7551b5c271
|
fixed historyBlockMessage crashing on empty selection
|
2022-10-10 14:58:53 +03:00 |
|
mushka
|
36c6372a53
|
fixed issue with equal root folder and file ids
|
2022-10-10 14:57:42 +03:00 |
|
TimofeyBoyko
|
b6cf14f62e
|
Merge branch 'develop' into bugfix/accounts-filter
|
2022-10-10 14:57:56 +05:00 |
|
|
2414cc030c
|
Web: Client: InvitePanel: Fixes after merge
|
2022-10-10 12:37:02 +03:00 |
|
TimofeyBoyko
|
fe310ee9d4
|
Web:Common:FilterInput: fix combo-item styles
|
2022-10-10 14:29:16 +05:00 |
|
TimofeyBoyko
|
763d8ff860
|
Web:Common:Loaders: add support dark-theme for filter block loader
|
2022-10-10 14:11:05 +05:00 |
|
|
9be67022ab
|
Web: Deleted useless code.
|
2022-10-10 12:08:53 +03:00 |
|
|
770c414c93
|
Merge pull request #883 from ONLYOFFICE/bugfix/branding-loader
Bugfix/branding loader
|
2022-10-10 12:07:50 +03:00 |
|
|
734a03019a
|
Merge pull request #877 from ONLYOFFICE/feature/phone-input
Feature/phone input
|
2022-10-10 12:04:59 +03:00 |
|
|
8aa7d5d549
|
Web: Fixed errors connecting and disconnecting accounts.
|
2022-10-10 12:03:14 +03:00 |
|
TimofeyBoyko
|
9a831cd2bf
|
Web:Client: fix filter header translation key
|
2022-10-10 14:01:27 +05:00 |
|
TimofeyBoyko
|
09dbd9d088
|
Web: move translation key 'AdvancedFilter' from Files to Common
|
2022-10-10 13:53:24 +05:00 |
|
|
c908c0e0ea
|
Web: Added error message output.
|
2022-10-10 10:45:38 +03:00 |
|
|
4013f00115
|
Web: fixed context-menu height.
|
2022-10-10 10:39:09 +03:00 |
|
Elyor Djalilov
|
7f7b4c38df
|
Web: InputPhone: bugfix
|
2022-10-10 12:21:28 +05:00 |
|
|
1ea1cedb3b
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-10 09:32:13 +03:00 |
|
mushka
|
cd63f5c6d4
|
added mechanism that removes all left-out separators from context menu after show-info key deletion
|
2022-10-07 20:15:15 +03:00 |
|
mushka
|
1da45e8c3b
|
fixed rerendering on selectiong change visual issue
|
2022-10-07 18:49:31 +03:00 |
|
Elyor Djalilov
|
044494625f
|
Web: InputPhone: bugfix
|
2022-10-07 20:29:42 +05:00 |
|
mushka
|
5975024de1
|
removed unused code
|
2022-10-07 18:10:47 +03:00 |
|
mushka
|
969f104466
|
removed unused console.log
|
2022-10-07 17:55:00 +03:00 |
|
mushka
|
5cdcd122b8
|
fixed checkAndOpenLocationAction method
|
2022-10-07 17:54:51 +03:00 |
|
TimofeyBoyko
|
0af18bf639
|
Merge branch 'develop' into bugfix/context-menu-header
|
2022-10-07 19:32:45 +05:00 |
|
|
1c3571c259
|
Web: Fixed styles.
|
2022-10-07 17:28:29 +03:00 |
|
TimofeyBoyko
|
68fc4fb2d4
|
Web:Common:FilterInput: delete useless code
|
2022-10-07 19:24:56 +05:00 |
|
TimofeyBoyko
|
3fa401c790
|
Web:Components:Combobox: disable mobile view for low count of options
|
2022-10-07 19:24:39 +05:00 |
|
mushka
|
e1c2d82fb2
|
implemented new checkAndOpenLocationAction method to history view item list
|
2022-10-07 17:12:39 +03:00 |
|
mushka
|
92478ca4dc
|
coded out new filesActionsStore method to check given folder accesibility by its id and open it if it is or show warning if it isnt
|
2022-10-07 17:12:10 +03:00 |
|
mushka
|
1ece30bcdd
|
now folder label hiding mechanism work also with selected folders
|
2022-10-07 16:51:25 +03:00 |
|
mushka
|
44de9ce824
|
fixed noItem view appearing on viewDetails context click
|
2022-10-07 16:48:45 +03:00 |
|
mushka
|
f0c6c21030
|
fixed issue with items not appearing on viewDetails context click
|
2022-10-07 16:48:11 +03:00 |
|
mushka
|
7de3650533
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-07 16:21:59 +03:00 |
|
mushka
|
fe4b49f6cd
|
removed unused console.log
|
2022-10-07 16:08:07 +03:00 |
|
mushka
|
f120bad6e5
|
created and passed FilesItemTitle ref to pass to itemContextOtions
|
2022-10-07 16:00:27 +03:00 |
|
mushka
|
55db42473b
|
itemTitleContextOptions contextMenu now hides on selection change
|
2022-10-07 15:59:41 +03:00 |
|
mushka
|
a3b492333e
|
complete overhaul of itemContextOptions component, separated to contextOptions and ContextOptionsButton and fixed issue with sub-leafs
|
2022-10-07 15:58:55 +03:00 |
|
Elyor Djalilov
|
54f80ce4c7
|
bugfix
|
2022-10-07 17:17:52 +05:00 |
|
Elyor Djalilov
|
664d5480fd
|
Web: InputPhone: bugfix
|
2022-10-07 17:17:23 +05:00 |
|
|
8d5ac645e6
|
Web: Fixed scroll shift and page height reduction, moved logic to a common component.
|
2022-10-07 15:09:55 +03:00 |
|
mushka
|
98061910a8
|
cleaed up members view
|
2022-10-07 14:45:00 +03:00 |
|
mushka
|
75686e79a9
|
improved and fixed props passing in body component
|
2022-10-07 14:39:11 +03:00 |
|
mushka
|
941e317748
|
disabled folder label if item was created in selectedFolder
|
2022-10-07 14:38:51 +03:00 |
|
Elyor Djalilov
|
34f5c7b434
|
Web: InputPhone: changed mask of several countries
|
2022-10-07 15:59:12 +05:00 |
|
|
e19e7c9dc2
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-07 10:46:48 +03:00 |
|
|
c794e0443e
|
Web: Fixed hotkey border styles.
|
2022-10-07 10:40:55 +03:00 |
|
|
c6fd7f0621
|
Web: Removed the transition when clicking on a room in the archives.
|
2022-10-07 10:37:26 +03:00 |
|
mushka
|
ed594430aa
|
updated imports in details and histiory view
|
2022-10-06 20:18:50 +03:00 |
|
mushka
|
ffdbf54da8
|
added several new stores to infoPanelStore
|
2022-10-06 20:06:58 +03:00 |
|
mushka
|
4363a51ede
|
updated history view imports to infoPanelStore update
|
2022-10-06 20:06:39 +03:00 |
|
mushka
|
d66e6b21e0
|
updated historyBlockUser componenet to InfoPanelStore update
|
2022-10-06 20:06:05 +03:00 |
|
mushka
|
1268d8d806
|
refactored details ejection to its own component
|
2022-10-06 20:05:37 +03:00 |
|
mushka
|
92a7c8a426
|
updated details user links to new openUser functionality
|
2022-10-06 20:05:10 +03:00 |
|
mushka
|
8acd04d7b4
|
moved openUser and openAccounts functionality to userStore
|
2022-10-06 20:04:34 +03:00 |
|
mushka
|
6c33e0da3a
|
cleaned up details props
|
2022-10-06 19:03:59 +03:00 |
|
mushka
|
99e47c9add
|
fixed thumbnail visual error occuring on file creation
|
2022-10-06 19:03:44 +03:00 |
|
mushka
|
9131dfa55f
|
deleted isRoom prop from SubInfoPanelHeader component
|
2022-10-06 18:25:11 +03:00 |
|
mushka
|
f139b34b74
|
cleaned up InfoPanelHeaderLoader component code
|
2022-10-06 18:24:00 +03:00 |
|
mushka
|
ab562953e8
|
removed unused console.log
|
2022-10-06 18:22:07 +03:00 |
|
mushka
|
40173ec5cf
|
removed unused console.logs
|
2022-10-06 18:21:19 +03:00 |
|
mushka
|
f873ab210d
|
reverted changes in My/index.js file
|
2022-10-06 18:19:49 +03:00 |
|
mushka
|
cd720c57d7
|
removed unused commented code block
|
2022-10-06 18:14:07 +03:00 |
|
mushka
|
8eeca2c0b3
|
added exceptions to accountsHome headerMenu Info button
|
2022-10-06 18:12:51 +03:00 |
|
mushka
|
5ea610594b
|
added infoPanelToggle to accountsHome
|
2022-10-06 18:11:41 +03:00 |
|
Elyor Djalilov
|
0f5498f81d
|
Web: InputPhone: bug with style fixed
|
2022-10-06 20:07:49 +05:00 |
|
TimofeyBoyko
|
df17649b19
|
Web:Components:ContextMenu: fix header styles
|
2022-10-06 17:39:15 +03:00 |
|
TimofeyBoyko
|
f2a9985694
|
Web:Components: add header context menu for accounts
|
2022-10-06 17:33:26 +03:00 |
|
mushka
|
956f4e5099
|
removed unused console.log
|
2022-10-06 15:58:11 +03:00 |
|
mushka
|
1b80b97547
|
provided changeType method in peopleStore with a prop that prevents fetching users on call
|
2022-10-06 15:57:12 +03:00 |
|
mushka
|
328b1270c2
|
fixed context menu not updating after enabling/disabling user
|
2022-10-06 15:55:41 +03:00 |
|
mushka
|
7dbded977e
|
moved ejection to history view separetly and added imports
|
2022-10-06 15:55:09 +03:00 |
|
mushka
|
954b4d7941
|
removed unused console.log
|
2022-10-06 15:54:39 +03:00 |
|
mushka
|
c494b1f101
|
fixed bug on noItemAccounts view appearing after changing user role in members view
|
2022-10-06 15:54:25 +03:00 |
|
mushka
|
7557864d20
|
updated histoyBlockUser: added new functionality to onClick action
|
2022-10-06 15:51:42 +03:00 |
|
mushka
|
79930e419f
|
fixed translation in historyBlockMessage
|
2022-10-06 15:50:56 +03:00 |
|
mushka
|
94ce31fdf3
|
cleanded up InfoPanel/body
|
2022-10-06 15:50:23 +03:00 |
|
mushka
|
0e0902efc2
|
removed unused isRooms prop from Home page
|
2022-10-06 15:49:48 +03:00 |
|
|
ba6b92c7c2
|
Web: Added the ability to see alert in the article for administrators only.
|
2022-10-06 14:26:36 +03:00 |
|
|
8e7bf575ed
|
Web: Fixed translation (ru).
|
2022-10-06 14:17:52 +03:00 |
|
|
6bbf8a606a
|
Web: Fixed the display of the payer's avatar.
|
2022-10-06 14:15:38 +03:00 |
|
Elyor Djalilov
|
4aaa63543f
|
Web: InputPhone: bug with mask fixed
|
2022-10-06 15:54:19 +05:00 |
|
Elyor Djalilov
|
3a1333c4a7
|
Web: InputPhone: flag display fixed
|
2022-10-06 15:48:08 +05:00 |
|
TimofeyBoyko
|
5cfc7cf8d0
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-06 13:41:14 +03:00 |
|
Elyor Djalilov
|
85332ffbb4
|
Web: InputPhone: bug with mask fixed
|
2022-10-06 15:25:25 +05:00 |
|
TimofeyBoyko
|
46dc79c25c
|
Merge branch 'develop' into feature/change-name-context-options
|
2022-10-06 13:15:06 +03:00 |
|
TimofeyBoyko
|
b62d870f76
|
Web:Client:Accounts: add change name dialog action to context menu
|
2022-10-06 13:12:44 +03:00 |
|
TimofeyBoyko
|
a21f8986bc
|
Web:Client: move save logic from profile to change name dialog
|
2022-10-06 13:12:13 +03:00 |
|
|
e833fd227f
|
Web: Client: fixed article selected node for portal settings
|
2022-10-06 12:44:40 +03:00 |
|
|
19bfd19966
|
Web: Client: fixed article selected node for profile
|
2022-10-06 12:42:38 +03:00 |
|
|
37f8589603
|
Web: Components: fixed combobox styles
|
2022-10-06 12:41:30 +03:00 |
|
|
8c1456d19a
|
Merge branch 'develop' into feature/stripe
|
2022-10-06 12:14:57 +03:00 |
|
Elyor Djalilov
|
d0f625d4f1
|
Web: InputPhone: bug with validate fixed
|
2022-10-06 11:31:02 +05:00 |
|
Elyor Djalilov
|
2c71e239b1
|
Web: PhoneInput: added prop scaled
|
2022-10-05 19:19:50 +05:00 |
|
Elyor Djalilov
|
84f1167c49
|
Web: InputPhone: bug with validate fixed
|
2022-10-05 19:10:15 +05:00 |
|
Elyor Djalilov
|
1faa5500af
|
Web: PhoneInput: bug with validate fixed
|
2022-10-05 18:42:23 +05:00 |
|
Elyor Djalilov
|
62f5945efd
|
Web: InputPhone: bug with style fixed
|
2022-10-05 18:24:17 +05:00 |
|
|
71b65bd693
|
Web: Files: fixed hotkeys border
|
2022-10-05 16:23:34 +03:00 |
|
|
d37a6068fc
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-05 15:04:24 +03:00 |
|
Elyor Djalilov
|
2c2419d983
|
Web: PhoneInput: bugfix with prefix
|
2022-10-05 16:36:34 +05:00 |
|
|
412e7298cf
|
Merge branch 'develop' into feature/stripe
|
2022-10-05 14:00:39 +03:00 |
|
|
0173ec2d9a
|
Web: Files: fixed remove folders
|
2022-10-05 13:39:59 +03:00 |
|
|
d3d4ff6639
|
Web: Fixed description of grace period.
|
2022-10-05 13:34:59 +03:00 |
|
|
dd730aded3
|
Web: Files: fixed removeFiles
|
2022-10-05 13:30:41 +03:00 |
|
|
a2fb5e4b36
|
Web: Changed translations for grace period.
|
2022-10-05 13:26:45 +03:00 |
|
TimofeyBoyko
|
62c1acb5e4
|
Web:Components:DropDownIten: fix dark theme for icon with rect fill
|
2022-10-05 13:02:34 +03:00 |
|
TimofeyBoyko
|
73fa50cc46
|
Web:Client: fix icon for debug button and about button of profile context menu
|
2022-10-05 12:48:42 +03:00 |
|
TimofeyBoyko
|
089a5fa760
|
Web:Client: fix icon for room-info of context menu
|
2022-10-05 12:46:41 +03:00 |
|
TimofeyBoyko
|
92841e9df0
|
Merge branch 'develop' into bugfix/branding-loader
|
2022-10-05 12:36:54 +03:00 |
|
|
2b001f56d6
|
Web: Added transparency when a component is unavailable.
|
2022-10-05 12:18:25 +03:00 |
|
|
c3c64d847c
|
Web: removed useless translations.
|
2022-10-05 11:55:15 +03:00 |
|
|
11479c14ba
|
Web: Added missing translations.
|
2022-10-05 11:35:40 +03:00 |
|
|
84c8749e4f
|
Web: Changed translations.
|
2022-10-05 10:58:10 +03:00 |
|