|
|
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 |
|
Viktor Fomin
|
28846ea77d
|
Common: Article: fix position with smart banner
|
2022-11-02 17:13:23 +05: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 |
|
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 |
|
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 |
|
|
|
c5ed1fd0da
|
Web: Client: Store: Added invite users action and api methods
|
2022-10-27 17:00:45 +03: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 |
|
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 |
|
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 |
|
TimofeyBoyko
|
9750335b3e
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-13 11:45:31 +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 |
|
