|
|
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 |
|
|
|
0c141bba1a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 18:08:42 +03:00 |
|
|
|
1f9fa82051
|
Web:Studio:Added validation for setting Portal Renaming. Added locales en "PortalNameEmpty", "PortalNameIncorrect", "PortalNameLength".
|
2022-04-21 18:07:26 +03:00 |
|
|
|
d6feda992b
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 17:33:16 +03:00 |
|
Timofey Boyko
|
8c12ec36d5
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 16:51:59 +03:00 |
|
Timofey Boyko
|
0428c3d6af
|
Web:Client:Components: set correct height for main and article containers for IOS devices
|
2022-04-21 16:51:51 +03:00 |
|
|
|
3373a01d9e
|
Web: Client: NavMenu: fix logo pos
|
2022-04-21 16:25:42 +03:00 |
|
|
|
41c505da8f
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 14:48:35 +03:00 |
|
|
|
596153ac21
|
Web:Studio:Fix reminderTest.
|
2022-04-21 14:47:18 +03:00 |
|
Timofey Boyko
|
e33ff6a576
|
Web:Client:Components: return --vh for ios devices
|
2022-04-21 13:06:47 +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
|
e5ce29f635
|
Web:Studio:Shell: update theme when current user theme changed
|
2022-04-21 10:36:22 +03:00 |
|
|
|
b4c6e550dc
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 18:31:08 +03:00 |
|
|
|
03f24dacac
|
Web:Studio:Fix location.pathname.
|
2022-04-20 18:29:13 +03:00 |
|
|
|
49e50093bc
|
Web:Studio:Delete console.log.
|
2022-04-20 18:28:34 +03:00 |
|
|
|
d703edba81
|
Web:Studio:Added tenantAlias, checkChanges function to PortalRenaming.
|
2022-04-20 18:26:23 +03:00 |
|
Timofey Boyko
|
216ae27b25
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-20 18:04:57 +03:00 |
|
Timofey Boyko
|
2c9a22e1d4
|
Web:Studio:NavMenu: increase z-index for header-nav component
|
2022-04-20 16:27:55 +03:00 |
|
|
|
3d8e1b9c65
|
Web:Studio:Fix loaders settings.
|
2022-04-20 12:45:17 +03:00 |
|
|
|
48700b3efa
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-19 17:59:13 +03:00 |
|
|
|
1286610463
|
Web:Studio:Fix loader WelcomePageSettings.
|
2022-04-19 17:58:54 +03:00 |
|
|
|
e825bc6b5b
|
Web: Client: NavMenu: fix avatar size
|
2022-04-19 16:10:18 +03:00 |
|
|
|
f7bc235471
|
Web: Client: Home: align tiles
|
2022-04-19 14:20:19 +03:00 |
|
|
|
32ff86acbe
|
Web:Studio:LoaderArticleBody fix styles.
|
2022-04-19 14:19:53 +03:00 |
|
|
|
17dcbec78f
|
Web: Client: NavMenu: hide icon on home
|
2022-04-19 14:13:47 +03:00 |
|
|
|
afb18aa7cc
|
Web:Studio:Removed Automatic time zone setting.
|
2022-04-19 14:05:10 +03:00 |
|
|
|
c2b75de71b
|
Web: Client: fixed settingsModule
|
2022-04-19 12:42:36 +03:00 |
|
|
|
9cfc7da713
|
Web: Client: removed route to settings for personal
|
2022-04-19 12:19:55 +03:00 |
|
|
|
b6d838eaa3
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-19 11:16:50 +03:00 |
|
|
|
c392c3ae62
|
Web:Studio:Added HOC withLoading, removed HOC withCultureNames, added mapCulturesToArray function, refactoring.
|
2022-04-19 11:14:00 +03:00 |
|
|
|
9d8083f1ed
|
Web:Studio: Removed setIsLoadingArticleSettings.
|
2022-04-19 10:45:45 +03:00 |
|
|
|
cec7ce193c
|
Web:Studio:Added CommonStore.
|
2022-04-19 10:45:15 +03:00 |
|
|
|
83cdd51272
|
Web:Components: Removed LoaderSubmenu.
|
2022-04-19 10:44:38 +03:00 |
|
|
|
f146c36274
|
Web:Studio:Added LoaderArticleBody.
|
2022-04-19 10:44:10 +03:00 |
|
|
|
323f17da3a
|
Web:Studio:Added loadBaseInfo.
|
2022-04-19 10:43:35 +03:00 |
|
|
|
e0f8e6eea4
|
Web:Studio:Added HOC withLoading.
|
2022-04-19 10:26:48 +03:00 |
|
|
|
f48809b13a
|
Web:Components:Added HOC withLoading.
|
2022-04-19 10:25:22 +03:00 |
|
|
|
3344a1652e
|
Web:Studio:Added HOC withLoading.
|
2022-04-19 10:22:21 +03:00 |
|
Timofey Boyko
|
d6fcc35703
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-18 15:11:50 +03:00 |
|
Timofey Boyko
|
f927aaacb3
|
Web:Studio: add check theme key from local storage
|
2022-04-18 14:47:31 +03:00 |
|
Timofey Boyko
|
f14712dde1
|
Web:Studio:Shell: update check theme method
|
2022-04-18 12:13:45 +03:00 |
|
|
|
58f88b94ad
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-18 11:23:56 +03:00 |
|
|
|
c225e5b90a
|
Web: Client: Settings: fix title width
|
2022-04-18 11:23:47 +03:00 |
|
Timofey Boyko
|
35f8826dec
|
Web:Studio: add action check of user actions for profile menu
|
2022-04-18 11:03:44 +03:00 |
|
|
|
c0406b0727
|
Web: Client: Settings: fix checkbox area click
|
2022-04-17 19:53:14 +03:00 |
|
|
|
3ab0bdd11f
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-04-15 20:34:36 +03:00 |
|
Timofey Boyko
|
5ef5873978
|
Merge branch 'feature/redesign-profile-menu' of github.com:ONLYOFFICE/AppServer into feature/redesign-profile-menu
|
2022-04-15 19:04:19 +03:00 |
|
Timofey Boyko
|
7f6db27bf8
|
Web:Studio:ProfileMenu: change top and right indents for dropdown container
|
2022-04-15 19:03:43 +03:00 |
|
Timofey Boyko
|
216896b421
|
Web:Studio:ProfileMenu: delete useless code
|
2022-04-15 18:59:12 +03:00 |
|
