|
f3a144327a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-04-11 12:09:59 +03:00 |
|
|
433c684d09
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 12:08:50 +03:00 |
|
|
002a432b4d
|
Web: fixed info-panel icon
|
2022-04-11 11:11:44 +03:00 |
|
|
90cade35e3
|
Merge pull request #609 from ONLYOFFICE/feature/iprestrictions
iprestrictions
|
2022-04-11 10:54:26 +03:00 |
|
|
3c013939bc
|
Merge branch 'develop' into feature/iprestrictions
|
2022-04-11 10:38:12 +03:00 |
|
|
95959317a2
|
fix
|
2022-04-11 10:38:00 +03:00 |
|
|
952996f534
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-10 20:08:22 +03:00 |
|
|
a2c1e836c0
|
Web:Studio:Added LoaderSubmenu.
|
2022-04-10 19:57:43 +03:00 |
|
|
34f223d67c
|
Web:Studio:Added LoaderSectionHeader.
|
2022-04-10 19:24:05 +03:00 |
|
|
a2995f37e6
|
Web:Common:Added article loader.
|
2022-04-10 18:23:21 +03:00 |
|
|
b0a64cbac7
|
Web: Client: Settings: fix after merge
|
2022-04-08 16:54:26 +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 |
|
|
df580e9938
|
Merge pull request #607 from ONLYOFFICE/feature/trusted-mail
Feature/trusted mail
|
2022-04-08 09:49:02 -04: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 |
|
|
860982c889
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-08 16:37:44 +03:00 |
|
|
d2ba43ce4b
|
Web:Studio:Added setIsLoadingArticleSettings method.
|
2022-04-08 16:37:33 +03:00 |
|
|
dcb6e9b4a7
|
Web: Components: SaveCancelButtons: fix width
|
2022-04-08 16:32:33 +03:00 |
|
|
f835484454
|
Web: Client: Settings: fix width
|
2022-04-08 16:12:34 +03:00 |
|
Eugene Kozyrev
|
542df3d847
|
Change project language (#612)
|
2022-04-08 16:04:09 +03:00 |
|
|
b2d162b630
|
Web: Client: Settings: use SaveCancelButtons
|
2022-04-08 16:01:03 +03:00 |
|
|
31dadfd140
|
Web: removed unused code
|
2022-04-08 15:45:08 +03:00 |
|
Timofey Boyko
|
9bdf036f18
|
Web:Files: delete useless code
|
2022-04-08 15:33:45 +03:00 |
|
|
9aa95c6462
|
Web: Client: fix isSaving
|
2022-04-08 15:18:58 +03:00 |
|
|
d9e991327c
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-08 15:02:03 +03:00 |
|
|
136fa429b7
|
Web: Client: Settings: return isLoading
|
2022-04-08 15:01:53 +03:00 |
|
|
5a6badff68
|
Web: Components: Ipad: fixed arrow icon size for table header
|
2022-04-08 14:48:02 +03:00 |
|
|
c3be1ec82d
|
Web: Components: Ipad: fixed search-input height
|
2022-04-08 14:46:42 +03:00 |
|
Tatiana Lopaeva
|
af86179e02
|
Merge pull request #611 from ONLYOFFICE/bugfix/fixed-hotkeys-selection-with-arrows
Web: Files: Hotkeys: fixed arrows selection
|
2022-04-08 13:50:40 +03:00 |
|
|
e251a58ad0
|
Web: Client: Settings: add button loader
|
2022-04-08 13:33:50 +03:00 |
|
Timofey Boyko
|
e0338c0005
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-08 13:32:06 +03:00 |
|
Timofey Boyko
|
b232108ff6
|
Web:Components:Avatar: fix error when source is undefined
|
2022-04-08 13:32:01 +03:00 |
|
|
3fc58edcb9
|
Web: Client: init settings outside shell
|
2022-04-08 13:19:50 +03:00 |
|
|
231395fd05
|
Web: Common: delete useless
|
2022-04-08 13:18:30 +03:00 |
|
|
b2fa7884d3
|
Web: Files: Hotkeys: fixed arrows selection
|
2022-04-08 13:09:47 +03:00 |
|
Eugene Kozyrev
|
4012a9b713
|
Add ZooKeeper and Kafka connection check on Windows installation (#610)
* Add zookeeper/kafka connection check
* Edit build script
|
2022-04-08 13:04:51 +03:00 |
|
|
d04de3b4f7
|
Web: Client: Settings: delete console
|
2022-04-08 12:33:03 +03:00 |
|
|
4a3325b988
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-08 12:24:25 +03:00 |
|
|
6d0f4fb37d
|
Web: Common: delete useless
|
2022-04-08 12:24:14 +03:00 |
|
|
797c71551b
|
Web: Client: move init tfa to setupStore
|
2022-04-08 12:23:54 +03:00 |
|
|
b72d14dc98
|
Web: Client: Tests: add trusted mail settings change test server error
|
2022-04-08 12:09:12 +03:00 |
|
|
f9c5bc65ce
|
Web: Client: Settings: delete useless
|
2022-04-07 22:04:16 +03:00 |
|
|
54fb5f3ab7
|
Web: Client: Settings: fix
|
2022-04-07 20:39:58 +03:00 |
|
|
8ccb5bd793
|
Web: Client: Settings add try/catch
|
2022-04-07 20:38:13 +03:00 |
|
|
851614569f
|
Web: Client: Settings: fix header title
|
2022-04-07 18:33:39 +03:00 |
|
|
42bba2b975
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-07 18:24:18 +03:00 |
|
|
d5f3b4f0e6
|
Web:Studio:Added loaderCustomization, loaderCustomizationNavbar, loaderDescriptionCustomization.
|
2022-04-07 18:23:33 +03:00 |
|
Timofey Boyko
|
ed3c25f61d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-07 18:02:05 +03:00 |
|
Timofey Boyko
|
2096b8b782
|
Web:Common:Components: fix position context-menu-button for navigation
|
2022-04-07 17:59:03 +03:00 |
|
Timofey Boyko
|
7bc5c357c8
|
Web:Common:Components: fix navigation layouts
|
2022-04-07 17:28:18 +03:00 |
|
|
c7a8ca7309
|
Web: Client: Settings: fix category wrapper
|
2022-04-07 17:27:52 +03:00 |
|