|
|
e879d94bff
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# packages/asc-web-components/checkbox/index.js
# packages/asc-web-components/file-input/index.js
# packages/asc-web-components/index.js
# packages/asc-web-components/label/index.js
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
|
2022-06-15 13:52:00 +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
|
18925a8051
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 18:02:30 +03:00 |
|
Timofey Boyko
|
924409d1ab
|
Web:Common:Article: hide article header loader for file module
|
2022-04-20 18:02:22 +03:00 |
|
|
|
8ca6d0d0d5
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 17:27:53 +03:00 |
|
Timofey Boyko
|
0b270dd170
|
Web:Components:CatalogItem: remove hover effect for mobile devices
|
2022-04-20 17:15:44 +03:00 |
|
Timofey Boyko
|
bba207a4c9
|
Web:Components:TableContainer: hide disabled item for table group menu
|
2022-04-20 16:57:06 +03:00 |
|
|
|
cda1855242
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 16:05:36 +03:00 |
|
|
|
2cc9a2f2b5
|
Web: Files: added disabling hotkeys when opening the context menu
|
2022-04-20 16:05:24 +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 |
|
|
|
a4dcddc78d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 14:33:39 +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 |
|
|
|
45c746fdf2
|
Web: Components: Checkbox: fix style
|
2022-04-20 12:58:09 +03:00 |
|
|
|
b414598726
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 12:45:48 +03:00 |
|
|
|
68ac6c251b
|
Web:Common:Fix loaders settings.
|
2022-04-20 12:45:36 +03:00 |
|
|
|
c0dc7f3c7f
|
Web: Components: Checkbox: add helpButton prop, fix style
|
2022-04-20 12:33:51 +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 |
|
|
|
00d66aeb03
|
Web: Files: fixed button styles
|
2022-04-20 09:52:45 +03:00 |
|
|
|
634ecfae1b
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-19 20:09:01 +05:00 |
|
|
|
416c778f81
|
Web: Components: fixed mobile main button positioning
|
2022-04-19 20:08:47 +05:00 |
|
|
|
e82a44d493
|
Merge pull request #617 from ONLYOFFICE/feature/redesign-sharing-panel
Feature/redesign sharing panel
|
2022-04-19 10:36:41 -04:00 |
|
Timofey Boyko
|
22e0a78dcc
|
Web:Components:ModalDialog: add close modal dialog onpopstate event
|
2022-04-19 17:34:35 +03:00 |
|
