TimofeyBoyko
|
2743653a66
|
Web:Client:ChangeUserStatusDialog: fix for info-panel
|
2022-10-19 16:29:56 +05:00 |
|
TimofeyBoyko
|
10256c09c6
|
Web:Client:UsersStore: update logic peopleList and updateUserStatus methods
|
2022-10-19 16:29:33 +05:00 |
|
TimofeyBoyko
|
7f35f9abc1
|
Web:Client:AccountsContextOptionsStore: add change status dialog to enable and disable actions
|
2022-10-19 16:28:26 +05:00 |
|
TimofeyBoyko
|
faf7926cb8
|
Web:Client:AccountsHome: delete useless code
|
2022-10-19 15:30:46 +05:00 |
|
TimofeyBoyko
|
10e3db39c8
|
Web:Client:AccountsHome: fix empty displayName
|
2022-10-19 15:22:21 +05:00 |
|
mushka
|
2a52c0b251
|
Merge branch 'develop' into feature/room-thirdparty-update
|
2022-10-19 13:22:09 +03:00 |
|
TimofeyBoyko
|
ca3d1f7827
|
Web:Client:PeopleStore: add onChangeStatus and changeStatus actions
|
2022-10-19 15:18:54 +05:00 |
|
TimofeyBoyko
|
fba0086706
|
Web:Client:Dialogs: refactoring ChangeUserStatusDialog
|
2022-10-19 15:18:22 +05:00 |
|
TimofeyBoyko
|
7cecdcffaa
|
Web:Client:SelectionPeopleStore: change return value for getUsersToActivate and getUsersToDisable
|
2022-10-19 15:17:44 +05:00 |
|
Viktor Fomin
|
b4bf23faaa
|
Login: delete useless
|
2022-10-19 15:08:20 +05:00 |
|
Viktor Fomin
|
1e95d56732
|
Merge branch 'develop' into bugfix/login
|
2022-10-19 14:30:04 +05:00 |
|
|
59997d1d2c
|
Web: Files: fixed selector-add-button theme styles
|
2022-10-19 12:29:01 +03:00 |
|
mushka
|
f9e1fe138c
|
cleaned up code from unused imports and leftover comments
|
2022-10-19 04:09:50 +03:00 |
|
mushka
|
8a8a415bcc
|
disabled isPrivate param
|
2022-10-19 04:01:39 +03:00 |
|
mushka
|
e963c367d5
|
renamed isSaveThirdpartyAccount var in roomParams
|
2022-10-19 04:01:03 +03:00 |
|
mushka
|
953fe1af6a
|
removed unused console.logs
|
2022-10-19 03:55:49 +03:00 |
|
mushka
|
f7a5b294d1
|
fix thirdpartyComboBox spelling
|
2022-10-19 03:55:33 +03:00 |
|
TimofeyBoyko
|
4618cafeba
|
Web:Client: move disableDrag from 'Home' to 'FilesStore'
|
2022-10-18 20:46:39 +05:00 |
|
TimofeyBoyko
|
4f266d497e
|
Web:Files:HOCs: disable drag into folder at trash
|
2022-10-18 20:43:10 +05:00 |
|
TimofeyBoyko
|
069c86618c
|
Web:Client:Home: disable drag and drop for trash, recent, favorites folders
|
2022-10-18 20:27:02 +05:00 |
|
TimofeyBoyko
|
b4ba9140e0
|
Merge branch 'develop' into bugfix/shared-drag-n-drop
|
2022-10-18 20:19:32 +05:00 |
|
TimofeyBoyko
|
3df5d383ea
|
Web:Client:Home: delete useless code
|
2022-10-18 20:07:28 +05:00 |
|
TimofeyBoyko
|
1b5b91d450
|
Web:Client:Home: fix active drag styles for rooms for tile view
|
2022-10-18 20:04:21 +05:00 |
|
TimofeyBoyko
|
5b912d76f7
|
Web:Client:Home: fix active drag styles for rooms for row view
|
2022-10-18 19:48:49 +05:00 |
|
TimofeyBoyko
|
3bc60b0cff
|
Web:Client:Home: fix drag styles for rooms
|
2022-10-18 19:33:37 +05:00 |
|
|
cf8c59f93b
|
Web: Fixed styles.
|
2022-10-18 16:57:21 +03:00 |
|
|
711b83b567
|
Web: Returned display of account information.
|
2022-10-18 16:53:50 +03:00 |
|
TimofeyBoyko
|
c37ebdc0f4
|
Web:Components:MainButtonMobile: delete useless code
|
2022-10-18 18:23:34 +05:00 |
|
TimofeyBoyko
|
6f344f80e9
|
Web:Components:MainButtonMobile: add cursor
|
2022-10-18 18:22:35 +05:00 |
|
TimofeyBoyko
|
950dc4c50f
|
Merge branch 'develop' into bugfix/error-alert
|
2022-10-18 17:51:53 +05:00 |
|
|
33875234ad
|
Web: Files: fixed delete-dialog text
|
2022-10-18 14:45:47 +03:00 |
|
|
bc7053cf8b
|
Web: Files: fixed folder deletion toast
|
2022-10-18 14:28:23 +03:00 |
|
|
a0128b4e59
|
Web: Files: fixed folder deletion
|
2022-10-18 14:27:52 +03:00 |
|
TimofeyBoyko
|
b12ba06731
|
Web:Client:Article: add onAlertClick and withAlertButton for shared main button
|
2022-10-18 16:06:43 +05:00 |
|
TimofeyBoyko
|
ab7a8c76d2
|
Web:Components:MainButtonMobile: add onAlertClick and withAlertClick props
|
2022-10-18 16:05:41 +05:00 |
|
Viktor Fomin
|
8013fd2d15
|
Merge branch 'develop' into bugfix/login
|
2022-10-18 15:58:41 +05:00 |
|
Viktor Fomin
|
c3243584d2
|
Login: use greeting title from settings
|
2022-10-18 15:58:32 +05:00 |
|
mushka
|
9e62fc8e45
|
added translation for root label
|
2022-10-18 13:14:06 +03:00 |
|
|
26d4e5427f
|
Merge pull request #923 from ONLYOFFICE/bugfix/file-conversion
Bugfix/file conversion
|
2022-10-18 13:10:16 +03:00 |
|
|
7b4e49c58f
|
Web: Removed adding a file to the list if a password was entered.
|
2022-10-18 12:48:56 +03:00 |
|
|
d8437330ec
|
Web: Added password verification.
|
2022-10-18 12:47:30 +03:00 |
|
TimofeyBoyko
|
c8049509f7
|
Web:Client:NavMenu: hide role icon for mobile vieww
|
2022-10-18 14:18:44 +05:00 |
|
Viktor Fomin
|
b21c9e079b
|
Login: add types
|
2022-10-18 13:58:15 +05:00 |
|
TimofeyBoyko
|
27b0b40903
|
Web:Components:Avatar: add hideRoleIcon prop
|
2022-10-18 13:53:42 +05:00 |
|
Viktor Fomin
|
c090b22b83
|
Login: fix style
|
2022-10-18 13:51:33 +05:00 |
|
mushka
|
3ac79e5cfb
|
removed unused console.logs
|
2022-10-18 11:45:52 +03:00 |
|
mushka
|
3281358cf5
|
temporarily disabled thirdpartyPath in editRoom permanent settings
|
2022-10-18 11:43:25 +03:00 |
|
mushka
|
bc25c51e8f
|
removed unused console.logs
|
2022-10-18 11:30:08 +03:00 |
|
mushka
|
bb759a32f9
|
onClose to createEvent naming revert
|
2022-10-18 11:25:45 +03:00 |
|
TimofeyBoyko
|
aeac81a9ee
|
Web:Client:Home: disable drag
drop for shared and archived
|
2022-10-18 13:10:33 +05:00 |
|
|
a5165d09cf
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-18 10:31:15 +03:00 |
|
mushka
|
59a1928c53
|
fixed state managing issue with ThirdpartyComboBox
|
2022-10-18 02:03:57 +03:00 |
|
mushka
|
84428c3874
|
updated creating room in thirdparty mechanism
|
2022-10-18 02:03:20 +03:00 |
|
mushka
|
5fca207cde
|
added onSelectTreeNode to SelectFolderDialog for getting chosen tree node on save button click
|
2022-10-18 02:02:24 +03:00 |
|
mushka
|
da1d7bcafe
|
provided tree nodes in FolderTreeBody with path prop, which contains an array of its parents ids and titles
|
2022-10-18 02:00:30 +03:00 |
|
mushka
|
0c000387f3
|
added thirdparty folder selection functionality to storage locaiton param
|
2022-10-18 01:59:04 +03:00 |
|
mushka
|
235ddb6fe5
|
fixed props passing, importing and state-changing metods in thirdparty storage
|
2022-10-18 01:58:02 +03:00 |
|
mushka
|
b05b8c90af
|
passed room title to thirdparty storage
|
2022-10-18 01:57:02 +03:00 |
|
mushka
|
2f7f136705
|
renamed storageFolderId value in roomParams
|
2022-10-18 01:56:39 +03:00 |
|
mushka
|
3008e549c9
|
fixed some small translation issues with info panel
|
2022-10-18 01:55:45 +03:00 |
|
Viktor Fomin
|
e2770c3375
|
Login: add mobile header
|
2022-10-18 01:12:25 +05:00 |
|
Viktor Fomin
|
e3f786b255
|
Components: FormWrapper: add dark theme
|
2022-10-18 00:56:07 +05:00 |
|
TimofeyBoyko
|
f7903116bd
|
Web:Client:MainButton: fix download count when error
|
2022-10-17 20:58:53 +05:00 |
|
Viktor Fomin
|
3e5e818e04
|
Merge branch 'develop' into bugfix/login
|
2022-10-17 20:54:04 +05:00 |
|
Viktor Fomin
|
6586de55b6
|
Login: use color pattern
|
2022-10-17 20:53:57 +05:00 |
|
TimofeyBoyko
|
ce8921f5cb
|
Web:Components:MainButtonMobile: fix alert icon
|
2022-10-17 20:27:48 +05:00 |
|
TimofeyBoyko
|
6d0a501cf0
|
Web:Client:MainBar: fix
|
2022-10-17 19:50:29 +05:00 |
|
TimofeyBoyko
|
3d358a53b3
|
Web:Components:Snackbar: fix mobile view
|
2022-10-17 19:46:28 +05:00 |
|
TimofeyBoyko
|
29d99f7ba3
|
Web:Client:Profile: fix width and height for send again button
|
2022-10-17 19:31:14 +05:00 |
|
TimofeyBoyko
|
9f226d657a
|
Web:Common:UserStore: fix withActivationBar
|
2022-10-17 19:24:03 +05:00 |
|
TimofeyBoyko
|
56e8febc4f
|
Web:Client:MainBar: fix
|
2022-10-17 19:20:01 +05:00 |
|
TimofeyBoyko
|
271840ab4a
|
Web:Common:CurrentQuotaStore: add check for existing
|
2022-10-17 18:43:59 +05:00 |
|
TimofeyBoyko
|
f3cbe39b8a
|
Web:Common:CurrentQuotaStore: add check for existing
|
2022-10-17 18:39:11 +05:00 |
|
|
d0fbe74422
|
Merge branch 'feature/company-info-settings' of github.com:ONLYOFFICE/AppServer into feature/company-info-settings
|
2022-10-17 16:36:07 +03:00 |
|
|
c54d9ed962
|
Web:Client:Add disableButtons.
|
2022-10-17 16:35:55 +03:00 |
|
TimofeyBoyko
|
25e7101b6b
|
Merge branch 'develop' into feature/bar-quotas
|
2022-10-17 18:27:52 +05:00 |
|
|
d2847347c9
|
Web: InfoPanel: Added a fixed place for the icon.
|
2022-10-17 16:00:17 +03:00 |
|
|
4ec47248d3
|
Web: InfoPanel: Added a reset of information about the number of files if several were selected before.
|
2022-10-17 15:45:55 +03:00 |
|
TimofeyBoyko
|
43922a19d5
|
Merge branch 'develop' into feature/bar-quotas
|
2022-10-17 16:47:14 +05:00 |
|
TimofeyBoyko
|
f3d9653fd6
|
Web:Client: fix send again button of profile
|
2022-10-17 16:43:04 +05:00 |
|
Viktor Fomin
|
b9e36a98f6
|
Merge branch 'develop' into bugfix/login
|
2022-10-17 16:25:58 +05:00 |
|
TimofeyBoyko
|
d208b8c726
|
Web:Client:fix translation key
|
2022-10-17 16:22:31 +05:00 |
|
TimofeyBoyko
|
74ef5f61b7
|
Web:Client:MainBar: fix bar on load screen
|
2022-10-17 16:19:44 +05:00 |
|
TimofeyBoyko
|
54b7f99f8e
|
Merge branch 'develop' into feature/bar-quotas
|
2022-10-17 16:06:33 +05:00 |
|
TimofeyBoyko
|
dffd471f10
|
Web:Client:MainBar: add new bars for quotas and confirm email
|
2022-10-17 16:02:31 +05:00 |
|
TimofeyBoyko
|
d6459403a5
|
Web:Common:UserStore: delete useless code
|
2022-10-17 16:02:09 +05:00 |
|
TimofeyBoyko
|
df2630ca47
|
Web:Common:CurrentQoutaStore: add showRoomQuotaBar and showStorageQuotaBar
|
2022-10-17 16:01:51 +05:00 |
|
TimofeyBoyko
|
e5ab98c0d9
|
Web:Client: add new translation key for main bar
|
2022-10-17 16:01:12 +05:00 |
|
|
e4dadcd839
|
Web: Files: fixed the selected node for article
|
2022-10-17 13:24:44 +03:00 |
|
|
552a7a7b78
|
Web: Files: fixed empty-screen jumps
|
2022-10-17 13:14:57 +03:00 |
|
|
a7da0790af
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-17 12:57:40 +03:00 |
|
|
7c3c6f8cc8
|
Web: Fixed styles for payer information.
|
2022-10-17 11:17:15 +03:00 |
|
|
9d7c8248bd
|
Web: PortalSettings: Added adaptive design when changing the width of the section.
|
2022-10-17 11:06:27 +03:00 |
|
|
1fac4168fe
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-17 11:02:59 +03:00 |
|
TimofeyBoyko
|
b1d63436cc
|
Merge branch 'develop' into feature/bar-quotas
|
2022-10-17 11:53:38 +05:00 |
|
TimofeyBoyko
|
b3395efe50
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-17 11:45:25 +05:00 |
|
Viktor Fomin
|
4645d3ef9e
|
Client: PortalSettings: fix tree
|
2022-10-15 14:04:40 +05:00 |
|
Viktor Fomin
|
4544621c41
|
fix after merge
|
2022-10-15 14:00:55 +05:00 |
|
|
8146e9aef4
|
Merge branch 'develop' into feature/portal-deactivation
|
2022-10-15 13:43:10 +05:00 |
|
|
d577f7bc35
|
Web: Client: InvitePanel: Temporarily hidden "Share via" button for external link
|
2022-10-14 17:47:18 +03:00 |
|
|
d82f3b81ef
|
Web:Client:Add companyInfoSettingsIsDefault.
|
2022-10-14 17:38:06 +03:00 |
|
|
9a21f36b1f
|
Web:Client:Add additionalResourcesIsDefault, fix styles.
|
2022-10-14 17:37:07 +03:00 |
|
|
5d34362267
|
Web:Client:Delete defaultWelcomePageSettings, hasСhangeDefault, onChangeDefault. Add greetingSettingsIsDefault.
|
2022-10-14 17:29:48 +03:00 |
|
|
516cb91846
|
Web:Common:Add getGreetingSettingsIsDefault.
|
2022-10-14 17:27:14 +03:00 |
|
|
c79b525da3
|
Web:Client:Add additionalResourcesIsDefault, companyInfoSettingsIsDefault, greetingSettingsIsDefault, getGreetingSettingsIsDefault, setAdditionalResourcesIsDefault, setCompanyInfoSettingsIsDefault.
|
2022-10-14 17:26:54 +03:00 |
|
|
88e78f6695
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-14 17:18:56 +03:00 |
|
|
32558c4756
|
Merge pull request #910 from ONLYOFFICE/bugfix/payments-page
Bugfix/payments page
|
2022-10-14 17:04:42 +03:00 |
|
|
362e89af69
|
Web: Client: InvitePanel: Fixed item AccessComboBox padding
|
2022-10-14 15:07:36 +03:00 |
|
|
95207cb1d9
|
Web: Client: InvitePanel: Added save edit on enter press
|
2022-10-14 14:49:16 +03:00 |
|
|
f9ec5869cd
|
Web: Client: InvitePanel: Added information messages
|
2022-10-14 14:35:29 +03:00 |
|
|
77e9e97451
|
Web: Client: InvitePanel: Added adding element when pressing Enter for new elements. Fixed input clear after selecting item from list
|
2022-10-14 13:29:10 +03:00 |
|
|
ee689dac6d
|
Web: Client: InvitePanel: Hide share via button if not active
|
2022-10-14 13:25:18 +03:00 |
|
Viktor Fomin
|
c82f6dbc03
|
Login: fix color
|
2022-10-14 14:22:15 +05:00 |
|
Viktor Fomin
|
eed9835e8f
|
Components: IconButton: fix
|
2022-10-14 14:22:07 +05:00 |
|
|
7ba126f049
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-14 12:15:55 +03:00 |
|
|
d98234885e
|
Web: Added a place for the icon to avoid jumps.
|
2022-10-14 12:05:25 +03:00 |
|
|
657c737d3c
|
Web: Added a check for the existence of an object.
|
2022-10-14 11:52:30 +03:00 |
|
|
c860447909
|
Web: Deleted useless code.
|
2022-10-14 11:33:01 +03:00 |
|
|
b55107dffd
|
Web: Added information update when connecting via dialog.
|
2022-10-14 11:31:40 +03:00 |
|
|
6b183f2ddb
|
Web: Components: Added verification.
|
2022-10-14 10:57:57 +03:00 |
|
|
bccfb8ca1c
|
Web: Fixed display of selected items.
|
2022-10-14 10:54:05 +03:00 |
|
Viktor Fomin
|
5f2ac4ed3a
|
Merge branch 'develop' into bugfix/login
|
2022-10-14 12:35:10 +05:00 |
|
TimofeyBoyko
|
470c100e2f
|
Merge branch 'develop' into feature/bar-quotas
|
2022-10-14 12:26:16 +05:00 |
|
TimofeyBoyko
|
e1ad515e6b
|
Web:Client:UsersStore: fix access rights for room admin
|
2022-10-14 12:16:06 +05:00 |
|
|
b5d960cc05
|
Web:Client:Add fetchThirdPartyProviders.
|
2022-10-13 19:06:59 +03:00 |
|
|
1a3f0464af
|
Web:Client:Fix.
|
2022-10-13 18:56:33 +03:00 |
|
|
33847ab850
|
Web:Components:Add connectItems from thirdPartyStore.
|
2022-10-13 18:54:40 +03:00 |
|
|
e80cc33dfb
|
Merge branch 'feature/room-thirdparty-update' into feature/shared-redesign-third-party
|
2022-10-13 18:51:45 +03:00 |
|
|
b8844b644f
|
Web:Client:Change isDesktop to isMobile.
|
2022-10-13 18:02:46 +03:00 |
|
TimofeyBoyko
|
bbfd7b98ec
|
Web:Client:ChangeUserTypeDialog: fix user list after cancel
|
2022-10-13 19:57:39 +05:00 |
|
mushka
|
6055e4db6b
|
Merge branch 'develop' into feature/room-thirdparty-update
|
2022-10-13 17:56:39 +03:00 |
|
TimofeyBoyko
|
6eda3b0d89
|
Web:Common:Constants: add new employee types
|
2022-10-13 19:46:38 +05:00 |
|
TimofeyBoyko
|
6a8ce64942
|
Web:Client:Accounts: fix role for row view
|
2022-10-13 19:43:54 +05:00 |
|
mushka
|
7b25edd7d0
|
added mechanism of deleting thirdparty connection on with room creation if isThirdparty param not chosen
|
2022-10-13 17:40:47 +03:00 |
|
mushka
|
d9639f8971
|
added mechanism of deleting thirdparty connection on room creation cancelling
|
2022-10-13 17:39:24 +03:00 |
|
mushka
|
05838f3bc5
|
added mechanism of deleting thirdparty connection on provider change
|
2022-10-13 17:39:00 +03:00 |
|
mushka
|
43c3a05126
|
imporved props passing in ThirdPartyStorage index file
|
2022-10-13 17:38:31 +03:00 |
|
TimofeyBoyko
|
26d92c7da3
|
Web:Client:Store: refactoring selectio people store
|
2022-10-13 19:16:34 +05:00 |
|
TimofeyBoyko
|
32994832e4
|
Web:Client:EmptyContainer: add new translaton key for free user at shared empty page
|
2022-10-13 19:14:20 +05:00 |
|
TimofeyBoyko
|
17e6a50500
|
Web:Client:Article: delete useless code
|
2022-10-13 19:09:54 +05:00 |
|
TimofeyBoyko
|
84da70d63f
|
Web:Client:Accounts: refactoring context menu for room admin
|
2022-10-13 19:07:44 +05:00 |
|
|
3b5491065a
|
Web:Client:Fix after merge.
|
2022-10-13 17:05:36 +03:00 |
|
TimofeyBoyko
|
b5b96054c9
|
Web:Client:Accounts: fix empty displayName
|
2022-10-13 18:13:19 +05:00 |
|
|
41994df60d
|
Web:Client:Fix after merge.
|
2022-10-13 16:08:49 +03:00 |
|
|
28d918464f
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-13 15:48:31 +03:00 |
|
TimofeyBoyko
|
b8d16a3751
|
Web:Client:ChangeUserStatusDialog: delete useless code
|
2022-10-13 17:39:14 +05:00 |
|
TimofeyBoyko
|
d371388e07
|
Web:Client:Accounts: fix users for disabled
|
2022-10-13 17:38:57 +05:00 |
|
TimofeyBoyko
|
32aefa989f
|
Web:Client:Article: hide Files header when Recent and Favorites not allowed
|
2022-10-13 17:27:14 +05:00 |
|
TimofeyBoyko
|
81bc4c8718
|
Web:Client:Accounts: change room admins rights for disable and remove users
|
2022-10-13 17:18:46 +05:00 |
|
|
0633004756
|
Web: Added array search.
|
2022-10-13 15:18:12 +03:00 |
|
mushka
|
31994bcfda
|
uipdated props passing in CreateRoomDialog
|
2022-10-13 15:15:31 +03:00 |
|
mushka
|
d36d9a7596
|
moved store injects to ThirdpartyStorege/index.js
|
2022-10-13 15:14:57 +03:00 |
|
mushka
|
3b32f8c978
|
updaed oAuth autentification - now works without middleman modal window
|
2022-10-13 15:14:28 +03:00 |
|
mushka
|
5fc1ec252d
|
started moving imports for thirdparty manipulation to ThirdpartyStorega/index.js
|
2022-10-13 15:13:42 +03:00 |
|
mushka
|
319d842312
|
fixed MakeRoomPrivateLimitationsWarningDescription translate key in russian
|
2022-10-13 15:12:58 +03:00 |
|
|
1ce5b32bae
|
Web: Added waiting for new information from the quota.
|
2022-10-13 15:07:36 +03:00 |
|
|
3bd63b26fe
|
Web: Added new translations.
|
2022-10-13 15:06:51 +03:00 |
|
TimofeyBoyko
|
3d16c8745d
|
Web:Client:EmptyContainer: hide Go to personal button for free user
|
2022-10-13 16:23:55 +05:00 |
|
|
8ccdde14e3
|
Web:Components:Fix styles third-party-tag.
|
2022-10-13 14:18:26 +03:00 |
|
|
874ccca0af
|
Web:Client:Add size in getThirdPartyIcon.
|
2022-10-13 14:17:54 +03:00 |
|
|
f4bf6a9af5
|
Web:Client:Add second argument size in getThirdPartyIcon.
|
2022-10-13 14:17:25 +03:00 |
|
|
73fa3205e2
|
Web:Client:Add small icon thirdParty.
|
2022-10-13 14:16:27 +03:00 |
|
|
e76efb6f43
|
Web:Client:Fix.
|
2022-10-13 13:56:45 +03:00 |
|
TimofeyBoyko
|
28b202da04
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-13 15:43:53 +05:00 |
|
|
efde1f00a9
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-13 13:37:05 +03:00 |
|
TimofeyBoyko
|
e56b10d1e5
|
Web:Client: move 'Room admin' and 'DocSpace admin' translation keys to common
|
2022-10-13 15:35:58 +05:00 |
|
|
f59b13cfb8
|
Web:Client:Fix last section, fix showing title when there is no content.
|
2022-10-13 13:33:30 +03:00 |
|
|
4302361963
|
Web: Client: fixed header styles
|
2022-10-13 12:52:11 +03:00 |
|
|
db926fee0e
|
Web: Files: fixed header context-menu
|
2022-10-13 12:51:40 +03:00 |
|
TimofeyBoyko
|
c05a18eff8
|
Web:Client:Accounts: fix group context menu
|
2022-10-13 14:43:24 +05:00 |
|
TimofeyBoyko
|
1b1252823a
|
Web:Components:TableContainer: fix drop down z-index for group menu item
|
2022-10-13 14:02:46 +05:00 |
|
TimofeyBoyko
|
1599a479dd
|
Web:Client:Accounts: fix context menu for pending user
|
2022-10-13 13:56:38 +05:00 |
|
|
e7c72598ee
|
Web:Client:Fix getProviderType, add RoomsProviderTypeName.
|
2022-10-13 11:56:33 +03:00 |
|
|
745554af03
|
Web:Common:Add RoomsProviderTypeName.
|
2022-10-13 11:55:54 +03:00 |
|
|
d084f53802
|
Web:Common:Fix props item.group.
|
2022-10-13 11:55:32 +03:00 |
|
TimofeyBoyko
|
2fce173ef3
|
Web:Client:Accounts: fix header menu options
|
2022-10-13 13:53:46 +05:00 |
|
TimofeyBoyko
|
3110b8dd9c
|
Web:Client:Accounts: fix change type from header menu
|
2022-10-13 13:23:28 +05:00 |
|
TimofeyBoyko
|
9441dc505e
|
Web:Client:Accounts: fix selection for room admin
|
2022-10-13 13:14:12 +05:00 |
|
TimofeyBoyko
|
7d0fe8d9bc
|
Web:Client:Files: delete useless code
|
2022-10-13 13:03:23 +05:00 |
|
TimofeyBoyko
|
c365bff254
|
Web:Client:UsersStore: add try catch for change type method
|
2022-10-13 13:01:34 +05:00 |
|
TimofeyBoyko
|
b9f4bb1e33
|
Web:Client: fix room admin access rights
|
2022-10-13 13:00:48 +05:00 |
|
TimofeyBoyko
|
bf9b084732
|
Web:Client:Article: delete useless code
|
2022-10-13 12:44:50 +05:00 |
|
TimofeyBoyko
|
20676d2cc9
|
Web:Client:ProfileActionsStore: return checkEnabledActions for profile menu
|
2022-10-13 12:22:39 +05:00 |
|
TimofeyBoyko
|
7f72382d32
|
Web:Client:Article: fix interface jumping after change files root folder to room
|
2022-10-13 12:22:09 +05:00 |
|
TimofeyBoyko
|
9750335b3e
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-13 11:45:31 +05:00 |
|
|
8e87ad705f
|
Web:Components:Add tag ReactSVG, add class third-party-tag.
|
2022-10-12 17:32:34 +03:00 |
|
|
7fe1fb4265
|
Web:Client:Change getThirdPartyIconSmall to getThirdPartyIcon.
|
2022-10-12 17:22:52 +03:00 |
|
|
cbbdb07b9c
|
Web:Client:Delete method getThirdPartyIconSmall.
|
2022-10-12 17:22:19 +03:00 |
|
|
08379aeaa3
|
Web:Client:Delete small icons.
|
2022-10-12 17:21:42 +03:00 |
|
TimofeyBoyko
|
3ac94b3440
|
Web:Client:Settings: fix common files settings for free user
|
2022-10-12 19:15:44 +05:00 |
|
TimofeyBoyko
|
919eb57cec
|
Web:Client:Article: hide main button for free user for all pages
|
2022-10-12 19:13:30 +05:00 |
|
|
71794c760b
|
Merge pull request #906 from ONLYOFFICE/bugfix/info-panel-in-recycle-bin-folder
Bugfix/info panel in recycle bin folder
|
2022-10-12 16:11:37 +03:00 |
|
|
d19639f7c0
|
Web: PortalSettings: Removed useless code after merge.
|
2022-10-12 16:04:05 +03:00 |
|
|
4d4a09d8e7
|
Web: The edit button has been removed.
|
2022-10-12 16:03:19 +03:00 |
|
TimofeyBoyko
|
a9f2815ca0
|
Web:Client:EmptyScreen: disable create room for free user
|
2022-10-12 18:01:21 +05:00 |
|
TimofeyBoyko
|
a66d3c3e15
|
Web:Client:Section: disable create room for free user
|
2022-10-12 17:58:16 +05:00 |
|
TimofeyBoyko
|
ae38e98de3
|
Web:Client:Files: disable trash route for free user
|
2022-10-12 17:55:28 +05:00 |
|
|
905e98450d
|
Web: Client: fixed header jumps
|
2022-10-12 14:59:41 +03:00 |
|
|
21628d2ef7
|
Web: fixed styles
|
2022-10-12 14:59:17 +03:00 |
|
TimofeyBoyko
|
4aa2c7d7b8
|
Web:Client:UsersStore: fix change admins method
|
2022-10-12 16:57:17 +05:00 |
|
|
ac6c60ad17
|
Web:Client:Add dependence providers in method getFilterData.
|
2022-10-12 14:42:18 +03:00 |
|
TimofeyBoyko
|
43e9806553
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-12 16:16:59 +05:00 |
|
TimofeyBoyko
|
a8233427b7
|
Web:Client:Profile: fix profile menu
|
2022-10-12 16:12:38 +05:00 |
|
TimofeyBoyko
|
c2752c0a59
|
Web:Client:Files: add /settings/admins for room admins
|
2022-10-12 16:12:14 +05:00 |
|
TimofeyBoyko
|
a09e4dab08
|
Web:Cliet:Accounnts: add available room admin invaite room admin
|
2022-10-12 15:53:54 +05:00 |
|
TimofeyBoyko
|
9899674836
|
Web:Client:Store: rework cotext menu at accounts
|
2022-10-12 15:51:08 +05:00 |
|
|
f5e3e09a00
|
Web:Client:Add correct translation "ThirdPartyResource".
|
2022-10-12 13:48:26 +03:00 |
|
|
c51e42f2f4
|
Web:Client:Delete wrong translation "ThirdPartyResource".
|
2022-10-12 13:47:43 +03:00 |
|
TimofeyBoyko
|
f7ec554482
|
Web:Client:Accounts: fix routes for room admins
|
2022-10-12 15:42:32 +05:00 |
|
TimofeyBoyko
|
b4c01612d3
|
Web:Client:Profile: fix back button for room admins
|
2022-10-12 15:42:05 +05:00 |
|
TimofeyBoyko
|
c97a5a5468
|
Web:Client:Article: fix files article header
|
2022-10-12 15:41:34 +05:00 |
|
TimofeyBoyko
|
bd396fb9af
|
Web:Common:PrivateRoute: fix restricted routes for room admins
|
2022-10-12 15:41:13 +05:00 |
|
|
7273fda06c
|
Web:Common:Add props label, group in SelectedItem.
|
2022-10-12 13:37:09 +03:00 |
|
|
0a87f8988d
|
Web:Client:Delete field isMultiSelect in thirdPartyOptions.
|
2022-10-12 13:35:49 +03:00 |
|
TimofeyBoyko
|
e0ae104453
|
Web:Client:Accounts: delete useless code
|
2022-10-12 14:31:58 +05:00 |
|
TimofeyBoyko
|
041c41892b
|
Web:Client:Accounts: fix dialog and methods for change user type
|
2022-10-12 14:30:58 +05:00 |
|
TimofeyBoyko
|
2605d6f2f5
|
Web:Client:Locales: add new translation key for 'ChangeUserTypeDialog'
|
2022-10-12 14:30:15 +05:00 |
|
TimofeyBoyko
|
3f1dc486b1
|
Web:Client:Accounts: disable change type for disabling users and fix status for user at info-panel
|
2022-10-12 13:17:00 +05:00 |
|
Viktor Fomin
|
ce1b77c2b1
|
Merge branch 'develop' into bugfix/login
|
2022-10-12 12:29:16 +05:00 |
|
|
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 |
|
|
6d78f37729
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-11 16:05:49 +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 |
|
Viktor Fomin
|
cd2acf9602
|
Login: fix button size
|
2022-10-11 14:38:05 +05: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 |
|
TimofeyBoyko
|
f91604d316
|
Merge branch 'develop' into feature/bar-quotas
|
2022-10-11 12:55:55 +05: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 |
|
|
7b3bd37f2c
|
Web:Client:Add method onClickReconnectStorage, add object "reconnect-storage" in optionsModel in getFilesContextOptions in ContextOptionsStore. Add props isConnectDialogReconnect, setIsConnectDialogReconnect, saveAfterReconnectOAuth, setSaveAfterReconnectOAuth in ConnectDialog. Add changeable header, add toastr in saveThirdParty in ConnectDialog.
|
2022-10-10 19:24:23 +03:00 |
|
|
c5bba6a596
|
Web:Client:Add setIsConnectDialogReconnect, setSaveAfterReconnectOAuth, saveAfterReconnectOAuth, isConnectDialogReconnect.
|
2022-10-10 19:16:40 +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 |
|
|
ec45c0b4c7
|
Web:Client:Add "reconnect-storage" in roomOptions.
|
2022-10-10 19:15:16 +03:00 |
|
|
16dc28d6b2
|
Web:Client:Moved getting connectItems to ThirdPartyStore.
|
2022-10-10 19:14:33 +03:00 |
|