Artem Tarasov
|
045c00b4ff
|
Web: Common/Doceditor: fixed name of init state of editor
|
2022-07-26 10:56:25 +03:00 |
|
Artem Tarasov
|
64305a3c2c
|
Web: Common/Doceditor: fixed request of build version and custom scheme
|
2022-07-25 17:10:38 +03:00 |
|
Artem Tarasov
|
e701def2d7
|
Web: Common/Doceditor: fixed portal settings request
|
2022-07-25 16:24:10 +03:00 |
|
|
|
2fe786769f
|
Web: Common: SettingsStore: fix logo url
|
2022-07-21 14:43:22 +03:00 |
|
|
|
404e014a59
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# products/ASC.Files/Client/src/Files.jsx
|
2022-07-12 14:18:29 +03:00 |
|
|
|
0da612710d
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings
|
2022-07-07 19:39:12 +03:00 |
|
TimofeyBoyko
|
3e07ef1efc
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-01 10:09:47 +03:00 |
|
TimofeyBoyko
|
d5360740bb
|
Web:Common:SettingsStore: add docSpace var
|
2022-06-28 17:15:08 +03:00 |
|
TimofeyBoyko
|
fd062b7cd6
|
Web:Files: change docspace to docSpace
|
2022-06-28 16:36:48 +03:00 |
|
|
|
097290e8a2
|
Fix Bug 57787 - Selected user's theme option is used for Desktop Editors
|
2022-06-27 19:22:59 +03:00 |
|
TimofeyBoyko
|
c8326d0145
|
Web:Common:SettingsStore: add docspace var
|
2022-06-22 12:06:50 +03:00 |
|
|
|
7ddb0506c9
|
Web: Files: moved Hotkeys translation, added button to open hotkeys
|
2022-06-10 11:30:57 +03:00 |
|
|
|
d77b0b6b32
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/security-settings
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/passwordStrength.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/tfa.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/trustedMail.js
|
2022-06-08 17:53:49 +03:00 |
|
Artem Tarasov
|
1f856ef377
|
Web: Common/People: Fixed Bug 57478 - Client.Profile. The ‘Learn more’ link in the popup helper window leads to a page with a 404 Error.
|
2022-06-08 17:44:27 +03:00 |
|
|
|
45742f6f1e
|
Web: Common: SettingsStore: delete console log
|
2022-06-07 14:21:22 +03:00 |
|
|
|
753d0b0605
|
Merge branch 'feature/admin-messages' of github.com:ONLYOFFICE/AppServer into feature/session-lifetime
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
# web/ASC.Web.Client/public/locales/en/Settings.json
|
2022-06-01 14:26:24 +03:00 |
|
|
|
cd802863f6
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
|
2022-05-22 21:21:28 +03:00 |
|
|
|
8cc7d44912
|
Web:Common:Added isBurgerLoading and setIsBurgerLoading to SettingsStore.
|
2022-05-12 14:57:58 +03:00 |
|
|
|
fe4b4d3c2d
|
Merge branch 'feature/admin-messages' of github.com:ONLYOFFICE/AppServer into feature/session-lifetime
|
2022-05-03 21:22:47 +03:00 |
|
|
|
01eff8cfa3
|
Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
|
2022-05-03 21:22:17 +03:00 |
|
|
|
175b934fc8
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/ip-security
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
|
2022-04-21 20:28:36 +03:00 |
|
|
|
78944a490e
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-21 18:55:41 +03:00 |
|
|
|
ebbd473ecf
|
Web: fixed getOforms language
|
2022-04-21 15:33:48 +03:00 |
|
|
|
50d627e58c
|
Web: Files: fixed getOforms
|
2022-04-21 13:57:04 +03:00 |
|
|
|
2bf6dec41d
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
# products/ASC.Files/Client/src/store/FilesStore.js
|
2022-04-21 10:53:58 +03:00 |
|
Timofey Boyko
|
414976c49f
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-21 10:41:06 +03:00 |
|
Timofey Boyko
|
dfe16d0671
|
Web:Common:Store: update 'setTheme' method for settingsStore
|
2022-04-21 10:32:56 +03:00 |
|
|
|
bcef47efa2
|
Web:Common:Added tenantAlias, setTenantAlias to SettingsStore.
|
2022-04-20 18:24:21 +03:00 |
|
Timofey Boyko
|
216ae27b25
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-20 18:04:57 +03:00 |
|
|
|
e8c46ba42c
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2022-04-19 14:04:10 +03:00 |
|
|
|
5945e063dc
|
Web:Common:Added setCultures from SettingsStore.
|
2022-04-19 10:33:17 +03:00 |
|
Timofey Boyko
|
4f61253687
|
Web:Common:SettingsStore: add theme-key to local storage when set theme method is called
|
2022-04-18 12:16:55 +03:00 |
|
Timofey Boyko
|
d9dec59157
|
Web:Common:Store: change default theme to base
|
2022-04-18 12:05:09 +03:00 |
|
Timofey Boyko
|
797c96a46e
|
Web:Common:Store: add new theme key 'system' for setTheme method
|
2022-04-18 11:51:01 +03:00 |
|
Timofey Boyko
|
4d65b5fcc8
|
Web:Common:Store: remove change theme method from settings store
|
2022-04-18 10:59:35 +03:00 |
|
|
|
6d7bb2747b
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
|
2022-04-14 11:14:24 +03:00 |
|
|
|
c02b2313c4
|
Web: Common: fix api request
|
2022-04-12 13:36:40 +03:00 |
|
|
|
d61612fdf5
|
Merge branch 'feature/admin-messages' of github.com:ONLYOFFICE/AppServer into feature/session-lifetime
# Conflicts:
# packages/asc-web-common/store/AuthStore.js
|
2022-04-12 11:31:41 +03:00 |
|
|
|
c62b18b68b
|
Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
|
2022-04-12 11:28:54 +03:00 |
|
|
|
5dd5e22ba5
|
Web: Common: fix ipRestrictions
|
2022-04-11 17:05:55 +03:00 |
|
|
|
3f70481d3a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
# Conflicts:
# packages/asc-web-common/store/AuthStore.js
|
2022-04-08 16:51:26 +03:00 |
|
|
|
21489279b4
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
# Conflicts:
# web/ASC.Web.Client/src/store/SettingsSetupStore.js
|
2022-04-08 16:42:11 +03:00 |
|
|
|
31dadfd140
|
Web: removed unused code
|
2022-04-08 15:45:08 +03:00 |
|
|
|
883cc628ea
|
Web: Common: add session lifetime
|
2022-04-07 17:55:44 +03:00 |
|
|
|
342c938415
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-07 11:17:57 +03:00 |
|
|
|
860b87c932
|
Web: Common: SettingsStore: add setMessageSettings
|
2022-04-07 04:02:34 +03:00 |
|
|
|
fffb843ae6
|
Web: Common: add ipRestriction in store
|
2022-04-06 14:09:26 +03:00 |
|
|
|
12c67953e5
|
Web: Common: SettingsStore: add setMailDomainSettings
|
2022-04-05 15:35:40 +03:00 |
|
|
|
ca4d825cf8
|
Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-05 14:32:33 +03:00 |
|
|
|
62daba2e97
|
Web: Common: fix crash
|
2022-04-05 14:32:02 +03:00 |
|
