|
|
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 |
|
|
|
31c6e0a7aa
|
Web:Common:Add delete method.
|
2022-11-01 18:26:05 +03: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 |
|
|
|
36e47cbe2e
|
Merge branch 'develop' into feature/invite-accounts
|
2022-10-28 14:54:46 +03: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 |
|
|
|
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 |
|
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 |
|
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 |
|
|
|
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 |
|
