|
2828c3bb58
|
Web: Integration: Script: Added filter block to default config
|
2022-06-15 17:49:49 +03:00 |
|
|
2b88f8ac71
|
Web: Integration: Added base api for creating integration iframe component
|
2022-06-15 12:52:46 +03:00 |
|
|
78944a490e
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-21 18:55:41 +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
|
216ae27b25
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-20 18:04:57 +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 |
|
|
ee931b3098
|
Web: Files: fix share icon
|
2022-04-20 14:55:23 +03:00 |
|
|
e82a44d493
|
Merge pull request #617 from ONLYOFFICE/feature/redesign-sharing-panel
Feature/redesign sharing panel
|
2022-04-19 10:36:41 -04: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 |
|
|
ebff3a8f80
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-19 13:41:21 +03:00 |
|
|
d448691ae3
|
Web: fix view selector icons
|
2022-04-19 12:42:10 +03:00 |
|
Timofey Boyko
|
79a9b4175b
|
Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel
|
2022-04-19 09:56:59 +03:00 |
|
|
1bfd6a959c
|
Web: Files: fixed ConnectedClouds settings
|
2022-04-18 17:05:36 +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 |
|
|
47ffc849a5
|
Merge branch 'feature/virtual-rooms-1.2' into feature/connected-clouds-redesign
|
2022-04-18 15:05:23 +03:00 |
|
Timofey Boyko
|
ca9e132a67
|
Web: remove key 'DarkMode' in EU and RU locales
|
2022-04-18 12:37:08 +03:00 |
|
|
6dbf77317d
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-18 10:32:31 +03:00 |
|
|
b9a6c618bc
|
Web: Moved Connect translation, added new translations
|
2022-04-15 16:39:57 +03:00 |
|
Timofey Boyko
|
3194f8810e
|
Web:update image for access operation
|
2022-04-14 11:34:18 +03:00 |
|
|
165a5979a3
|
Web: Files: Added new translations.
|
2022-04-13 16:02:27 +03:00 |
|
|
35950126cb
|
Web: Files: Added new translations.
|
2022-04-13 15:14:37 +03:00 |
|
|
7086c7ebb5
|
Web: Files: Changed empty files page.
|
2022-04-13 10:08:20 +03:00 |
|
Timofey Boyko
|
d2c5cbb0eb
|
Web: update copy.react.svg
|
2022-04-11 18:56:59 +03:00 |
|
|
90bf5a7dc2
|
Web: Files: added info panel for OFORMsGallery
|
2022-04-07 16:52:16 +03:00 |
|
Timofey Boyko
|
397ff0d90d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-07 12:10:11 +03:00 |
|
|
342c938415
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-07 11:17:57 +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 |
|
Timofey Boyko
|
9aa24924ad
|
Web: add code.react.svg
|
2022-04-06 15:05:32 +03:00 |
|
|
c51741bf94
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-05 10:35:53 +03:00 |
|
|
45d2a31d03
|
Merge branch 'feature/virtual-rooms-1.2' into feature/add-units
# Conflicts:
# public/locales/de/Common.json
|
2022-04-04 19:34:51 +03:00 |
|
|
f04d679df4
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-04 18:25:32 +03:00 |
|
Timofey Boyko
|
d812df9332
|
Web: add new key 'DarkMode' for EU and RU locales
|
2022-04-04 13:31:55 +03:00 |
|
|
99cdaa0440
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
|
2022-04-01 15:46:42 +03:00 |
|
|
8c782a7903
|
Web: Files: added OFORMs gallery
|
2022-03-31 16:10:16 +03:00 |
|
|
8e777afb09
|
Web: change info icon
|
2022-03-30 19:39:09 +03:00 |
|
|
f41c65623b
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
# Conflicts:
# config/kafka.json
|
2022-03-30 11:14:47 +03:00 |
|
|
080079c944
|
Web: add avatar images
|
2022-03-29 11:19:35 +03:00 |
|
|
1922da4ab9
|
merge
|
2022-03-24 20:56:51 +03:00 |
|
mushka
|
cd82919062
|
merge with feature/virtual-rooms-1.2
|
2022-03-24 18:00:31 +03:00 |
|
|
9174a20871
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-common/api/portal/index.js
# packages/asc-web-common/components/Loaders/index.js
# packages/asc-web-common/store/SettingsStore.js
# packages/asc-web-components/file-input/index.js
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/save-cancel-buttons/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListRow.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/store/ContextOptionsStore.js
# public/locales/de/Common.json
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/NavMenu/index.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-rights.js
# web/ASC.Web.Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2022-03-24 14:39:52 +03:00 |
|
mushka
|
c51d920092
|
vr-1.2 actualization
|
2022-03-21 11:13:56 +03:00 |
|
|
6b84d183b8
|
Web: add translates
|
2022-03-17 12:41:57 +03:00 |
|
|
b0e22fdac9
|
Web: change password input icons
|
2022-03-16 12:47:44 +03:00 |
|
|
89b2f94469
|
Web: add missed translate for de
|
2022-03-16 11:19:44 +03:00 |
|
|
0cd4cb49ed
|
Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/themes/dark.js
# public/locales/de/Common.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Login/src/Login.jsx
|
2022-03-16 11:03:07 +03:00 |
|
|
cc293f60c2
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
|
2022-03-15 14:11:00 +03:00 |
|
|
de81329df2
|
WEb: Backup: Added help button component.
|
2022-03-15 12:43:02 +03:00 |
|
|
a7199bd3d4
|
Web: sort locales by key
|
2022-03-10 23:50:43 +03:00 |
|
|
afb0510fd6
|
Web: Moved translations to Common file (az).
|
2022-03-10 17:30:30 +03:00 |
|
|
1cb0345483
|
Web: Moved translations to Common file (bg).
|
2022-03-10 17:26:47 +03:00 |
|