Timofey Boyko
|
71a3e5885b
|
Web:Common:Navigation: fix displaying for desktop devices, add max-width for header container and moved out from drop-box toggle info-panel button
|
2022-05-11 10:58:24 +03:00 |
|
Timofey Boyko
|
fd35268d20
|
Web:Common:Section: change display type for section header container to flex
|
2022-05-06 16:26:33 +03:00 |
|
Timofey Boyko
|
9f74bf994b
|
Web:Common:Navigation: move out toggle info panel button from control-btn to separate file
|
2022-05-06 15:11:04 +03:00 |
|
Timofey Boyko
|
60cfefce56
|
Web:Common:Navigation: fix header truncate
|
2022-05-06 12:25:19 +03:00 |
|
Timofey Boyko
|
1e2ee34976
|
Web:Common:Navigation: hide add button for tablet devices when dropbox is open
|
2022-05-06 10:40:37 +03:00 |
|
Timofey Boyko
|
24b90d0d65
|
Web:Common:Section: fix section main bar width
|
2022-05-05 17:38:09 +03:00 |
|
|
c849032503
|
Web: fixed mobile taps
|
2022-05-05 14:56:41 +03:00 |
|
Artem Tarasov
|
4955b55cf1
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-05 13:46:57 +03:00 |
|
Artem Tarasov
|
cc219c9bb3
|
Web: Common: MediaViewer: fixed zoom animation duration
|
2022-05-05 13:46:39 +03:00 |
|
|
bfa7b2d544
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-05 12:22:11 +03:00 |
|
|
3da10ceb66
|
Web: Common: added sorting for favorites folder
|
2022-05-05 12:22:00 +03:00 |
|
Timofey Boyko
|
39e859e5f5
|
Resolve conflicts after merge
|
2022-05-05 12:16:56 +03:00 |
|
|
664135b164
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-04 19:08:43 +03:00 |
|
|
813a484d72
|
Web:Common:Added props settingsStudio.Changed background for section-body_header for studio settings.
|
2022-05-04 17:51:44 +03:00 |
|
Timofey Boyko
|
13d0984abb
|
Web:Common:Section: reduce blur for section info-panel
|
2022-05-04 17:37:54 +03:00 |
|
|
48e5e71d0c
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-04 15:30:26 +03:00 |
|
|
3afe304561
|
Web: Files: Settings: fixed header font-size
|
2022-05-04 15:30:20 +03:00 |
|
Timofey Boyko
|
a462143de2
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-04 15:16:14 +03:00 |
|
Timofey Boyko
|
2c917533c2
|
Web:Common:AdvancedSelector: update resize for tablet and mobile devices, add close button for all device types
|
2022-05-04 14:58:15 +03:00 |
|
Timofey Boyko
|
874cbd1e0b
|
Web:Common:FilterInput: update resize for tablet and mobile view, add close button for all device types
|
2022-05-04 14:52:47 +03:00 |
|
|
3955ed1da6
|
Web: Components: fixed Navigation z-index
|
2022-05-04 14:42:27 +03:00 |
|
|
0304671347
|
Web: Common: AdvancedSelector: fix undefined error
|
2022-05-04 14:16:19 +03:00 |
|
|
c6ff2d701d
|
Web: Common: hidden plus button for mobile devices
|
2022-05-04 12:07:12 +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 |
|
|
860c53378b
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-05-03 21:18:54 +03:00 |
|
|
b2724c372c
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-29 19:34:06 +03:00 |
|
|
1354a20c7e
|
Web:Common:Added props settingsStudio.Changed paddingStyles for SectionBody for studio settings.
|
2022-04-29 19:33:57 +03:00 |
|
|
67d801d008
|
Web:Common:Added props settingsStudio. Added margin-bottom for studio settings.
|
2022-04-29 19:24:37 +03:00 |
|
|
6f1ad47147
|
Web:Common:Added props settingsStudio.
|
2022-04-29 19:22:09 +03:00 |
|
Timofey Boyko
|
1444bd7bcb
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-29 18:11:14 +03:00 |
|
Timofey Boyko
|
d0551c7df0
|
Web:Common:Components: hide view selector for row view
|
2022-04-29 18:11:05 +03:00 |
|
|
2dd44c77c0
|
Web:Common:Added props settingsStudio.
|
2022-04-29 17:42:50 +03:00 |
|
|
1f4399f7e6
|
Web: Common: Navigation: Fixed displaying for desktop
|
2022-04-29 16:48:30 +03:00 |
|
|
eb972b6a96
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-29 15:57:52 +03:00 |
|
|
88928cc77d
|
Web: Components: fixed info-panel styles
|
2022-04-29 15:57:43 +03:00 |
|
Timofey Boyko
|
3b36fe739a
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-29 15:47:08 +03:00 |
|
Timofey Boyko
|
c6cd085adf
|
Web:Common:Components: show sort button when section displayed as row for desktop
|
2022-04-29 15:46:59 +03:00 |
|
|
ea5aed37f9
|
Web: Common: FloatingButton: fix z-index
|
2022-04-29 14:26:52 +03:00 |
|
|
19e235d265
|
Web: Files: Added creation of thumbnail on open Info Panel + hide loading Info Panel api share on Personal
|
2022-04-28 22:05:43 +03:00 |
|
|
1c7d573396
|
Web: Common: Section: add isInfoPanelAvailable prop
|
2022-04-27 18:32:21 +03:00 |
|
|
49d6eaed27
|
Web: Common: Section: disable user select for info panel
|
2022-04-27 15:39:20 +03:00 |
|
Timofey Boyko
|
25ae366d40
|
Web:Common:Navigation: enable info-panel toggler when other buttons are not available
|
2022-04-26 17:41:07 +03:00 |
|
|
60be5b4a4a
|
Web: Common: Navigation: fix header height
|
2022-04-26 16:05:59 +03:00 |
|
Timofey Boyko
|
68970eeebd
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-26 13:43:04 +03:00 |
|
|
7b8ab2386e
|
Web: Common: Navigation: fix padding
|
2022-04-26 13:22:50 +03:00 |
|
Timofey Boyko
|
e024e29125
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-26 12:34:47 +03:00 |
|
Timofey Boyko
|
9a95657c00
|
Web:Common:Components: disable article on click backdrop
|
2022-04-26 12:34:41 +03:00 |
|
|
36ee64c312
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-26 12:13:38 +03:00 |
|
|
0ba95a003e
|
Web: Common: Navigation: fix header jumping
|
2022-04-26 12:13:29 +03:00 |
|
Timofey Boyko
|
e8fb7d8ecc
|
Web:Common:Components: fix height advanced selector for mobile
|
2022-04-26 10:38:34 +03:00 |
|
Timofey Boyko
|
eb30fca47c
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-25 18:21:18 +03:00 |
|
Timofey Boyko
|
a23b4249f1
|
Web:Files:Panels: increase height of embedding access combobox button for add users panel and add groups panel
|
2022-04-25 17:23:50 +03:00 |
|
Timofey Boyko
|
c7721a9e6a
|
Web:Common:Components: increase height for add-button of advanced selector
|
2022-04-25 17:10:15 +03:00 |
|
|
0c7f1f54ca
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-25 14:01:50 +03:00 |
|
|
3d7a92bde5
|
Web: Common: Navigation: fix tablet padding
|
2022-04-25 14:01:01 +03:00 |
|
Timofey Boyko
|
d20e23dec5
|
Web:Common:Components: fix article scroll on horizontal view mobile devices
|
2022-04-25 11:43:05 +03:00 |
|
Timofey Boyko
|
38ca116886
|
Web:Common:Components: change vh and vw to % for filter input
|
2022-04-25 11:23:10 +03:00 |
|
Timofey Boyko
|
5463b60bcf
|
Web:Common:Components: disable mobile view for sort button of filter block over than 428px
|
2022-04-25 11:15:51 +03:00 |
|
Timofey Boyko
|
0476dc6ff4
|
Web:Common:Components: add scrollbar to filter body
|
2022-04-25 10:52:05 +03:00 |
|
Timofey Boyko
|
322f0f9159
|
Web:Common:Components: disable mobile view for sort button of filter input
|
2022-04-25 10:36:56 +03:00 |
|
Timofey Boyko
|
f182ab8576
|
Web:Common:Components: add padding-bottom for scroll-body of info-panel
|
2022-04-22 19:31:28 +03:00 |
|
Timofey Boyko
|
e83ce43ec7
|
Web:Common:Components: fix info-panel display view for mobile devices, disable section scroll when info panel open for tablet and mobile devices
|
2022-04-22 19:26:49 +03:00 |
|
Timofey Boyko
|
747f407ab5
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-22 18:15:05 +03:00 |
|
Timofey Boyko
|
a96f11de53
|
Web:Common:Components: fix styles for close button of section info-panel
|
2022-04-22 18:10:20 +03:00 |
|
|
7b635b3532
|
Web: Files: fixed info-panel icon size
|
2022-04-22 15:41:21 +03:00 |
|
Timofey Boyko
|
0cc9a30483
|
Web:Common:Article: change height for IOS devices and add padding-bottom
|
2022-04-22 13:45:20 +03:00 |
|
Timofey Boyko
|
09d40d8601
|
Web:Common:Article: increase z-index for article container and backdrop
|
2022-04-22 13:12:02 +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 |
|
|
f9fb0777d1
|
Bump version to v1.2.0
|
2022-04-21 19:15:08 +03:00 |
|
|
78944a490e
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-21 18:55:41 +03:00 |
|
|
742d728013
|
Merge pull request #627 from ONLYOFFICE/feature/oforms-gallery
Feature/oforms gallery
|
2022-04-21 10:22:38 -04:00 |
|
|
a9a528ab84
|
Web: Files: createFormFromTemplate replaced with createFile
|
2022-04-21 16:57:44 +03:00 |
|
Timofey Boyko
|
fd331f9a17
|
Web:Common:Article: add id to article container
|
2022-04-21 16:51:01 +03:00 |
|
|
17cdd4b655
|
Web: Files: changed oforms loader
|
2022-04-21 16:37:32 +03:00 |
|
|
ebbd473ecf
|
Web: fixed getOforms language
|
2022-04-21 15:33:48 +03:00 |
|
|
fe0db050ff
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-21 14:49:18 +03:00 |
|
|
e7b4280df2
|
Web: Files: fixed getOforms
|
2022-04-21 14:38:14 +03:00 |
|
|
50d627e58c
|
Web: Files: fixed getOforms
|
2022-04-21 13:57:04 +03:00 |
|
Timofey Boyko
|
5ce250acd0
|
Web:Common:FilterInput: add backdrop when sort button is open and change sort desc on second click for sort button item
|
2022-04-21 12:35:10 +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 |
|
Timofey Boyko
|
01a04029e5
|
Web:Common:Store: add new method 'changeTheme' for user store
|
2022-04-21 10:31:32 +03:00 |
|
|
8aa32c4717
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 10:29:57 +03:00 |
|
|
01ea9af926
|
Web: Files: fixed version history page
|
2022-04-21 10:29:49 +03:00 |
|
Timofey Boyko
|
8125631485
|
Web:Common:Api: add new api method 'changeTheme'
|
2022-04-21 10:23:06 +03:00 |
|
Timofey Boyko
|
b1b78068d6
|
Web:Common:Constants: add new constant 'ThemeKeys'
|
2022-04-21 10:17:15 +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 |
|
|
7a55486b71
|
Web:Common:Fix location.pathname.
|
2022-04-20 18:29:29 +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 |
|
Timofey Boyko
|
924409d1ab
|
Web:Common:Article: hide article header loader for file module
|
2022-04-20 18:02:22 +03:00 |
|
Timofey Boyko
|
b2d869b797
|
Web:Common:Components: fix navigation dropbox height for only mobile devices when scroll down
|
2022-04-20 16:03:55 +03:00 |
|
|
04fc13073f
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
|
2022-04-20 15:11:00 +03:00 |
|
|
9bc8dee5bd
|
Web: Common: fixed section-container width
|
2022-04-20 14:22:46 +03:00 |
|
|
11163c3129
|
Web: Files: added creating forms from the gallery
|
2022-04-20 14:02:22 +03:00 |
|
Timofey Boyko
|
307de4ddcc
|
Web:Common:Section: fix styled for mobile devices
|
2022-04-20 14:02:20 +03:00 |
|
Timofey Boyko
|
6d7434df4e
|
Web:Common:Components: delete useless code from navigation item component
|
2022-04-20 13:13:33 +03:00 |
|
Timofey Boyko
|
9c02075e06
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 13:06:29 +03:00 |
|
Timofey Boyko
|
cf27535d11
|
Web:Common:Components: fix control button width and position
|
2022-04-20 13:04:31 +03:00 |
|
|
68ac6c251b
|
Web:Common:Fix loaders settings.
|
2022-04-20 12:45:36 +03:00 |
|
Timofey Boyko
|
e489943844
|
Web:Common:Components: close dropbox of navigation when user toggle info panel
|
2022-04-20 12:24:14 +03:00 |
|
Timofey Boyko
|
91b091a94d
|
Web:Common:Components: add resize event listener and change dropbox width when window resize
|
2022-04-20 12:18:59 +03:00 |
|
Timofey Boyko
|
b657b8783e
|
Web:Files:Components: fix loader size for sharing panel modal view
|
2022-04-19 16:22:34 +03:00 |
|
Timofey Boyko
|
39f08707e9
|
Web: delete useless code
|
2022-04-19 15:19:50 +03:00 |
|
Timofey Boyko
|
58d61b4366
|
Web:Files:Components: add isShared prop for modal loader
|
2022-04-19 14:58: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 |
|
Timofey Boyko
|
7bb0e9872c
|
Web:Common:Components: fix padding for sharing panel modal loader
|
2022-04-19 13:00:33 +03:00 |
|
|
f94a06cf43
|
Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel
|
2022-04-19 12:46:30 +03:00 |
|
Timofey Boyko
|
ac7cd83342
|
Web:Common:Components: fix rectangle loader for modal view of sharing panel loader
|
2022-04-19 11:51:57 +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 |
|
|
5945e063dc
|
Web:Common:Added setCultures from SettingsStore.
|
2022-04-19 10:33:17 +03:00 |
|
|
f557ca8dbe
|
Web:Common:Removed LoaderArticleBody.
|
2022-04-19 10:31:48 +03:00 |
|
|
3157b6628c
|
Web:Common:Added props isLoadedPage, added loader display conditions.
|
2022-04-19 10:30:56 +03:00 |
|
Timofey Boyko
|
0b6ee5ddc2
|
Web:Common:Components: add loader for sharing panel modal view
|
2022-04-19 07:55:37 +03:00 |
|
Timofey Boyko
|
2a969897f8
|
Web:Files:Panels: fix layout sharing panel footer
|
2022-04-18 18:22:35 +03:00 |
|
Timofey Boyko
|
1abd712f67
|
Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel
|
2022-04-18 15:21:48 +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 |
|
|
6dbf77317d
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-18 10:32:31 +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
|
cf6d28e4c7
|
Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel
|
2022-04-15 18:07:10 +03:00 |
|
|
8021b837eb
|
Web: Files: Added ability to cancel requests.
|
2022-04-15 14:03:20 +03:00 |
|
|
ce73b308e3
|
Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign
|
2022-04-15 11:46:28 +03:00 |
|
|
8674260bcb
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
# Conflicts:
# web/ASC.Web.Client/tests/action_tests.js
|
2022-04-14 14:42:35 +03:00 |
|
|
d3dc0ec7b5
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into bugfix/security-settings
|
2022-04-14 13:25:29 +03:00 |
|
|
fbb04ea80f
|
Web: Common: TfaStore: delete useless
|
2022-04-14 12:41:24 +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 |
|
|
720703cbab
|
Web: Common: fixed filter loader for mobile devices
|
2022-04-14 11:01:00 +03:00 |
|
|
d1d0c54f9e
|
Web: Files: Renamed key for api.
|
2022-04-13 16:52:29 +03:00 |
|
|
b631b6c7a7
|
Web: Files: Fixed key.
|
2022-04-13 16:39:48 +03:00 |
|
|
c02b2313c4
|
Web: Common: fix api request
|
2022-04-12 13:36:40 +03:00 |
|
|
193c1b2c9c
|
Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign
|
2022-04-12 12:01:25 +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 |
|
|
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 |
|
Timofey Boyko
|
bf7be4582d
|
Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel
|
2022-04-11 12:06:51 +03:00 |
|
|
d07c5e071e
|
Web: Files: Renamed function, refactoring.
|
2022-04-11 11:14:05 +03:00 |
|
|
002a432b4d
|
Web: fixed info-panel icon
|
2022-04-11 11:11:44 +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 |
|
|
a2995f37e6
|
Web:Common:Added article loader.
|
2022-04-10 18:23:21 +03:00 |
|
|
0810423799
|
Web:Files/Common: Added new loaders.
|
2022-04-10 14:20:06 +03:00 |
|
|
34d4b5dbaa
|
Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign
|
2022-04-10 12:29:24 +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 |
|
Timofey Boyko
|
4776087869
|
Web:Common:AdvancedSelector: fix error when groupList is empty
|
2022-04-08 15:42:16 +03:00 |
|
Timofey Boyko
|
e9bdba319a
|
Web:Common:AdvancedSelector: fix onChange fucntion in SearchInput
|
2022-04-08 15:36:42 +03:00 |
|
|
231395fd05
|
Web: Common: delete useless
|
2022-04-08 13:18:30 +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 |
|
|
070b2cb646
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-08 11:01:47 +03:00 |
|
Timofey Boyko
|
2096b8b782
|
Web:Common:Components: fix position context-menu-button for navigation
|
2022-04-07 17:59:03 +03:00 |
|
|
883cc628ea
|
Web: Common: add session lifetime
|
2022-04-07 17:55:44 +03:00 |
|
|
ab0404e1dc
|
Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
|
2022-04-07 17:32:15 +03:00 |
|
Timofey Boyko
|
7bc5c357c8
|
Web:Common:Components: fix navigation layouts
|
2022-04-07 17:28:18 +03:00 |
|
Timofey Boyko
|
2f218e6de2
|
Web:Common:Components: remove fixed section header width and fix it for all device types
|
2022-04-07 17:27:48 +03:00 |
|
|
342c938415
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-07 11:17:57 +03:00 |
|
|
2962c0ca38
|
Merge branch 'feature/trusted-mail' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-04-07 04:10:15 +03:00 |
|
|
860b87c932
|
Web: Common: SettingsStore: add setMessageSettings
|
2022-04-07 04:02:34 +03:00 |
|
|
c6b81c6e94
|
Merge branch 'feature/virtual-rooms-1.2' into feature/trusted-mail
|
2022-04-06 21:32:36 +03:00 |
|
|
aa91c6389c
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
# Conflicts:
# packages/asc-web-common/components/Section/sub-components/section-container.js
|
2022-04-06 20:36:36 +03:00 |
|
|
3ef7ae85de
|
Web: SelectFolder: Optimization, refactoring.
|
2022-04-06 18:04:43 +03:00 |
|
|
fffb843ae6
|
Web: Common: add ipRestriction in store
|
2022-04-06 14:09:26 +03:00 |
|
|
adad06610f
|
Web: Common: API: fix, add getIpRestrictions
|
2022-04-06 14:08:52 +03:00 |
|
|
12c67953e5
|
Web: Common: SettingsStore: add setMailDomainSettings
|
2022-04-05 15:35:40 +03:00 |
|
|
1627a3edf7
|
Web: Common: add avaliable to tfa store
|
2022-04-05 14:40:45 +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 |
|
|
331ab31e02
|
Merge branch 'feature/password-strength' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
# 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
|
2022-04-05 11:18:28 +03:00 |
|
|
50b523b862
|
Web: Common: SettingsStore: fix
|
2022-04-05 11:09:50 +03:00 |
|
|
c51741bf94
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-05 10:35:53 +03:00 |
|
Timofey Boyko
|
e270202bf1
|
Web:Common:Section: change width when section header doesnt exist
|
2022-04-04 18:31:54 +03:00 |
|
|
f04d679df4
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-04 18:25:32 +03:00 |
|
Timofey Boyko
|
513a2c2b5e
|
Web:Common:Section: remove fixed width depend of article
|
2022-04-04 18:23:01 +03:00 |
|
mushka
|
5a5237d927
|
fixed ad bar sizing with InfoPanel open & redesigned thumbnail scaling
|
2022-04-04 17:40:45 +03:00 |
|
mushka
|
a226566a62
|
fix close button design
|
2022-04-04 15:19:59 +03:00 |
|
|
fc83ee53a8
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-04 15:18:12 +03:00 |
|
|
3d3d383681
|
Web: Files: fixed FormGallery thumbnails
|
2022-04-04 15:17:24 +03:00 |
|
mushka
|
1af0383514
|
resolved problem with updated section width calculation
|
2022-04-04 14:57:22 +03:00 |
|
Timofey Boyko
|
c6b6ee5536
|
Web:Common:Loaders: fix article groups loader for tablet devices
|
2022-04-04 14:38:13 +03:00 |
|
|
2c98be7110
|
Web: Common: SettingsStore: delete duplicate
|
2022-04-04 14:13:01 +03:00 |
|
mushka
|
fa49b3120b
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
|
2022-04-04 12:25:22 +03:00 |
|
mushka
|
04dd738082
|
resolving conflicts before updating to feature/virtual-rooms-1.2 2
|
2022-04-04 12:25:16 +03:00 |
|
mushka
|
a985ad95a9
|
resolving conflicts before updating to branch feature/virtual-rooms-1.2
|
2022-04-04 12:23:54 +03:00 |
|
Timofey Boyko
|
a6923277a7
|
Web:Common:Article: add changin isMobileArticle when device size or type wer change
|
2022-04-04 10:53:39 +03:00 |
|
Timofey Boyko
|
7081c3610a
|
Web:Common:Store: add isMobileArticle var
|
2022-04-04 10:52:25 +03:00 |
|
Timofey Boyko
|
f21e6e6ffe
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-04 09:55:40 +03:00 |
|
|
fdfa1142c4
|
Merge branch 'feature/virtual-rooms-1.2' into feature/confirm-redesign
|
2022-04-01 18:18:35 +03:00 |
|
Timofey Boyko
|
8c6c2cbb58
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-01 18:14:06 +03:00 |
|
Timofey Boyko
|
11bd8e524e
|
Web:Common:Section: fix section width on login page
|
2022-04-01 17:43:16 +03:00 |
|
Timofey Boyko
|
6e82ab4fae
|
Web:Common:Section: fix section margin-top for people module
|
2022-04-01 17:24:07 +03:00 |
|
Timofey Boyko
|
f5f8d49061
|
Web:Common:Section: delete useless code
|
2022-04-01 17:23:40 +03:00 |
|
Timofey Boyko
|
5589b6b503
|
Web:Common:Section: reduce z-index section-header
|
2022-04-01 17:14:22 +03:00 |
|
Timofey Boyko
|
16ce2b8dc3
|
Web:Common:Section: display main bar in select module page
|
2022-04-01 17:11:25 +03:00 |
|
|
99cdaa0440
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
|
2022-04-01 15:46:42 +03:00 |
|