Akmal Isomadinov
|
fe6ec38dff
|
Web:Common:Constants: Added FilterTypeKeys
|
2022-11-16 20:31:14 +05:00 |
|
|
|
8b9683022c
|
Update axiosClient.js
|
2022-11-16 18:00:41 +03:00 |
|
|
|
aaa9e706a6
|
Merge branch 'feature/new-viewer' of github.com:ONLYOFFICE/AppServer into feature/new-viewer
|
2022-11-16 19:57:39 +05:00 |
|
|
|
4daf49753d
|
Web: Common: fixed context menu padding
|
2022-11-16 19:51:55 +05:00 |
|
|
|
8f230bf0e6
|
Web: Common: fixed flipping from the keyboard
|
2022-11-16 19:50:55 +05:00 |
|
Viktor Fomin
|
893cc3f541
|
Common: move more login modal
|
2022-11-16 17:23:15 +05:00 |
|
|
|
0b22183c41
|
Web:Common:Fix button.
|
2022-11-16 14:26:04 +03:00 |
|
|
|
70eb7fe46e
|
Merge branch 'develop' into feature/new-viewer
|
2022-11-15 18:39:12 +03:00 |
|
|
|
bd38e39796
|
Addec temp origin to apitest.onlyoffice.io
|
2022-11-15 17:21:45 +03:00 |
|
|
|
4a313d77d6
|
Merge branch 'develop' into feature/api-origin
|
2022-11-15 16:00:39 +03:00 |
|
|
|
60c70fea1d
|
Merge pull request #1037 from ONLYOFFICE/bugfix/fix-rooms-badge-jumping
Bugfix/fix rooms badge jumping
|
2022-11-15 13:43:31 +03:00 |
|
TimofeyBoyko
|
93beb16763
|
Web:Common:ColorTheme: fix pin icon styles
|
2022-11-15 13:28:35 +03:00 |
|
|
|
7c0d97361d
|
Merge branch 'develop' into feature/Add-identifier-for-test
|
2022-11-15 10:38:41 +03:00 |
|
|
|
b3db2e5f3e
|
Update axiosClient.js
|
2022-11-14 19:46:07 +03:00 |
|
|
|
bea44696d1
|
Merge branch 'develop' into feature/new-viewer
|
2022-11-14 20:05:25 +05:00 |
|
|
|
8a909c33d2
|
Merge branch 'develop' into feature/api-origin
|
2022-11-14 17:17:14 +03:00 |
|
|
|
ec49254d56
|
Web:Common:Fix.
|
2022-11-14 17:06:27 +03:00 |
|
|
|
54ccbe0969
|
Web:Common:Fix toggleButton.
|
2022-11-14 17:02:20 +03:00 |
|
|
|
2b3d368a98
|
Web:Common:Fix theme.
|
2022-11-14 16:42:07 +03:00 |
|
|
|
78de751702
|
Web:Common:Fix buttons color theme.
|
2022-11-14 15:52:20 +03:00 |
|
|
|
2636ec0705
|
Web:Common:Fix accent color theme.
|
2022-11-14 15:51:53 +03:00 |
|
|
|
aa1915dc99
|
Web: Common: remove excess icons
|
2022-11-14 17:21:02 +05:00 |
|
|
|
ed8b2381d7
|
Web: Common: remove excess hammer event, added onFavorite func
|
2022-11-14 17:19:09 +05:00 |
|
Viktor Fomin
|
6b241edca6
|
Merge branch 'develop' into feature/new-profile-loader
|
2022-11-14 17:13:47 +05:00 |
|
Akmal Isomadinov
|
f96d664904
|
Web:Common:Components:Article:Sub-Components: Updated id
|
2022-11-14 15:38:32 +05:00 |
|
Akmal Isomadinov
|
c6ac0e417c
|
Web:Common:Components:Article:Sub-Components: Updated id
|
2022-11-14 15:19:03 +05:00 |
|
Akmal Isomadinov
|
94ea046a68
|
Web:Common:Components:Article:Sub-Components: Updated id
|
2022-11-14 15:15:51 +05:00 |
|
Akmal Isomadinov
|
8dda8926ee
|
Web:Common:Constants Added FolderNames constant
|
2022-11-14 15:04:50 +05:00 |
|
TimofeyBoyko
|
05de3adde7
|
Web:Common:Utirls: delete accessRights and add actions for rooms, files and accounts
|
2022-11-14 12:03:49 +03:00 |
|
Akmal Isomadinov
|
6dcc9cb541
|
Web:Common:Components:Dialogs:RecoverAccessModalDialog: Updated id
|
2022-11-14 13:04:18 +05:00 |
|
Akmal Isomadinov
|
d81ad1a7fe
|
Web:Common:Components:Article:Sub-Components:Article-Payment-Alert: Update id
|
2022-11-14 13:04:18 +05:00 |
|
Akmal Isomadinov
|
e37776195a
|
Web:Common:Components:Article:Sub-Components:Article-Hide-Menu-Button: Added identifiers to components
|
2022-11-14 13:04:18 +05:00 |
|
Akmal Isomadinov
|
bc942c568c
|
Web:Common:Components:Article:Sub-Components:Article-Profile: Added id
|
2022-11-14 13:04:18 +05:00 |
|
Akmal Isomadinov
|
23faa6f5ee
|
Web:Common:Components:Article:Sub-Components: Added id for test
|
2022-11-14 13:04:18 +05:00 |
|
Akmal Isomadinov
|
fe47936dfb
|
Web:Common:Components:Dialogs: Added ids to the RecoverAccessModalDialog components for the test
|
2022-11-14 13:04:17 +05:00 |
|
TimofeyBoyko
|
5f9a777c2d
|
Web:Common:AccessRights: rename getAccountsAccessRights to getAccountsRights
|
2022-11-14 10:36:51 +03:00 |
|
TimofeyBoyko
|
678f2f0629
|
Merge branch 'develop' into feature/accerss-rights-matrix
|
2022-11-14 10:30:19 +03:00 |
|
|
|
8da3deaa72
|
Added api_origin
|
2022-11-13 22:38:33 +03:00 |
|
Viktor Fomin
|
8c2fb8f8e8
|
Merge branch 'develop' into feature/new-profile-loader
|
2022-11-13 03:59:43 +05:00 |
|
|
|
75ca934448
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-11 22:22:40 +03:00 |
|
TimofeyBoyko
|
21a1c0c10d
|
Web:Common:Utils: fix get room rights
|
2022-11-11 17:34:39 +03:00 |
|
TimofeyBoyko
|
5e52c802df
|
Web:Common:Utils: add access rights matrix for accounts
|
2022-11-11 16:26:05 +03:00 |
|
TimofeyBoyko
|
5bbc75f8bf
|
Web:Common:Utils: add access rights matrix
|
2022-11-11 15:58:41 +03:00 |
|
|
|
8e54e59bec
|
Web: Common/Editor: Added a request for requests in advance.
|
2022-11-11 13:52:10 +03:00 |
|
|
|
724de88e94
|
Web: Common: Added skip requests.
|
2022-11-11 13:49:03 +03:00 |
|
Viktor Fomin
|
60852375ca
|
Common: Loaders: ProfileViewLoader: fix
|
2022-11-10 19:53:32 +05:00 |
|
|
|
ddc067f3f0
|
Web:Common:Fix theme.
|
2022-11-10 17:29:55 +03:00 |
|
Viktor Fomin
|
68a4e8cb7c
|
Merge branch 'develop' into feature/new-profile-loader
|
2022-11-10 18:45:22 +05:00 |
|
Viktor Fomin
|
559d995b2c
|
Common: Loaders: ProfileViewLoader: add mobile view
|
2022-11-10 18:45:09 +05:00 |
|
Viktor Fomin
|
719d0a7a12
|
Common: Loaders: ProfileViewLoader: redesign
|
2022-11-10 18:17:09 +05:00 |
|
|
|
564ec4457f
|
Web:Common:Add textColor in toggle button.
|
2022-11-10 15:33:19 +03:00 |
|
|
|
7652fb1d59
|
Web:Common:Add textColor in MainButton.
|
2022-11-09 22:37:28 +03:00 |
|
|
|
72063d86f3
|
Web:Client:Add textColor in FilterBlockItemTag theme.
|
2022-11-09 21:49:12 +03:00 |
|
|
|
096ececd57
|
Web:Common:Add textColor in tabsContainer theme.
|
2022-11-09 21:32:36 +03:00 |
|
|
|
e88b26d3dc
|
Web:Common:Fix.
|
2022-11-09 21:06:44 +03:00 |
|
|
|
1858af3380
|
Web:Common:Add textColor in StyledCircle.
|
2022-11-09 20:33:45 +03:00 |
|
|
|
05ae4683f3
|
Web:Common:Fix displayProgress.
|
2022-11-09 20:33:07 +03:00 |
|
|
|
68b200b3d8
|
Web:Common:Add isPaidBadge.
|
2022-11-09 20:27:43 +03:00 |
|
|
|
dbb724a936
|
Web:Common:Add textColor in FloatingButton.
|
2022-11-09 17:29:38 +03:00 |
|
|
|
a062181894
|
Merge pull request #1003 from ONLYOFFICE/bugfix/portal-deletion
Bugfix/portal deletion
|
2022-11-09 17:18:14 +03:00 |
|
Viktor Fomin
|
1ea6cdd82b
|
Merge branch 'develop' into feature/new-profile-loader
|
2022-11-09 19:15:28 +05:00 |
|
Viktor Fomin
|
f874e8586e
|
Merge branch 'develop' into bugfix/logo
|
2022-11-09 18:56:25 +05:00 |
|
Viktor Fomin
|
7bb4cc73b7
|
Common: Article: fix
|
2022-11-09 18:55:58 +05:00 |
|
|
|
0bc03cd148
|
Web:Common:Add textColor in Calendar.
|
2022-11-09 15:01:17 +03:00 |
|
|
|
cad00f6b06
|
Merge pull request #1002 from ONLYOFFICE/bugfix/fixed-tags
Web: Files: fixed tiles tags
|
2022-11-09 14:37:05 +03:00 |
|
|
|
0e8e019b22
|
Web:Common:Add textColor in VersionBadge.
|
2022-11-09 14:33:42 +03:00 |
|
TimofeyBoyko
|
cdd2b68324
|
Web:Common:Tags: fix advanced tag
|
2022-11-09 14:28:37 +03:00 |
|
|
|
65bc045fe7
|
Fix TypeError: Cannot read properties of null (reading '1')
|
2022-11-09 14:15:55 +03:00 |
|
|
|
8f6d197f7e
|
Web: Access to the portal deletion page is prohibited for anyone who is not the owner.
|
2022-11-09 14:07:59 +03:00 |
|
|
|
ce6188e960
|
Web:Common:Add textColor in badge.
|
2022-11-09 13:55:20 +03:00 |
|
|
|
5f49237046
|
Web:Common:Add textColor for button.
|
2022-11-09 13:54:54 +03:00 |
|
|
|
187c61df68
|
Web: Added a page for deleting the portal during the expired period.
|
2022-11-09 13:22:31 +03:00 |
|
Viktor Fomin
|
5eba23889a
|
Merge branch 'develop' into feature/new-profile-loader
|
2022-11-08 19:41:20 +05:00 |
|
|
|
7803b0e33c
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-08 16:54:02 +03:00 |
|
Viktor Fomin
|
d6ff6aa69a
|
Common: Loaders: ProfileViewLoader: redesign
|
2022-11-08 18:24:40 +05:00 |
|
|
|
cc64fc9887
|
Web: Files: fixed selectionParentRoom error
|
2022-11-08 14:11:17 +03:00 |
|
Viktor Fomin
|
adf7362477
|
Components: Loaders: SectionHeader: fix style
|
2022-11-07 17:42:13 +05:00 |
|
Viktor Fomin
|
657ccbb7c8
|
Common: Article: add support color scheme
|
2022-11-07 16:58:53 +05:00 |
|
Viktor Fomin
|
1cb56a31fe
|
Merge branch 'develop' into bugfix/smart-banner
|
2022-11-07 15:09:16 +05:00 |
|
|
|
d7abe3b9da
|
Merge pull request #963 from ONLYOFFICE/feature/whitelabel
Feature/whitelabel
|
2022-11-03 20:10:06 +03:00 |
|
mushka
|
1929d6630d
|
403 bug push
|
2022-11-03 19:35:55 +03:00 |
|
mushka
|
1a0a1e7988
|
fixed user context options and noItem view
|
2022-11-03 18:18:09 +03:00 |
|
mushka
|
b1413f5d02
|
cleaned up console.logs
|
2022-11-03 17:37:54 +03:00 |
|
mushka
|
83ecc297b8
|
Merge branch 'develop' into feature/info-panel-update
|
2022-11-03 17:09:41 +03:00 |
|
mushka
|
7ea5907259
|
fixed resend invitations api call and implemented it in members view
|
2022-11-03 17:06:13 +03:00 |
|
Viktor Fomin
|
027efa8e8b
|
Merge branch 'develop' into bugfix/smart-banner
|
2022-11-03 18:59:38 +05:00 |
|
Viktor Fomin
|
48c01a82fb
|
Web: revert
|
2022-11-03 18:41:59 +05:00 |
|
|
|
6dd55c2643
|
Web: Common: fixed article height
|
2022-11-03 15:46:56 +03:00 |
|
Viktor Fomin
|
67d6ce5378
|
Common: Article: fix size
|
2022-11-03 17:40:16 +05:00 |
|
mushka
|
bb16de4ed9
|
Merge branch 'develop' into feature/info-panel-update and solved merge conflict
|
2022-11-03 14:52:11 +03:00 |
|
Viktor Fomin
|
e512015e70
|
Common: Article: fix img size
|
2022-11-03 16:44:54 +05:00 |
|
Viktor Fomin
|
b8e2e49bd0
|
Merge branch 'develop' into feature/whitelabel
|
2022-11-03 15:05:41 +05:00 |
|
TimofeyBoyko
|
71ee8f0cd8
|
Web:Common:FilterInput: fix long tag
|
2022-11-03 12:52:45 +05:00 |
|
TimofeyBoyko
|
3700193ddb
|
Web:Client:Accounts: fix managaer role at filter
|
2022-11-03 12:39:25 +05:00 |
|
|
|
0ba888ef5b
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-02 20:40:59 +03:00 |
|
|
|
2a5f4fc2bf
|
Web: Common: fixed image viewer mobile toolbar
|
2022-11-02 20:04:59 +05:00 |
|
|
|
36bd8eab14
|
Web:Common:Delete onSaveSelectedNewThemes.
|
2022-11-02 16:05:02 +03:00 |
|
Viktor Fomin
|
28846ea77d
|
Common: Article: fix position with smart banner
|
2022-11-02 17:13:23 +05:00 |
|
|
|
31c6e0a7aa
|
Web:Common:Add delete method.
|
2022-11-01 18:26:05 +03:00 |
|
mushka
|
ef8af2739a
|
fixed history user link bug
|
2022-11-01 13:31:49 +03:00 |
|
Viktor Fomin
|
2afea89545
|
Merge branch 'develop' into feature/whitelabel
|
2022-11-01 15:25:52 +05:00 |
|
mushka
|
c7603626f5
|
created new updateRoomMemberRole api callout
|
2022-10-31 18:27:03 +03:00 |
|
|
|
3a04532b3d
|
Web: Common: fixed context menu selection
|
2022-10-31 20:06:45 +05:00 |
|
Viktor Fomin
|
20878155eb
|
Common: Article: add theme for logo
|
2022-10-31 19:22:30 +05:00 |
|
mushka
|
8fe7efe036
|
cleaned up infoPanelBody inject
|
2022-10-31 14:09:28 +03:00 |
|
mushka
|
5ef235bf8c
|
Merge branch 'develop' into feature/info-panel-update
|
2022-10-31 13:55:44 +03:00 |
|
Viktor Fomin
|
9510ccbc74
|
Common: SettingsStore: fix logo url
|
2022-10-31 13:29:40 +05:00 |
|
Elyor Djalilov
|
c4ff1d057c
|
Merge branch 'develop' into feature/active-sessions
|
2022-10-31 11:24:05 +05:00 |
|
|
|
2facf7fa7c
|
Web:Common:Add onSaveSelectedNewThemes.
|
2022-10-30 16:40:20 +03:00 |
|
Viktor Fomin
|
e3615d4257
|
Merge branch 'develop' into feature/whitelabel
|
2022-10-29 01:25:26 +05:00 |
|
|
|
36e47cbe2e
|
Merge branch 'develop' into feature/invite-accounts
|
2022-10-28 14:54:46 +03:00 |
|
Viktor Fomin
|
eded0a3a50
|
Merge branch 'develop' into feature/whitelabel
|
2022-10-28 16:05:38 +05:00 |
|
|
|
8375711b5c
|
Web: Client: InvitePanel: Fixed invitation links usage for rooms
|
2022-10-28 11:24:25 +03:00 |
|
TimofeyBoyko
|
3baf50db59
|
Web:Common:Article: add theme support for vertical line
|
2022-10-28 12:54:06 +05:00 |
|
TimofeyBoyko
|
5bcbbb9b90
|
Web:Common:Article: add vertical line and fix styles
|
2022-10-28 12:42:43 +05:00 |
|
Viktor Fomin
|
1a25afd518
|
Common: Article: fix
|
2022-10-27 23:50:23 +05:00 |
|
|
|
c90ff77c38
|
Web: Common: delete noHover prop
|
2022-10-27 20:04:38 +05:00 |
|
|
|
8c33f4e00a
|
Web: Common: delete unnecessary toolbar when we can't share file
|
2022-10-27 19:11:26 +05:00 |
|
|
|
c5ed1fd0da
|
Web: Client: Store: Added invite users action and api methods
|
2022-10-27 17:00:45 +03:00 |
|
|
|
fac5873ff8
|
Merge branch 'develop' into feature/new-viewer
|
2022-10-27 16:07:50 +05:00 |
|
|
|
d5b37c79d4
|
Web: Common: create generate context menu function
|
2022-10-27 16:05:20 +05:00 |
|
|
|
eab15e79d3
|
Web: Common: added context menu
|
2022-10-27 11:55:06 +05:00 |
|
|
|
6ea1e036c0
|
Web: Common: create context menu for video player
|
2022-10-27 11:54:08 +05:00 |
|
|
|
9c5f86b237
|
Merge branch 'develop' into feature/invite-accounts
|
2022-10-27 09:47:54 +03:00 |
|
|
|
35545b4bff
|
Web: Common: Constants: Added new user type
|
2022-10-27 09:35:44 +03:00 |
|
Viktor Fomin
|
d66cf18981
|
Common: SettingsStore: fix
|
2022-10-27 00:29:44 +05:00 |
|
|
|
073aa9943f
|
Fix WrongTranslationVariablesTest issues + added missing files and key sorting
|
2022-10-25 14:52:15 +03:00 |
|
Viktor Fomin
|
9033164e4a
|
Common: Article: fix style
|
2022-10-25 14:30:44 +05:00 |
|
Viktor Fomin
|
3a61992044
|
Common: Article: use logos from whitelabel
|
2022-10-25 14:27:30 +05:00 |
|
Elyor Djalilov
|
42471135ba
|
Merge branch 'develop' into feature/active-sessions
# Conflicts:
# packages/client/src/components/dialogs/index.js
# packages/components/themes/base.js
# packages/components/themes/dark.js
|
2022-10-25 13:41:42 +05:00 |
|
mushka
|
bc10920372
|
Merge branch 'develop' into feature/info-panel-update
|
2022-10-24 20:52:01 +03:00 |
|
mushka
|
6c3f18145d
|
added isItemChanged to infoPanelStore
|
2022-10-24 20:44:19 +03:00 |
|
Viktor Fomin
|
bc5458bd21
|
Merge branch 'develop' into feature/portal-deactivation
|
2022-10-24 18:38:02 +05:00 |
|
Elyor Djalilov
|
cabc463451
|
Web:Client:ActiveSessions: added mobile view
|
2022-10-24 17:14:49 +05:00 |
|
Viktor Fomin
|
86c6a8421a
|
Common: Utils: add bg pattern func
|
2022-10-24 15:01:43 +05:00 |
|
TimofeyBoyko
|
30799fa082
|
Merge branch 'develop' into bugfix/files-context-menu
|
2022-10-24 14:09:25 +05:00 |
|
Viktor Fomin
|
03edde3dea
|
Merge branch 'develop' into feature/portal-deactivation
|
2022-10-24 14:08:11 +05:00 |
|
mushka
|
521d6f9250
|
moved selection calculation logic to info panel store and added several selection helper methods
|
2022-10-21 20:20:02 +03:00 |
|
|
|
ab22be7478
|
Merge branch 'develop' into bugfix/login
|
2022-10-21 13:44:42 +03:00 |
|
TimofeyBoyko
|
561cc3b550
|
Web:Common:API: fix archiveRoom method
|
2022-10-20 21:34:21 +05:00 |
|
|
|
9f7f9bfd8a
|
Replaced local onlyoffice-document-editor-react component
|
2022-10-20 18:47:02 +03:00 |
|
Viktor Fomin
|
cb5836bed2
|
Merge branch 'develop' into bugfix/login
|
2022-10-20 17:54:36 +05:00 |
|
Viktor Fomin
|
de26960561
|
Common: SettingsStore: auto theme
|
2022-10-20 17:43:11 +05:00 |
|
|
|
9e0bc49c6f
|
Merge branch 'develop' into feature/portal-deactivation
|
2022-10-20 15:04:54 +03:00 |
|
|
|
527e66c25e
|
Merge pull request #934 from ONLYOFFICE/bugfix/fix-memory-leak
Web:Common:FilterInput: fix memory leak
|
2022-10-20 14:44:19 +03:00 |
|
|
|
1f5605eb84
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-20 14:24:12 +03:00 |
|
|
|
285c831477
|
Web:Client:Delete greetingSettingsIsDefault, greetingSettingsIsDefault.
|
2022-10-20 14:08:47 +03:00 |
|
TimofeyBoyko
|
c831a2cfd6
|
Web:Common:FilterInput: fix memory leak
|
2022-10-20 14:17:58 +05:00 |
|
|
|
0d680dd005
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-20 11:36:22 +03:00 |
|
|
|
9c99f3a53f
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-19 19:41:39 +03:00 |
|
Elyor Djalilov
|
d819128bdb
|
Web:Client:ActiveSessions: added translations
|
2022-10-19 18:30:22 +05:00 |
|
|
|
07f826889b
|
Web:Client:Add styles focus in Button, ComboButton.
|
2022-10-19 14:47:54 +03:00 |
|
|
|
a5165d09cf
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-18 10:31:15 +03:00 |
|
TimofeyBoyko
|
9f226d657a
|
Web:Common:UserStore: fix withActivationBar
|
2022-10-17 19:24:03 +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 |
|
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 |
|
TimofeyBoyko
|
54b7f99f8e
|
Merge branch 'develop' into feature/bar-quotas
|
2022-10-17 16:06:33 +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 |
|
|
|
552a7a7b78
|
Web: Files: fixed empty-screen jumps
|
2022-10-17 13:14:57 +03:00 |
|
|
|
1fac4168fe
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-17 11:02:59 +03:00 |
|
|
|
cb6fd57f76
|
Merge branch 'develop' into feature/new-viewer
|
2022-10-17 12:37:11 +05: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
|
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 |
|
|
|
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 |
|
|
|
7ba126f049
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-14 12:15:55 +03:00 |
|
Elyor Djalilov
|
fe11164286
|
Merge branch 'develop' into feature/active-sessions
|
2022-10-14 12:38:55 +05:00 |
|
TimofeyBoyko
|
470c100e2f
|
Merge branch 'develop' into feature/bar-quotas
|
2022-10-14 12:26:16 +05:00 |
|
Elyor Djalilov
|
9bde9af673
|
Web: Client: add active sessions
|
2022-10-14 12:21:42 +05:00 |
|
TimofeyBoyko
|
6eda3b0d89
|
Web:Common:Constants: add new employee types
|
2022-10-13 19:46:38 +05:00 |
|
|
|
28d918464f
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-13 15:48:31 +03:00 |
|
|
|
1ce5b32bae
|
Web: Added waiting for new information from the quota.
|
2022-10-13 15:07:36 +03:00 |
|
|
|
efde1f00a9
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-13 13:37:05 +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 |
|
|
|
ee13dc5abd
|
Merge branch 'develop' into feature/new-viewer
|
2022-10-13 12:55:08 +05:00 |
|
TimofeyBoyko
|
9750335b3e
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-13 11:45:31 +05:00 |
|
|
|
ebd30e3e7d
|
Web: Component: added new viewer, change toolbars
|
2022-10-12 22:56:54 +05:00 |
|
|
|
9d6c593d78
|
Web: Component: removed unnecessary styled components
|
2022-10-12 22:55:58 +05:00 |
|
|
|
ce314ca64d
|
Web: Component: delete excess code
|
2022-10-12 22:54:24 +05:00 |
|
|
|
21628d2ef7
|
Web: fixed styles
|
2022-10-12 14:59:17 +03: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 |
|
|
|
6d78f37729
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-11 16:05:49 +03:00 |
|
TimofeyBoyko
|
e3b4979daa
|
Web:Common:Api: update user roles
|
2022-10-11 16:07:36 +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
|
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
|
415c620574
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-10 17:27:16 +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
|
75e2294fd7
|
Merge branch 'develop' into feature/bar-quotas
|
2022-10-10 19:04:38 +05:00 |
|
|
|
368a23fd4e
|
Web: Common: fixed action button styles, removed useless code
|
2022-10-10 15:11:43 +03:00 |
|
TimofeyBoyko
|
b6cf14f62e
|
Merge branch 'develop' into bugfix/accounts-filter
|
2022-10-10 14:57:56 +05: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 |
|
|
|
734a03019a
|
Merge pull request #877 from ONLYOFFICE/feature/phone-input
Feature/phone input
|
2022-10-10 12:04:59 +03:00 |
|
|
|
1ea1cedb3b
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-10 09:32:13 +03:00 |
|
TimofeyBoyko
|
68fc4fb2d4
|
Web:Common:FilterInput: delete useless code
|
2022-10-07 19:24:56 +05:00 |
|
mushka
|
44de9ce824
|
fixed noItem view appearing on viewDetails context click
|
2022-10-07 16:48:45 +03:00 |
|
mushka
|
7de3650533
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-07 16:21:59 +03:00 |
|
mushka
|
8acd04d7b4
|
moved openUser and openAccounts functionality to userStore
|
2022-10-06 20:04:34 +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 |
|
|
|
ba6b92c7c2
|
Web: Added the ability to see alert in the article for administrators only.
|
2022-10-06 14:26:36 +03:00 |
|
TimofeyBoyko
|
5cfc7cf8d0
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-06 13:41:14 +03:00 |
|
|
|
e5a2331003
|
Web:Common:Delete props icon.
|
2022-10-06 13:24:50 +03:00 |
|
|
|
f790a61dac
|
Web:Common:Delete props icon from SelectedItem.
|
2022-10-06 13:21:49 +03:00 |
|
|
|
ac85ff775e
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-06 12:56:09 +03:00 |
|
|
|
409cdd2ebe
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
|
2022-10-05 17:17:33 +03:00 |
|
|
|
e1fa2e6872
|
Web:Common:Add props icon in SelectedItem.
|
2022-10-05 15:24:36 +03:00 |
|
|
|
ee43c167cc
|
Web:Common:Add icon in SelectedItem.
|
2022-10-05 15:24:11 +03:00 |
|
|
|
d37a6068fc
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-05 15:04:24 +03:00 |
|
|
|
cee1eb8c6c
|
Web:Common:Add provider in filter.
|
2022-10-05 14:54:47 +03:00 |
|
|
|
92f28a066c
|
Web:Common:Add RoomsProviderType.
|
2022-10-05 14:52:02 +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 |
|
|
|
ca1cd06fad
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/public/images/plus.react.svg
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
# packages/client/src/pages/PortalSettings/index.js
# packages/common/components/PrivateRoute/index.js
|
2022-10-04 17:13:46 +03:00 |
|
TimofeyBoyko
|
019745b090
|
Web:Common:Article: open profile on avatar click
|
2022-10-04 07:31:06 +03:00 |
|
TimofeyBoyko
|
ae584739e8
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-04 06:58:16 +03:00 |
|
TimofeyBoyko
|
8c5abf813d
|
Merge branch 'develop' into feature/bar-quotas
|
2022-10-04 06:56:00 +03:00 |
|
TimofeyBoyko
|
a809f3a80c
|
Web:Client: add send again link and send again bar for user
|
2022-10-04 06:30:36 +03:00 |
|
mushka
|
5c004293d4
|
removed InfoPanelBodyLoader from loaders/index.js
|
2022-10-03 14:18:25 +03:00 |
|
mushka
|
0b8708be93
|
fixed styling of historyView loader in darkTheme
|
2022-10-03 14:17:24 +03:00 |
|
mushka
|
e09c25d9ca
|
deleted infoPanelBodyLoader
|
2022-10-03 14:15:36 +03:00 |
|
Elyor Djalilov
|
41261e64b9
|
Merge branch 'develop' into feature/phone-input
# Conflicts:
# packages/components/index.js
|
2022-10-03 12:20:33 +05:00 |
|
mushka
|
1b2dae0890
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-02 03:45:40 +03:00 |
|
mushka
|
73e0c9608a
|
redo of loaction getterrs and updated on several methods for infoPanelStore
|
2022-10-02 02:45:29 +03:00 |
|
mushka
|
303f2c96ff
|
added new FeedActionTypes and FeedItemTypes consts
|
2022-10-02 02:44:29 +03:00 |
|
mushka
|
419646f8fc
|
complete overhaul for InfoPanelHeaderLoader
|
2022-10-02 02:44:09 +03:00 |
|
mushka
|
d32a2179cb
|
complete overhaul of old styles for InfoPanelHeaderLoader
|
2022-10-02 02:43:55 +03:00 |
|
mushka
|
c056383862
|
added all new loaders to InfoPanelViewLoader
|
2022-10-02 02:43:29 +03:00 |
|
mushka
|
3c921c8cac
|
removed unused console.log
|
2022-10-02 02:41:14 +03:00 |
|
mushka
|
10d698b0d1
|
created new NoItemLoader
|
2022-10-02 02:39:56 +03:00 |
|
mushka
|
2f810c9528
|
created new SeveralItemsLoader
|
2022-10-02 02:39:41 +03:00 |
|
mushka
|
27ca7d62df
|
created new GalleryLoader
|
2022-10-02 02:39:28 +03:00 |
|
mushka
|
f9cc615f0b
|
updated MembersLoader
|
2022-10-02 02:39:18 +03:00 |
|
mushka
|
03b18ef110
|
created new DetailsLoader
|
2022-10-02 02:39:06 +03:00 |
|
mushka
|
94aa2fa3e9
|
created new accounts loader file
|
2022-10-02 02:38:48 +03:00 |
|
|
|
955a9379de
|
Web: Ipad: fixed Safari styles
|
2022-09-29 17:29:09 +03:00 |
|
|
|
26af985bd4
|
Web: Common: fixed floating button display for safari browser
|
2022-09-29 14:09:35 +03:00 |
|
|
|
7164d4b25c
|
Merge pull request #861 from ONLYOFFICE/bugfix/restore-portal
Bugfix/restore portal
|
2022-09-27 10:41:55 +03:00 |
|
|
|
58def6cbb2
|
Web: Common: HideArticleMenuButton: fixed z-index
|
2022-09-26 16:11:22 +03:00 |
|
|
|
d59bd852d2
|
Web: Common: fixed HideArticleMenuButton styles for table view
|
2022-09-26 14:57:27 +03:00 |
|
|
|
0b66a94bbb
|
Merge branch 'develop' into bugfix/restore-portal
|
2022-09-26 14:50:40 +03:00 |
|
|
|
56c4c35ca0
|
Merge pull request #858 from ONLYOFFICE/feature/added-show-article-button
Feature/added show article button
|
2022-09-26 12:52:14 +03:00 |
|
|
|
1f5384dc0c
|
Web: Common: added hide menu translation
|
2022-09-26 12:37:21 +03:00 |
|
|
|
db047d72a9
|
Web: Common: removed log
|
2022-09-26 11:24:28 +03:00 |
|
|
|
0c8703a58c
|
Web: Common: added show/hide article button
|
2022-09-26 11:22:46 +03:00 |
|
|
|
46370b588c
|
Web: Fixed bugs.
|
2022-09-26 11:19:10 +03:00 |
|
mushka
|
af16f21d4a
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-26 11:00:34 +03:00 |
|
mushka
|
e9ae801528
|
removed unused files
|
2022-09-26 10:43:37 +03:00 |
|
mushka
|
dcdfd239d8
|
creted new api call to get history from provided module
|
2022-09-26 10:37:57 +03:00 |
|
mushka
|
598d11c5c7
|
exported new viewLoader
|
2022-09-26 10:37:17 +03:00 |
|
mushka
|
62ecdace05
|
created single viewLoader component for easier access
|
2022-09-26 10:37:05 +03:00 |
|
mushka
|
7f0cadfb98
|
created and finished history loader
|
2022-09-26 10:36:31 +03:00 |
|
mushka
|
3c56e8fe6d
|
changed members loader
|
2022-09-26 10:36:11 +03:00 |
|
mushka
|
c3a1be7be8
|
added constants for feed actions
|
2022-09-26 10:35:58 +03:00 |
|
|
|
80be6fafec
|
Web:Common:Add isEmptyPage, delete isPageWithoutFiles.
|
2022-09-25 12:32:06 +03:00 |
|
|
|
94c945718c
|
Web: Common: Access to the portal recovery page is denied when the portal is not being restored.
|
2022-09-24 10:46:02 +03:00 |
|
|
|
3e7661899e
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
|
2022-09-24 01:51:56 +03:00 |
|
|
|
b97d4d8148
|
Web:Common:Add isPageWithoutFiles props.
|
2022-09-23 19:47:40 +03:00 |
|
|
|
f1150f6748
|
Merge branch 'bugfix/section-header' of github.com:ONLYOFFICE/AppServer into bugfix/section-header
|
2022-09-23 17:14:16 +03:00 |
|
|
|
5f00094d1a
|
Web: Common: Changed padding style of section header.
|
2022-09-23 17:14:06 +03:00 |
|
|
|
9afa3de331
|
Merge branch 'develop' into bugfix/section-header
|
2022-09-23 16:48:30 +03:00 |
|
|
|
7f1d946269
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
# packages/client/src/pages/PortalSettings/index.js
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
|
2022-09-23 16:11:23 +03:00 |
|
|
|
d804bf848a
|
Web: Common: Fixed section header for iOS.
|
2022-09-23 16:10:55 +03:00 |
|
|
|
c2ab59c2ff
|
Merge branch 'develop' into feature/new-profile
|
2022-09-23 15:17:22 +03:00 |
|
|
|
389298dfd6
|
Web: Client: added theme to logo
|
2022-09-23 13:32:43 +03:00 |
|
|
|
57f9f8420f
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-22 18:13:42 +03:00 |
|
|
|
3d02e64934
|
Web: Common: ColorTheme: Added hoverColor property to rest
|
2022-09-22 18:11:51 +03:00 |
|
|
|
3d2550860e
|
Web: Client: Added new access constants
|
2022-09-22 18:10:44 +03:00 |
|
|
|
4f2763dda9
|
Web: Client: Added setInvitationLinks, resendEmailInvitations, getRoomSecurityInfo, setRoomSecurity and acceptInvitationByLink api actions
|
2022-09-22 18:10:07 +03:00 |
|
TimofeyBoyko
|
7a2e3fea01
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-09-22 16:24:57 +03:00 |
|
|
|
2ed2f68cb6
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-22 12:48:46 +03:00 |
|
|
|
4189c9d912
|
Web: Added that access to the page of an inaccessible portal is denied if the portal is still paid.
|
2022-09-22 10:32:47 +03:00 |
|
|
|
ee42f4be3a
|
Merge branch 'develop' into bugfix/trash-context-menu
# Conflicts:
# packages/client/public/locales/en/Files.json
|
2022-09-21 17:18:42 +03:00 |
|
|
|
723a5709a6
|
Web: Common: fixed logo loader
|
2022-09-21 16:24:57 +03:00 |
|
TimofeyBoyko
|
94c7e24a94
|
Web:Common:Navigation: add context menu for trash folder
|
2022-09-21 15:58:52 +03:00 |
|
|
|
79fa7815c4
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-21 14:48:28 +03:00 |
|
|
|
16feeaf988
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/src/Shell.jsx
|
2022-09-21 14:00:17 +03:00 |
|
|
|
f417db1323
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-21 13:57:50 +03:00 |
|
|
|
d9dd4c7139
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-21 13:52:51 +03:00 |
|
|
|
64fd6d387e
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-21 13:13:08 +03:00 |
|
|
|
2b2aeea246
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-21 12:48:03 +03:00 |
|
|
|
beb3acc55b
|
Web: Refactoring, added checking of the free portal with the payer's email.
|
2022-09-21 12:42:08 +03:00 |
|
|
|
31458b11e5
|
Merge branch 'develop' into bugfix/fixed-settings-loaders
|
2022-09-21 12:32:57 +03:00 |
|
|
|
c9f3dd8970
|
Merge branch 'feature/archived-redesign-empty-screen' of github.com:ONLYOFFICE/AppServer into feature/archived-redesign-empty-screen
|
2022-09-21 12:14:50 +03:00 |
|
|
|
e38bc40de6
|
Web:Common:Fix StyledHeading for isMobile.
|
2022-09-21 12:14:44 +03:00 |
|
|
|
f49e714bf0
|
Web: Common: Moved isEmptyPage out of Section
|
2022-09-21 12:05:42 +03:00 |
|
|
|
ffabcea9d6
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-21 11:07:04 +03:00 |
|
|
|
ee2cb020ff
|
Web: Common: Api: Added getInvitationLinks, setInvitationLinks, resendEmailInvitations methods
|
2022-09-21 10:41:11 +03:00 |
|
|
|
6372477fea
|
Web:Common:Add tablet, smallTablet in media.
|
2022-09-21 10:25:26 +03:00 |
|
|
|
5953732f20
|
Common: Utils: init data url to file
|
2022-09-21 03:39:38 +03:00 |
|
|
|
6f003a8459
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-20 21:54:33 +03:00 |
|
|
|
55fc747e96
|
Web: Refactoring.
|
2022-09-20 18:15:38 +03:00 |
|
|
|
5d92a00f11
|
Web: Fixed bug.
|
2022-09-20 15:49:51 +03:00 |
|
mushka
|
ca85150a6d
|
fixed InfoPanel appearing in not avialable places
|
2022-09-20 14:54:05 +03:00 |
|
mushka
|
fac0f14608
|
created new getCanDisplay method for InfoPanelStore
|
2022-09-20 14:53:35 +03:00 |
|
|
|
f49d98d21d
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
# packages/client/src/Shell.jsx
|
2022-09-20 14:27:39 +03:00 |
|
mushka
|
c835f2960c
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-20 14:21:44 +03:00 |
|
TimofeyBoyko
|
e48371ba7f
|
Merge branch 'develop' into bugfix/tags
|
2022-09-20 14:13:33 +03:00 |
|
TimofeyBoyko
|
72f7b984f2
|
Web:Common:Tags: fix truncate for 1 tag
|
2022-09-20 14:11:36 +03:00 |
|
|
|
3ff711225a
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-20 14:07:27 +03:00 |
|
|
|
6c1d1981a3
|
Web: Files: fixed plus icon click for shared folder
|
2022-09-20 14:00:34 +03:00 |
|
|
|
9fc617c652
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-20 13:52:31 +03:00 |
|
|
|
c61d11024c
|
Web: Common: fixed burger loader
|
2022-09-20 11:26:14 +03:00 |
|
|
|
f36b38cbe5
|
Merge branch 'bugfix/fixed-settings-loaders' of github.com:ONLYOFFICE/AppServer into bugfix/fixed-settings-loaders
|
2022-09-20 10:59:41 +03:00 |
|
|
|
f607382b3a
|
Web:Common:Delete isLoadedSetting, setIsLoadedArticleHeader.
|
2022-09-20 10:59:31 +03:00 |
|
|
|
ead5485288
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-19 23:30:28 +03:00 |
|
|
|
6448b63318
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/constants/index.js
# web/ASC.Web.Api/Program.cs
|
2022-09-19 18:16:34 +03:00 |
|
TimofeyBoyko
|
412c897240
|
Web:Common:Section: delete main bar
|
2022-09-19 18:05:55 +03:00 |
|
TimofeyBoyko
|
853fa338ce
|
Web:Client: move MainBar from section to global Layout and fix styles after this
|
2022-09-19 18:00:08 +03:00 |
|
|
|
7c06bc8e8e
|
Web: Common: Article: fixed loader width
|
2022-09-19 17:42:34 +03:00 |
|
|
|
7844c5bd23
|
Web: Common: added ArticleHeader loader
|
2022-09-19 17:31:22 +03:00 |
|
|
|
fa01783cdb
|
Web: Client: fixed Article loader
|
2022-09-19 16:41:11 +03:00 |
|
|
|
bc20d9fe8f
|
Web: Fixed bugs.
|
2022-09-19 16:31:32 +03:00 |
|
|
|
2d26c5dc08
|
Web:Common:Fix isSectionFilterAvailable.
|
2022-09-19 15:24:13 +03:00 |
|
|
|
9799e003ee
|
Web:Common:Add infoPanelIsVisible.
|
2022-09-19 15:23:26 +03:00 |
|
|
|
22381f8f44
|
Web: Moved dialog to common folder.
|
2022-09-19 15:12:49 +03:00 |
|
|
|
ee70590b78
|
Web:Common:Add props isEmptyFilesList in flag isSectionFilterAvailable.
|
2022-09-19 14:38:16 +03:00 |
|
|
|
8f1a8deda9
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-19 13:48:26 +03:00 |
|
|
|
ce4cacc43c
|
Web: Fixed bugs.
|
2022-09-19 12:18:37 +03:00 |
|
|
|
6b3ebed8b9
|
Web: Fixed bugs.
|
2022-09-19 11:59:47 +03:00 |
|
|
|
9480cc9d52
|
Web:Common:Delete filter if EmptyFilesList empty.
|
2022-09-19 11:48:53 +03:00 |
|
TimofeyBoyko
|
3c0bc5e500
|
Web:Common:API: fix filterValue at roomsFilter after page reload
|
2022-09-19 11:19:15 +03:00 |
|
|
|
ae0eb0a143
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-19 09:55:07 +03:00 |
|
|
|
e8531daac8
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-19 09:46:21 +03:00 |
|
|
|
b1f0135749
|
Web:Common:Fix StyledHeading.
|
2022-09-18 17:29:02 +03:00 |
|
|
|
2d9b7606d8
|
Common: Section: fix profile padding
|
2022-09-18 02:28:38 +03:00 |
|
TimofeyBoyko
|
6f2269f9af
|
Merge branch 'develop' into feature/update-filters
|
2022-09-16 18:30:09 +03:00 |
|
TimofeyBoyko
|
2d01924ea6
|
Web:Common:FilterInput: fix select option
|
2022-09-16 18:28:23 +03:00 |
|
|
|
0f045311db
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-16 18:27:33 +03:00 |
|
TimofeyBoyko
|
45675c5dc1
|
Web:Common:Api: add excludeSubject at files filter
|
2022-09-16 18:27:28 +03:00 |
|
|
|
a51cde20c7
|
Merge branch 'develop' into feature/doc-space-info-panel
# Conflicts:
# products/ASC.Files/Service/Extensions/ConfigurationManagerExtension.cs
|
2022-09-16 18:26:36 +03:00 |
|
|
|
9b60a73c21
|
Web: Common: fixed logo click
|
2022-09-16 18:17:28 +03:00 |
|
TimofeyBoyko
|
65e04b76c8
|
Web:Common:Api: change withoutMe to excludeSubject at rooms filter
|
2022-09-16 17:34:17 +03:00 |
|
TimofeyBoyko
|
cfeb72fd9c
|
Web:Common:Article: add new prop 'withMainButton'
|
2022-09-16 16:36:29 +03:00 |
|
|
|
150072b885
|
Web: Common: fixed logo click, fixed burger styles
|
2022-09-16 15:53:19 +03:00 |
|
mushka
|
d7006768e6
|
afted-merge fixes
|
2022-09-16 15:35:57 +03:00 |
|
mushka
|
9c8fa64983
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-16 15:33:29 +03:00 |
|
mushka
|
b0873da7eb
|
updated on getItemIcon to get room default icon
|
2022-09-16 15:13:40 +03:00 |
|
mushka
|
ea49294f91
|
added getRoomHistory api call to api/rooms
|
2022-09-16 15:12:37 +03:00 |
|
mushka
|
15ea8b4785
|
fixed imports for infoPanelToggle Color theme
|
2022-09-16 15:07:54 +03:00 |
|
|
|
fce913a209
|
Web:Common:Fix disableStyles in StyledMainButton.
|
2022-09-16 12:46:59 +03:00 |
|
|
|
37142b7712
|
Web:Common:
Added hiding InfoPanelButton when isEmptyFilesList is empty.
|
2022-09-16 11:51:53 +03:00 |
|
|
|
c957f0eecb
|
Web:Common:Add check if isEmptyFilesList is empty then don't show the filter.
|
2022-09-16 11:17:57 +03:00 |
|
|
|
ee4a47454f
|
Web: Disabled branding settings.
|
2022-09-16 10:45:10 +03:00 |
|
|
|
9b596d6932
|
Web:Common:Add docSpaceLogo, setDocSpaceLogo.
|
2022-09-15 21:19:38 +03:00 |
|
TimofeyBoyko
|
ca485bc41d
|
Web:Client:Home: fix clearAll
|
2022-09-15 18:18:36 +03:00 |
|
TimofeyBoyko
|
25188c57b8
|
Web:Client:Home: fix clear search
|
2022-09-15 18:06:00 +03:00 |
|
|
|
a252a07fd3
|
Web: fixed after merge.
|
2022-09-15 17:43:02 +03:00 |
|
|
|
bec4f11dcd
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/components/Loaders/index.js
# packages/common/store/AuthStore.js
# packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
# packages/login/webpack.config.js
# products/ASC.Files/Service/Program.cs
# web/ASC.Web.Api/Program.cs
|
2022-09-15 17:16:04 +03:00 |
|
|
|
eeed96cb32
|
Web: Fixed bugs.
|
2022-09-15 15:58:21 +03:00 |
|
|
|
21fc46b8bc
|
Web: Removed useless translations.
|
2022-09-15 15:07:26 +03:00 |
|
|
|
c20e01e351
|
Web: Added information about storage size, added checks.
|
2022-09-15 14:59:55 +03:00 |
|
|
|
aa195fe76b
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-15 14:40:00 +03:00 |
|
TimofeyBoyko
|
0dba384037
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-15 14:29:57 +03:00 |
|
TimofeyBoyko
|
72af5e7549
|
Web: mode global events constants from client to common
|
2022-09-15 13:24:18 +03:00 |
|
|
|
20fe2a3763
|
Web:Added values for the downgrade plan dialog from the stores.
|
2022-09-15 12:54:00 +03:00 |
|
|
|
94f6cc8682
|
Web: Files: Settings: fix padding on tablet
|
2022-09-15 12:06:22 +03:00 |
|
|
|
b85484a731
|
Web: Files: Settings: Fix sticky submenu
|
2022-09-15 11:59:38 +03:00 |
|
TimofeyBoyko
|
c5b50e5d4a
|
Web:Common:Constants: add new filter types and file types for oform and docx
|
2022-09-15 11:38:59 +03:00 |
|
TimofeyBoyko
|
75bf22918e
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-15 10:10:03 +03:00 |
|
|
|
e911a9f478
|
Merge branch 'develop' into feature/redisign-files-settings
|
2022-09-14 18:40:09 +03:00 |
|
|
|
270e8f0326
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-14 18:38:14 +03:00 |
|
|
|
1154018e52
|
Web:Common:Fixed api request.
|
2022-09-14 18:29:03 +03:00 |
|
|
|
40aee9ff02
|
Web: Files: Settings: Added new loaders
|
2022-09-14 18:25:46 +03:00 |
|
|
|
edd01a2d91
|
Web:Common:Add whiteLabelLogoUrls.
|
2022-09-14 17:25:31 +03:00 |
|
|
|
f4e6828cc8
|
Web:Client:Delete getWhiteLabelLogoText, getWhiteLabelLogoSizes.
|
2022-09-14 17:25:01 +03:00 |
|
|
|
c0244b5400
|
Web: Added plan title from the store.
|
2022-09-14 17:17:40 +03:00 |
|
TimofeyBoyko
|
3558845932
|
Web:Common:Loaders: fix
|
2022-09-14 17:13:15 +03:00 |
|
TimofeyBoyko
|
ee7db82c3a
|
Web:Client:AccountsHome: fix filter loader
|
2022-09-14 16:55:23 +03:00 |
|
TimofeyBoyko
|
11ba9f379c
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-14 16:35:18 +03:00 |
|
TimofeyBoyko
|
8f92a90ab6
|
Web:Common:Loaders: fix styles for filter block loader
|
2022-09-14 16:30:48 +03:00 |
|
TimofeyBoyko
|
9d49a1f753
|
Web:Common:FilterInput: fix item styles
|
2022-09-14 16:30:26 +03:00 |
|
|
|
9b6b55599f
|
Web: Added getting max users count in room.
|
2022-09-14 16:07:22 +03:00 |
|
|
|
d2ce2f4435
|
Web: Added replacement in returned feature objects.
|
2022-09-14 16:01:40 +03:00 |
|
|
|
61fa70c886
|
Web: Components: Navigation: fixed z-index
|
2022-09-14 15:42:38 +03:00 |
|
TimofeyBoyko
|
d0e200437e
|
Web:Client:Home: hide option from sort button when this option hide in table header
|
2022-09-14 15:26:28 +03:00 |
|
|
|
b5e08fddf4
|
Web: Components: Navigation fixed text clipping
|
2022-09-14 14:48:19 +03:00 |
|
|
|
ff1a18eb0f
|
Web: Components: fixed Navigation component for IOS devices
|
2022-09-14 14:41:24 +03:00 |
|
|
|
5131b49b0b
|
Web: Refactoring.
|
2022-09-14 14:13:21 +03:00 |
|
|
|
1f76f8b058
|
Web: Components: fixed settings-icon color
|
2022-09-14 14:05:38 +03:00 |
|
|
|
cdc9102dd8
|
Web:Common:Add whiteLabel methods.
|
2022-09-14 13:59:39 +03:00 |
|
|
|
9b15ddf9ac
|
Web:Common:Add whiteLabel methods.
|
2022-09-14 13:59:17 +03:00 |
|
|
|
229400b830
|
Web:Common:Removed the removal of extra fields from the object in the methods getAdditionalResources, getCompanyInfoSettings.
|
2022-09-14 12:48:09 +03:00 |
|
|
|
b546a367e1
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-14 10:18:41 +03:00 |
|
|
|
7decafcdc0
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-14 10:18:22 +03:00 |
|
|
|
8e78498856
|
Wed: Added new stores.
|
2022-09-14 09:55:22 +03:00 |
|
|
|
ed18968601
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/public/locales/en/Errors.json
# packages/client/public/locales/en/Settings.json
|
2022-09-14 01:45:01 +03:00 |
|
|
|
140631c5de
|
Merge branch 'develop' into feature/additional-resources
|
2022-09-13 20:10:42 +03:00 |
|
|
|
32c5c9907d
|
Web: Files: fixed header-container styles
|
2022-09-13 18:19:23 +03:00 |
|
|
|
820cc5a9b8
|
Web: Common: fixed header styles
|
2022-09-13 18:09:40 +03:00 |
|
TimofeyBoyko
|
7c47679796
|
Web:Common:FilterInput: fix ClearAll translation key
|
2022-09-13 18:06:55 +03:00 |
|
|
|
45bcf68af3
|
Web: Common: fixed section-header styles
|
2022-09-13 17:53:45 +03:00 |
|
TimofeyBoyko
|
fff60dcdd6
|
Web:Common:Loaders: fix styles for filter block loader
|
2022-09-13 13:59:44 +03:00 |
|
|
|
281ec9ec57
|
Web: Files: fixed skeleton-loaders styles, fixed header styles, removed useless code
|
2022-09-13 13:01:31 +03:00 |
|
TimofeyBoyko
|
ebe79b5cdf
|
Web:Common:FilterInput: fix styles and hide clear filter button
|
2022-09-13 12:56:47 +03:00 |
|
|
|
0f063b7502
|
Web:Common:Removed unnecessary fields from the object, added a defaultAdditionalResources entry to localStorage.
|
2022-09-13 10:38:25 +03:00 |
|
|
|
0bf768efda
|
Web:Common:Add defaultWelcomePageSettings in localStorage.
|
2022-09-13 10:13:10 +03:00 |
|
|
|
5a399eac99
|
Web:Common:Added an entry in the localStorage of the default setting data CompanyInfoSettings.
|
2022-09-12 21:08:50 +03:00 |
|
TimofeyBoyko
|
e6a4637b73
|
Web:Common:FilterInput: add cancel button
|
2022-09-12 18:05:36 +03:00 |
|
|
|
f5256c80d0
|
Web:Common:Add method setGreetingSettings.
|
2022-09-12 17:31:08 +03:00 |
|
TimofeyBoyko
|
5ddcfe6c3a
|
Web:Common:Loaders: delete useless code
|
2022-09-12 17:06:48 +03:00 |
|
TimofeyBoyko
|
fc59f340d8
|
Web:Common:FilterInput: fix combobox open
|
2022-09-12 17:00:26 +03:00 |
|
TimofeyBoyko
|
e914151fcf
|
Web:Common:FilterInput: update logic for combobox and fix bugs
|
2022-09-12 16:21:01 +03:00 |
|
TimofeyBoyko
|
9311ec1133
|
Web:Common:Loaders: fix filter loader
|
2022-09-12 14:33:36 +03:00 |
|
TimofeyBoyko
|
ccf9386c8e
|
Web:Common:Api: fix files filter
|
2022-09-12 12:26:37 +03:00 |
|
TimofeyBoyko
|
492d1bd682
|
Web:Common:Api: add searchInContent for file filter
|
2022-09-12 11:52:55 +03:00 |
|
|
|
d19caa298d
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-12 10:50:43 +03:00 |
|
|
|
478af8492d
|
Web:Common:Add data in methods setAdditionalResources.
|
2022-09-10 20:44:22 +03:00 |
|
|
|
377d3be960
|
Merge branch 'develop' into feature/additional-resources
|
2022-09-10 19:46:57 +03:00 |
|
mushka
|
981c28f21d
|
added new methods for gettting categoryType and isGallery constants in InfoPanelStore
|
2022-09-10 00:28:40 +03:00 |
|
|
|
b8f5438c19
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-09 17:10:04 +03:00 |
|
mushka
|
9e8d5433d4
|
fixed getRoomMethod api call
|
2022-09-09 13:54:36 +03:00 |
|
mushka
|
ab7ace5af6
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-09 13:22:36 +03:00 |
|
mushka
|
e283ced388
|
added selectionPanelRoom var and set method and removed odd out setVisible and toggleVisible methods
|
2022-09-09 13:15:41 +03:00 |
|
|
|
f0bf37760b
|
Web:Common:Add methods setAdditionalResources, getAdditionalResources, restoreAdditionalResources.
|
2022-09-09 10:34:45 +03:00 |
|
TimofeyBoyko
|
14052af9b7
|
Web:Common:Article: fix displaying role for profile avatar
|
2022-09-09 09:27:36 +03:00 |
|
|
|
e860c10333
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-09 09:02:56 +03:00 |
|
|
|
97bd153ec5
|
Merge branch 'develop' into feature/change-owner-dialog
|
2022-09-08 16:29:09 +03:00 |
|
|
|
b5ce007715
|
Web: Common: fixed SortButton render
|
2022-09-08 16:05:06 +03:00 |
|
|
|
ce419159b9
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
|
2022-09-08 15:44:30 +03:00 |
|
mushka
|
20f2fde176
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-08 15:28:38 +03:00 |
|
TimofeyBoyko
|
3a3ae4b2c9
|
Merge branch 'develop' into feature/change-owner-dialog
|
2022-09-08 15:16:51 +03:00 |
|
|
|
a236948577
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-08 12:27:14 +03:00 |
|
|
|
d7bd44cfb1
|
Web: Files: fixed hover for row
|
2022-09-08 11:48:06 +03:00 |
|
TimofeyBoyko
|
5f0f71a2bf
|
Merge branch 'develop' into feature/change-owner-dialog
|
2022-09-08 11:27:49 +03:00 |
|
|
|
a94fc40294
|
Merge branch 'develop' into bugfix/fixed-section-body-padding
|
2022-09-08 10:57:54 +03:00 |
|
TimofeyBoyko
|
9d0c6c0a97
|
Merge branch 'develop' into feature/change-owner-dialog
|
2022-09-08 10:49:30 +03:00 |
|
|
|
6977534102
|
Merge branch 'develop' into feature/selector
|
2022-09-08 10:35:53 +03:00 |
|
mushka
|
05fbe1bd7e
|
changed for-dev console.logs
|
2022-09-08 04:33:21 +03:00 |
|
mushka
|
36f233035d
|
added settingsStore to infoPanel store and moved normalizeSelection and getItemIcon as methods
|
2022-09-08 04:25:13 +03:00 |
|
|
|
d8c101f907
|
Web: Common: fixed section-body padding styles for row view
|
2022-09-07 18:16:02 +03:00 |
|
|
|
2abf7ef5d9
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-07 17:38:06 +03:00 |
|
|
|
d0d2313da3
|
Web: Files: fixed section-body styles
|
2022-09-07 17:00:17 +03:00 |
|
TimofeyBoyko
|
ac496bfe9e
|
Merge branch 'develop' into feature/selector
|
2022-09-07 15:06:24 +03:00 |
|
|
|
41c58de5c7
|
Web: Common: FilterInput: Fixed PeopleSelector usage
|
2022-09-07 14:14:09 +03:00 |
|
|
|
85a2983b3d
|
Web: Refactoring.
|
2022-09-07 13:28:28 +03:00 |
|
|
|
8acc4c5418
|
Web:Common:Moved company settings request after authorization.
|
2022-09-07 12:11:39 +03:00 |
|
|
|
e15862ef40
|
Web: Common: removed react-selecto
|
2022-09-07 11:49:26 +03:00 |
|
|
|
dba3e03b53
|
Web: Components: renamed Selector to SelectionArea, fixed select
|
2022-09-07 11:30:50 +03:00 |
|
mushka
|
2520be99cb
|
changed InfoPanelStore view var by slplitting it into two separate for rooms and items
|
2022-09-07 05:43:11 +03:00 |
|
mushka
|
52ed0d5607
|
updated InfoPanelMemberListLoader
|
2022-09-06 23:38:56 +03:00 |
|
mushka
|
b2caacc54b
|
added new api callout for getting room memebers
|
2022-09-06 23:36:59 +03:00 |
|
mushka
|
ff443c7586
|
fixed issue with members reloading on rerender by moving infoPanel selection to store
|
2022-09-06 22:22:18 +03:00 |
|
mushka
|
f2686de9a2
|
created InfoPanelMemberListLoader
|
2022-09-06 22:21:14 +03:00 |
|
TimofeyBoyko
|
3923d6faec
|
Merge branch 'develop' into feature/change-owner-dialog
|
2022-09-06 17:43:00 +03:00 |
|
|
|
55d9bb7b71
|
Web: Client: ColorTheme: Fixed storybook init
|
2022-09-06 17:19:35 +03:00 |
|
|
|
b8dbd00617
|
Web: Components: added selection-area
|
2022-09-06 13:53:12 +03:00 |
|
|
|
cb1da48faf
|
Web: Profile: fix selected language
|
2022-09-06 12:52:57 +03:00 |
|
TimofeyBoyko
|
adf02df9cf
|
Web:Common:Loaders: add display of user loader for selector row loader
|
2022-09-06 12:17:52 +03:00 |
|
|
|
dfff88986d
|
Web:Common:Add api restoreCompanyInfoSettings, getCompanyInfoSettings, setCompanyInfoSettings.
|
2022-09-06 11:03:50 +03:00 |
|
|
|
c41525179c
|
Web:Common:Add methods restoreCompanyInfoSettings, getCompanyInfoSettings, setCompanyInfoSettings, setCompanyInfoSettingsData.
|
2022-09-06 11:03:01 +03:00 |
|
|
|
150060faff
|
Web: Refactoring, added downgrade plan button.
|
2022-09-06 10:52:02 +03:00 |
|
|
|
f96784ba5d
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/public/locales/en/Errors.json
|
2022-09-06 00:22:24 +03:00 |
|
mushka
|
0a2318ea59
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-05 20:53:35 +03:00 |
|
TimofeyBoyko
|
6c632497f9
|
Merge branch 'develop' into feature/selector
|
2022-09-05 20:33:29 +03:00 |
|
|
|
055be3cdbe
|
Merge branch 'develop' into feature/accounts-scroll
|
2022-09-05 17:25:28 +03:00 |
|
|
|
c27a8fc0d3
|
Web: People: added infinite-loader to accounts
|
2022-09-05 14:33:55 +03:00 |
|
|
|
d25a3f143d
|
Web: Added sending a request to the sales department.
|
2022-09-05 13:48:32 +03:00 |
|
mushka
|
84a47113b0
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-05 13:44:33 +03:00 |
|
|
|
476ed95664
|
Web: Information from the new api was used.
|
2022-09-05 13:17:44 +03:00 |
|
TimofeyBoyko
|
a3f37b0362
|
Web:Common:Loaders: add loaders for selector search and row
|
2022-09-05 12:00:48 +03:00 |
|
Artem Tarasov
|
44b8ecd6b5
|
Web: Login/Common: fixed crash app after logout.
|
2022-09-05 10:48:46 +03:00 |
|
|
|
7b623c4e30
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/common/store/AuthStore.js
# packages/components/slider/index.js
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
|
2022-09-05 10:19:52 +03:00 |
|
|
|
1116843315
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/public/locales/en/Settings.json
|
2022-09-02 01:25:30 +03:00 |
|
|
|
69b692bd40
|
Web: Added functionality for the expired period.
|
2022-09-01 17:28:08 +03:00 |
|
|
|
2297a35fac
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-01 11:17:54 +03:00 |
|
TimofeyBoyko
|
4d74c6d6da
|
Web:Client: add change portal owner dialog
|
2022-09-01 10:44:49 +03:00 |
|
mushka
|
955dce87c5
|
removed unused imports from infoPanelStore
|
2022-09-01 04:39:59 +03:00 |
|
mushka
|
e191023768
|
redo of infoPanelStore calculateIsRoom to setIsRoom
|
2022-09-01 04:38:26 +03:00 |
|
Artem Tarasov
|
a845244ee0
|
Merge branch 'develop' into feature/login-ssr
|
2022-09-01 01:51:29 +03:00 |
|
Artem Tarasov
|
8c28fda299
|
Web: Login/ColorTheme: fixed ssr
|
2022-08-31 18:32:13 +03:00 |
|
Artem Tarasov
|
04122f64fa
|
Web: Components/Common: added LoginStore support
|
2022-08-31 17:33:58 +03:00 |
|
TimofeyBoyko
|
34557b2e40
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-31 16:31:29 +03:00 |
|
Artem Tarasov
|
4ac1eb4c5c
|
Merge branch 'develop' into feature/login-ssr
# Conflicts:
# packages/client/src/components/Badges.js
# packages/client/src/components/IndicatorLoader/index.js
# packages/client/src/components/QuickButtons.js
# packages/client/src/components/panels/UploadPanel/SubComponents/LoadingButton.js
# packages/client/src/pages/About/AboutContent.js
# packages/client/src/pages/Confirm/sub-components/activateEmail.js
# packages/client/src/pages/Home/InfoPanel/Header/index.js
# packages/client/src/pages/VersionHistory/Section/Body/VersionBadge.js
# packages/client/src/store/TargetUserStore.js
# packages/common/components/ColorTheme/ColorTheme.js
# packages/common/components/FilterInput/sub-components/FilterBlockItem.js
# packages/common/components/FilterInput/sub-components/FilterButton.js
# packages/common/components/FloatingButton/FloatingButton.js
# packages/common/components/Navigation/sub-components/item.js
# packages/common/store/AuthStore.js
# packages/components/badge/index.js
# packages/components/button/index.js
# packages/components/calendar/index.js
# packages/components/catalog-item/index.js
# packages/components/combobox/sub-components/combo-button.js
# packages/components/input-block/index.js
# packages/components/main-button/index.js
# packages/components/submenu/index.js
# packages/components/tabs-container/index.js
# packages/components/text-input/text-input.js
# packages/components/textarea/index.js
# packages/components/toggle-button/index.js
# packages/login/src/Login.jsx
|
2022-08-31 16:25:55 +03:00 |
|
|
|
849591813d
|
Merge branch 'develop' into feature/invite-panel
|
2022-08-31 15:53:14 +03:00 |
|
|
|
370696aba0
|
Web: Fixed property name for ColorTheme component, changed type => themeId
|
2022-08-31 15:38:39 +03:00 |
|
TimofeyBoyko
|
073b37aa86
|
Web:Common:Filter: fix after merge
|
2022-08-31 11:48:40 +03:00 |
|
|
|
58c2b8b392
|
Merge branch 'develop' into bugfix/init-reset-stores
|
2022-08-31 11:42:02 +03:00 |
|
TimofeyBoyko
|
8bda52c489
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-31 11:38:34 +03:00 |
|
TimofeyBoyko
|
52629d16df
|
Web:Common:Filter: add support dark theme
|
2022-08-31 11:28:17 +03:00 |
|
|
|
66412730de
|
Merge branch 'develop' into feature/invite-panel
|
2022-08-31 09:03:17 +03:00 |
|
Artem Tarasov
|
dc30ee143a
|
Web: Client/Common/Components: changed prop name type to elementType in ColorTheme component
|
2022-08-31 02:20:25 +03:00 |
|
Artem Tarasov
|
9abb4081f3
|
Web: Common: linkForgotPassword: fix after merge (login-ssr - file hierarchy changed)
|
2022-08-30 18:51:02 +03:00 |
|
