|
|
fbb9120a2d
|
Web: revert config
|
2022-07-05 23:37:56 +03:00 |
|
|
|
95ce082219
|
Web: Components: Added DropDown offsetLeft default value
|
2022-07-05 22:56:18 +03:00 |
|
|
|
fd9dc93fe6
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# config/kafka.json
|
2022-04-21 18:54:28 +03:00 |
|
|
|
95086e5d94
|
fix kafka settings
|
2022-04-21 14:06:32 +03:00 |
|
Timofey Boyko
|
5b3c46bce7
|
Fix kafka config
|
2022-04-12 12:15:43 +03:00 |
|
mushka
|
fb2cb1316a
|
changed thumbnail styling
|
2022-04-01 17:39:03 +03:00 |
|
mushka
|
463a1f54a9
|
fix kafka conflict
|
2022-03-29 14:32:50 +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
|
bb69417dbf
|
fix kafka code formatting and ContextMenu - InfoPanel layering interaction
|
2022-03-03 16:23:45 +03:00 |
|
mushka
|
6b88a2dd43
|
change code formatting 2
|
2022-03-03 13:59:20 +03:00 |
|
mushka
|
424a7a7e3c
|
change code formatting
|
2022-03-03 13:43:43 +03:00 |
|
mushka
|
e77a97e105
|
added checkbox menu interaction and new opening mechanics
|
2022-03-02 17:19:19 +03:00 |
|
mushka
|
518abb7a2f
|
added sever files, fixed closeOnclick interaction, added alternative thumbnail and implemented destructorization
|
2022-02-28 15:53:46 +03:00 |
|
mushka
|
f2ba9680c2
|
fix kafka
|
2022-02-15 15:01:23 +03:00 |
|
mushka
|
125796a112
|
body content
|
2022-02-15 14:57:36 +03:00 |
|
|
|
1908af64f0
|
cache: return support kafka. refactoring
|
2022-01-27 15:20:51 +03:00 |
|
|
|
42e723ea49
|
Kafka: fix
|
2020-10-08 12:15:16 +03:00 |
|
Diana
|
3668e4932a
|
choise between mysql and postgresql
|
2020-08-28 00:52:23 +03:00 |
|
|
|
7f095f03d1
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# common/ASC.Resource.Manager/Startup.cs
# config/kafka.json
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx
# web/ASC.Web.Core/TariffSettings.cs
|
2020-07-15 15:23:28 +03:00 |
|
Artem Tarasov
|
84ca1146a0
|
layout fix
|
2020-07-14 17:46:00 +03:00 |
|
|
|
197f468bf7
|
Removed unused proto, added backup rewrite
|
2020-06-25 19:05:14 +03:00 |
|
SuhorukovAnton
|
26f2107590
|
Backup: refactoring
|
2020-06-04 13:47:22 +03:00 |
|
|
|
6cae722b9d
|
kafka disabled by default
|
2019-08-23 15:49:23 +03:00 |
|
|
|
6e500b0986
|
Upgrade .net core to 3.0.0-preview6
Added KafkaCache
|
2019-07-19 16:10:15 +03:00 |
|
