|
|
7803b0e33c
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-08 16:54:02 +03:00 |
|
|
|
cc64fc9887
|
Web: Files: fixed selectionParentRoom error
|
2022-11-08 14:11:17 +03: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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
