Akmal Isomadinov
|
cadb812e37
|
Merge branch 'develop' into feature/redesign-form-filling-room
|
2024-02-27 12:23:31 +05:00 |
|
|
15ddf95e3b
|
Merge branch 'develop' into feature/invite-page-redesign
|
2024-02-26 20:49:56 +04:00 |
|
|
bfc6767c02
|
renamed form gallery error image
|
2024-02-26 20:24:30 +05:00 |
|
|
7392fc08cd
|
added custom error images
|
2024-02-26 20:20:14 +05:00 |
|
Akmal Isomadinov
|
10750896d9
|
Public:Images: Updated done/progress icons
|
2024-02-26 18:00:00 +05:00 |
|
|
412765e3af
|
Web: Icon added, styles corrected.
|
2024-02-26 12:49:37 +03:00 |
|
Akmal Isomadinov
|
9777b20d29
|
Client:Components: Added an empty view without translations
|
2024-02-23 22:00:43 +05:00 |
|
Akmal Isomadinov
|
da1c884ef1
|
Merge branch 'develop' into feature/redesign-form-filling-room
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
|
2024-02-21 22:57:34 +05:00 |
|
Akmal Isomadinov
|
0b86876e72
|
Client: Added icons
|
2024-02-21 22:28:03 +05:00 |
|
|
1749f5a9d0
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/components/GlobalEvents/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
# packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/client/src/store/PeopleStore.js
# packages/client/src/store/index.js
# packages/shared/api/people/filter.js
# packages/shared/enums/index.ts
|
2024-02-20 19:43:27 +03:00 |
|
namushka
|
fdac12fc8b
|
fixed icons
|
2024-02-20 12:48:58 +03:00 |
|
|
9573816860
|
Merge branch 'develop' into feature/oauth2-client
|
2024-02-20 12:43:09 +03:00 |
|
Vladimir Khvan
|
446be44db4
|
Merge branch 'develop' into feature/data-migration
Conflicts:
public/locales/en/Common.json
|
2024-02-20 14:03:51 +05:00 |
|
|
d780557c2b
|
Web: Client: Add new empty screen image to GroupsSelector
|
2024-02-16 14:55:19 +01:00 |
|
namushka
|
eadba5e683
|
merge origin + merge fix
|
2024-02-14 15:38:20 +03:00 |
|
namushka
|
b7a711c358
|
moved basic feats from feature/account-groups (groups table, inside groups table, api, stores, etc.)
|
2024-02-14 15:35:17 +03:00 |
|
|
5b28408a17
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/store/SelectedFolderStore.js
# packages/client/src/store/TableStore.js
# packages/client/src/store/index.js
# packages/shared/store/CurrentQuotaStore.ts
# packages/shared/utils/common.ts
# public/locales/en/Common.json
|
2024-02-14 12:15:32 +03:00 |
|
|
eaf83a10d4
|
Web: Client: Add inviting groups to room
|
2024-02-13 16:53:24 +01:00 |
|
Vladimir Khvan
|
719ffe2b60
|
Merge branch 'develop' into feature/data-migration
Conflicts:
packages/client/src/routes/portalSettings.js
packages/client/src/store/DialogsStore.js
packages/client/src/store/index.js
packages/common/constants/index.js
packages/components/file-input/index.js
packages/components/paging/index.js
packages/components/progress-bar/index.js
packages/components/row/index.js
packages/components/table-container/TableGroupMenu.js
packages/components/themes/base.js
packages/shared/api/settings/index.ts
packages/shared/components/paging/Paging.styled.ts
packages/shared/components/table/sub-components/TableHeaderCell.tsx
packages/shared/utils/catalogIconHelper.ts
public/locales/en/Common.json
|
2024-02-13 16:16:29 +05:00 |
|
|
c346033713
|
Merge branch 'develop' into feature/oauth2-client
|
2024-02-07 10:20:15 +03:00 |
|
|
d385474caa
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/components/GlobalEvents/CreateRoomEvent.js
# packages/client/src/components/GlobalEvents/EditRoomEvent.js
# packages/client/src/components/MainBar/Bar.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/helpers/constants.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Details/index.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/UsersStore.js
# packages/client/src/store/index.js
# packages/common/store/AuthStore.js
# packages/management/src/categories/spaces/sub-components/RowView/SpacesRoomRow.tsx
# packages/shared/api/files/index.ts
# packages/shared/api/files/types.ts
# packages/shared/store/CurrentQuotaStore.ts
# packages/shared/store/UserStore.ts
# public/locales/en/Common.json
|
2024-02-06 11:52:52 +03:00 |
|
Vladimir Khvan
|
498155bea3
|
Web: Client: JavascriptSDK: dark mode was added for manager
|
2024-02-02 15:17:27 +05:00 |
|
Vladimir Khvan
|
2bfd15a162
|
Merge branch 'develop' into feature/js-sdk-presets
|
2024-02-02 12:40:49 +05:00 |
|
Vladimir Khvan
|
8ec22671bf
|
Web: Client: JavascriptSDK: dark theme was added for presets page
|
2024-02-01 18:52:05 +05:00 |
|
Vladimir Khvan
|
dcb4b3d276
|
Web: Client: JavascriptSDK: simple room was added
|
2024-02-01 13:46:45 +05:00 |
|
|
04a31c61d0
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/pages/Home/Section/Header/index.js
# packages/shared/components/navigation/Navigation.tsx
# packages/shared/components/navigation/Navigation.types.ts
# packages/shared/components/navigation/sub-components/ControlBtn.tsx
|
2024-02-01 11:36:29 +03:00 |
|
Vladimir Khvan
|
a8efee895b
|
Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
packages/client/src/pages/Sdk/index.js
packages/shared/selectors/Room/RoomSelector.types.ts
packages/shared/selectors/Room/index.tsx
|
2024-01-31 13:36:21 +05:00 |
|
|
e20ae17ab8
|
Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/client/src/pages/Sdk/index.js
# packages/editor/src/client/components/Editor.js
# packages/shared/selectors/Room/index.tsx
|
2024-01-30 18:33:56 +04:00 |
|
|
56c71f61af
|
Web: Files: Public-room: fixed icon
|
2024-01-30 14:03:50 +03:00 |
|
|
4364f20f6a
|
Web: Files: added public badge
|
2024-01-30 13:05:17 +03:00 |
|
|
c1d0bb9995
|
Web: Files: Public-room: fixed links row
|
2024-01-30 11:05:54 +03:00 |
|
|
230b8cdd7a
|
Merge branch 'hotfix/v2.0.2' into feature/js-sdk-loader
|
2024-01-29 21:46:15 +03:00 |
|
|
de24cb3330
|
Images: Loader: Fixed js-sdk loader
|
2024-01-29 21:41:29 +03:00 |
|
|
68f74565bc
|
Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
# packages/common/store/AuthStore.js
# packages/shared/components/selector/Selector.tsx
|
2024-01-29 19:07:27 +04:00 |
|
|
efeb9be315
|
Web: Files: Public-room: added navigation button, added new icons
|
2024-01-29 17:55:55 +03:00 |
|
|
a1fc8864b0
|
Editor: added new favicon for PDF files
|
2024-01-29 15:48:57 +04:00 |
|
|
683c628c28
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/components/GlobalEvents/EditRoomEvent.js
# packages/client/src/components/dialogs/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Details/index.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/SelectedFolderStore.js
# packages/common/components/Loaders/index.js
# packages/shared/api/files/index.ts
# public/locales/en/Common.json
|
2024-01-28 20:44:38 +03:00 |
|
|
f95d96dfec
|
Merge branch 'hotfix/v2.0.2' into feature/js-sdk-loader
|
2024-01-25 09:58:14 +03:00 |
|
Vladimir Khvan
|
56e669555d
|
Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
packages/common/components/Navigation/sub-components/control-btn.js
packages/shared/components/navigation/Navigation.tsx
packages/shared/selectors/Room/index.tsx
|
2024-01-23 16:38:55 +05:00 |
|
|
8811ec7fbd
|
Web: Changed svg.
|
2024-01-23 11:42:09 +03:00 |
|
|
740996ca7e
|
Merge branch 'develop' into feature/oauth2-client
|
2024-01-22 10:11:13 +03:00 |
|
|
1adf6b3634
|
Merge branch 'develop' into feature/my-documents-share
|
2024-01-19 17:04:46 +04:00 |
|
Vladimir Khvan
|
a8f8c4c1ce
|
Web: Client: JavascriptSDK: help buttons were added
|
2024-01-19 17:43:20 +05:00 |
|
|
968573ce02
|
Merge branch 'hotfix/v2.0.1' into develop
# Conflicts:
# packages/components/toast/styled-toastr.js
|
2024-01-19 16:20:16 +04:00 |
|
|
1e0c383514
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/components/GlobalEvents/EditRoomEvent.js
# packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# packages/client/src/pages/PortalSettings/categories/security/StyledSecurity.js
# packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
# packages/client/src/store/FilesActionsStore.js
# packages/common/api/files/index.js
# packages/common/constants/index.js
# packages/common/store/CurrentQuotaStore.js
# packages/components/combobox/index.js
# packages/components/themes/base.js
# packages/components/toggle-button/index.js
# packages/management/src/categories/spaces/sub-components/RowView/RoomContent.tsx
# packages/management/src/categories/spaces/sub-components/RowView/SpacesRoomRow.tsx
# packages/shared/api/people/filter.js
# packages/shared/api/rooms/filter.js
# packages/shared/utils/common.ts
# yarn.lock
|
2024-01-19 11:32:34 +03:00 |
|
|
825c765b7d
|
Merge branch 'develop' into feature/my-documents-share
|
2024-01-18 20:38:44 +03:00 |
|
|
ba7d2e8029
|
Fixed checking CSP settings and added design for error
|
2024-01-18 17:38:08 +03:00 |
|
Asadulloev Subhonbek
|
b84ff87415
|
web client - add loader in sdk
|
2024-01-17 15:25:04 +03:00 |
|
Vladimir Khvan
|
d5eb4e35b2
|
Web: Client: JavascriptSDK: basic button preview was added in Room selector and File selector
|
2024-01-17 15:10:36 +05:00 |
|
|
596a832dbe
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/public/locales/ru/Settings.json
# packages/client/src/components/GlobalEvents/EditRoomEvent.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/PeopleStore.js
# packages/common/api/files/index.js
# packages/components/table-container/TableHeader.js
|
2024-01-10 12:25:13 +03:00 |
|
|
889d653170
|
Merge branch 'develop' into feature/form-room-pdf
|
2023-12-28 15:07:10 +04:00 |
|
|
52092c3aa2
|
added groups and shared folders options for onlyoffice workspace
|
2023-12-23 22:13:36 +05:00 |
|
Vladimir Khvan
|
ab3bdbf08b
|
Web: Client: JavascriptSDK: presets tiles were added
|
2023-12-18 17:46:23 +05:00 |
|
|
06da361ba3
|
Merge branch 'develop' into feature/oauth2-client
|
2023-12-14 16:10:18 +03:00 |
|
Vladimir Khvan
|
d538c9880f
|
Merge branch 'develop' into feature/data-migration
Conflicts:
packages/common/utils/axiosClient.js
|
2023-12-11 14:46:43 +05:00 |
|
|
20d60bba9a
|
Merge branch 'develop' into feature/my-documents-share
|
2023-12-08 01:15:45 +03:00 |
|
|
70591c1ab9
|
data import icons were corrected
|
2023-12-05 13:59:16 +05:00 |
|
|
e3dcded1e6
|
data import step icons were corrected
|
2023-12-05 13:47:10 +05:00 |
|
|
bee419003a
|
fixed onlyoffice workspace import step
|
2023-12-03 14:38:58 +05:00 |
|
|
ea9073c4e0
|
Client:OAuth2: add empty screen for authorized apps tab at profile
|
2023-11-29 15:43:58 +03:00 |
|
|
fed9e05292
|
Added icons.
|
2023-11-29 12:44:03 +03:00 |
|
|
7f3ee86798
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/ru/Settings.json
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js
# packages/client/src/pages/Home/Section/AccountsBody/RowView/PeopleRowContainer.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Body/TableView/sub-components/RoomsRowData.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/client/src/store/FilesStore.js
# packages/common/store/CurrentQuotaStore.js
# packages/common/utils/index.ts
# packages/components/table-container/TableHeader.js
# public/locales/en/Common.json
|
2023-11-29 10:56:04 +03:00 |
|
|
7031ade6dd
|
Merge branch 'develop' into feature/oauth2-client
|
2023-11-28 13:01:05 +03:00 |
|
Vladimir Khvan
|
f6c78f3ad8
|
20x20 data import icon was added
|
2023-11-23 21:03:14 +05:00 |
|
Vladimir Khvan
|
caa7c632c4
|
Merge branch 'develop' into feature/data-migration
Conflicts:
packages/client/public/locales/en/Settings.json
packages/client/public/locales/ru/Settings.json
packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
packages/client/src/pages/PortalSettings/utils/settingsTree.js
packages/client/src/routes/portalSettings.js
packages/client/src/store/DialogsStore.js
packages/client/src/store/index.js
packages/components/table-container/TableHeaderCell.js
public/locales/en/Common.json
|
2023-11-22 19:45:10 +05:00 |
|
|
e347aacf11
|
Merge branch 'develop' into feature/management
# Conflicts:
# package.json
# yarn.lock
|
2023-11-21 12:40:25 +04:00 |
|
|
a284aafe64
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-17 17:44:38 +03:00 |
|
|
14e8945e20
|
Added missing files
|
2023-11-17 18:32:52 +04:00 |
|
|
310cda28b5
|
Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
# packages/common/utils/image-helpers.js
|
2023-11-17 18:32:28 +04:00 |
|
|
599056a82d
|
Merge branch 'release/v2.0.0' into feature/plugin-sdk
|
2023-11-17 13:33:34 +04:00 |
|
|
c41f2e7d14
|
Client:PluginSDK: add plugin list
|
2023-11-17 12:01:59 +03:00 |
|
Akmal Isomadinov
|
99b0c90219
|
Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
# packages/client/public/locales/en/Files.json
# packages/common/utils/image-helpers.js
|
2023-11-17 11:30:49 +05:00 |
|
|
40e941d4db
|
Merge branch 'release/v2.0.0' into feature/form-gallery-error-view
|
2023-11-16 23:03:36 +04:00 |
|
|
45d74b5fe2
|
Added icons for file formats: sxc, et, ett, sxi, dps, dpt, sxw, stw, wps, wpt, mhtml
|
2023-11-16 16:35:22 +03:00 |
|
|
4659c69625
|
Web: Public: Update thirdparties logos to show them correctly in RTL mode
|
2023-11-16 12:19:39 +01:00 |
|
|
ae5b4d4ed8
|
Merge branch 'develop' into feature/oauth2-client
|
2023-11-15 17:13:50 +03:00 |
|
|
86484af409
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-15 15:44:20 +03:00 |
|
|
20b79e4833
|
Client:Profile: fix authorized apps, add revoke
|
2023-11-14 12:06:09 +03:00 |
|
namushka
|
877b32d527
|
added error screen for form gallery
|
2023-11-13 18:29:33 +03:00 |
|
Akmal Isomadinov
|
36bb6da9ce
|
Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
# packages/client/src/store/FilesStore.js
|
2023-11-13 10:33:45 +05:00 |
|
|
2ea7ee368a
|
Merge branch 'develop' into feature/management
# Conflicts:
# frontend.code-workspace
|
2023-11-10 13:59:36 +04:00 |
|
|
c1c9b7de02
|
Merge branch 'develop' into feature/oauth2-client
|
2023-11-10 12:01:49 +03:00 |
|
|
8f22be679b
|
Client:Plugins: change default plugin logo, fix path for assets at context menu and dd item
|
2023-11-10 11:39:17 +03:00 |
|
|
5be61afd7d
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-09 19:05:58 +03:00 |
|
|
608b3b1260
|
Web: Files: fixed public-room icon
|
2023-11-09 18:46:46 +03:00 |
|
|
3170833b98
|
Merge branch 'develop' into feature/management
# Conflicts:
# frontend.macos.code-workspace
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-backup/index.js
# yarn.lock
|
2023-11-09 19:13:20 +05:00 |
|
|
9067d28459
|
Client:OAuth2: add preview dialog
|
2023-11-08 16:55:06 +03:00 |
|
|
d138608224
|
Web: change image
|
2023-11-08 11:16:00 +03:00 |
|
Akmal Isomadinov
|
50cf68375b
|
Web:Navigation Fixed option icon
|
2023-11-07 14:11:18 +05:00 |
|
Akmal Isomadinov
|
8fd1f5d546
|
Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
# packages/client/src/components/Badges.js
# packages/client/src/components/EmptyContainer/EmptyFolderContainer.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/pages/Home/InfoPanel/Body/helpers/MembersHelper.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/SelectedFolderStore.js
|
2023-11-05 22:20:45 +05:00 |
|
|
248f0e80b2
|
Web: Added a mute icon in the room, added unmute when clicking on this icon.
|
2023-11-02 15:03:02 +03:00 |
|
|
f9dfc3954b
|
Merge branch 'release/v2.0.0' into feature/new-form-gallery
|
2023-10-31 18:18:20 +04:00 |
|
|
c3cd684a0d
|
Merge branch 'release/v2.0.0' into bugfix/icons
|
2023-10-30 18:34:09 +04:00 |
|
|
15547dedbb
|
Fix Bug 64908 - Accounts: Profile. The flag of Saudi Arabia is incorrectly specified when selecting the language.
|
2023-10-30 18:27:23 +04:00 |
|
mushka-n
|
fed4bf3235
|
new empty info panel view + translation and styling fixes
|
2023-10-30 15:30:38 +03:00 |
|
|
0043f7e5e4
|
Merge branch 'develop' into feature/management
|
2023-10-27 21:41:10 +03:00 |
|
Akmal Isomadinov
|
561f7e6793
|
Web:settings: Fixed the icons of the settings
|
2023-10-27 18:39:46 +05:00 |
|
|
b5c55da859
|
Merge branch 'develop' into feature/oauth2-client
|
2023-10-27 11:34:56 +03:00 |
|
Akmal Isomadinov
|
2726113dc0
|
Web:Floating-Button Fixed icons and optimization
|
2023-10-26 18:51:31 +05:00 |
|
Akmal Isomadinov
|
5bd428ce16
|
Web:Modal: Fixed close icon
|
2023-10-26 17:33:16 +05:00 |
|
Akmal Isomadinov
|
8beadcea0d
|
Web:Badges Fixed convert icon
|
2023-10-26 16:58:40 +05:00 |
|
Akmal Isomadinov
|
472c15f629
|
Merge branch 'release/v2.0.0' into bugfix/icons
|
2023-10-26 16:04:44 +05:00 |
|
|
ef39f40c44
|
Fixed images for letters
|
2023-10-25 20:57:08 +03:00 |
|
Akmal Isomadinov
|
05ac738d55
|
Web:Article: Fixed the icon of the article menu button
|
2023-10-25 18:33:42 +05:00 |
|
Akmal Isomadinov
|
6743b6a2a5
|
Web:Client:Article: Fixed catalog icons
|
2023-10-25 18:01:39 +05:00 |
|
DmitrySychugov
|
fd250c57da
|
Merge branch 'develop' into feature/management
# Conflicts:
# packages/client/src/components/MainBar/index.js
# packages/client/src/components/NavMenu/index.js
# packages/common/components/Article/index.js
# packages/common/components/Article/sub-components/article-header.js
# packages/common/components/Article/sub-components/article-hide-menu-button.js
# packages/components/context-menu/index.js
# yarn.lock
|
2023-10-25 14:40:50 +05:00 |
|
Akmal Isomadinov
|
9ca10c1fcb
|
Web:Navigation: Fixed the add icon and fixed margin
|
2023-10-25 13:56:57 +05:00 |
|
|
563e14d049
|
Web: Files: added copy icon for tablet view
|
2023-10-19 14:28:55 +03:00 |
|
Viktor Fomin
|
2251c6f310
|
Merge branch 'develop' into feature/my-documents-share
|
2023-10-16 20:14:33 +03:00 |
|
Vladimir Khvan
|
ea7b067e7f
|
Merge branch 'develop' into 'feature/data-migration' | conflict components/paging/styled-paging.js
|
2023-10-16 20:09:10 +05:00 |
|
|
1f6e3aa3a3
|
Merge branch 'develop' into feature/room-primary-link
# Conflicts:
# packages/client/src/components/QuickButtons.js
# packages/client/src/components/panels/EditLinkPanel/index.js
|
2023-10-13 18:27:53 +03:00 |
|
|
0d4ec93dff
|
Web: Files: fixed link.react icon
|
2023-10-10 12:51:37 +03:00 |
|
|
4d11fd7140
|
Added new letters images
|
2023-10-06 12:20:00 +03:00 |
|
|
7fd66d88ff
|
Web: Files: added new icons
|
2023-10-05 15:41:19 +03:00 |
|
Akmal Isomadinov
|
b94f4908fd
|
Web:FormRoom Fixed icons
|
2023-10-05 12:29:06 +05:00 |
|
|
c43d8c891a
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# common/ASC.ActiveDirectory/Base/Data/LdapObjectExtension.cs
# common/ASC.ActiveDirectory/LdapUserManager.cs
# common/ASC.Api.Core/Model/EmployeeFullDto.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/IUserService.cs
# common/ASC.Core.Common/Data/DbUserService.cs
# common/ASC.Core.Common/EF/Context/UserDbContext.cs
# common/ASC.Core.Common/Tenants/TenantUserQuotaSettings.cs
# common/ASC.Core.Common/Users/UserQuotaSettings.cs
# common/ASC.Data.Storage/BaseStorage.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSessionHolder.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/IDataStore.cs
# common/ASC.Data.Storage/IQuotaController.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# migrations/mysql/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
# packages/client/public/locales/en/Settings.json
# packages/client/src/components/FilesPanels/index.js
# packages/client/src/components/GlobalEvents/index.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/components/dialogs/index.js
# packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/mobileView.js
# packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
# packages/client/src/store/FilesActionsStore.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/PeopleStore.js
# packages/common/api/people/index.js
# packages/common/constants/index.js
# products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs
# products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/EF/DbFolder.cs
# products/ASC.Files/Core/Core/Entries/File.cs
# products/ASC.Files/Core/Core/Entries/FileEntry.cs
# products/ASC.Files/Core/Core/Entries/Folder.cs
# products/ASC.Files/Core/Core/Entries/OrderBy.cs
# products/ASC.Files/Core/Core/Entries/Tag.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/UsersQuotaSyncOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Utils/ChunkedUploadSessionHolder.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Api/VirtualRoomsController.cs
# products/ASC.People/Server/Api/UserController.cs
# public/locales/en/Common.json
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/ApiModels/RequestsDto/QuotaSettingsRequestsDto.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/QuotaDto.cs
# web/ASC.Web.Api/Core/QuotaHelper.cs
# web/ASC.Web.Core/PublicResources/Resource.Designer.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
|
2023-10-04 16:56:49 +03:00 |
|
|
477976da29
|
Revert "Merge branch 'develop' into feature/oauth2-client"
This reverts commit 9d93525a91 .
|
2023-10-04 16:10:13 +03:00 |
|
|
148def0bb5
|
Merge branch 'develop' into feature/data-migration
|
2023-10-04 15:23:34 +03:00 |
|
DmitrySychugov
|
2fc16bc9ec
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/management
# Conflicts:
# build/build.backend.docker.ps1
# build/build.backend.docker.sh
# build/build.static.bat
# build/clear.backend.docker.ps1
# build/clear.backend.docker.sh
# build/install/docker/Dockerfile
# build/install/docker/Dockerfile.runtime
# build/install/docker/config/nginx/templates/upstream.conf.template
# build/install/docker/docspace.overcome.yml
# build/install/docker/docspace.profiles.yml
# build/start/start.backend.docker.ps1
# build/start/start.backend.docker.sh
# common/ASC.Api.Core/Security/EmailValidationKeyModelHelper.cs
# common/ASC.Core.Common/Caching/CachedTenantService.cs
# common/ASC.Core.Common/Core/TenantRegistrationInfo.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
# common/ASC.Data.Backup.Core/Contracts/BackupServiceModel.cs
# common/ASC.Data.Backup.Core/EF/Model/BackupSchedule.cs
# common/ASC.Data.Backup.Core/IntegrationEvents/Events/BackupRequestIntegrationEvent.cs
# common/ASC.Data.Backup.Core/Service/BackupService.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
# common/services/ASC.ApiSystem/ASC.ApiSystem.csproj
# common/services/ASC.ApiSystem/Classes/CommonMethods.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# common/services/ASC.ApiSystem/Controllers/SettingsController.cs
# common/services/ASC.ApiSystem/GlobalUsings.cs
# common/services/ASC.ApiSystem/Models/SettingsModel.cs
# common/services/ASC.ApiSystem/Startup.cs
# common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupRequestedIntegrationEventHandler.cs
# common/services/ASC.Data.Backup/Api/BackupController.cs
# common/services/ASC.Data.Backup/ApiModels/BackupDto.cs
# common/services/ASC.Data.Backup/ApiModels/BackupScheduleDto.cs
# common/services/ASC.Data.Backup/GlobalUsings.cs
# config/nginx/onlyoffice.conf
# migrations/mysql/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
# migrations/postgre/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
# package.json
# packages/client/package.json
# packages/client/src/pages/Confirm/sub-components/auth.js
# packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/index.js
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/index.js
# packages/client/src/store/ProfileActionsStore.js
# packages/common/api/index.js
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/Api/Settings/StorageController.cs
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
# web/ASC.Web.Core/Utility/TenantExtra.cs
# yarn.lock
|
2023-10-04 16:27:12 +05:00 |
|
|
9d93525a91
|
Merge branch 'develop' into feature/oauth2-client
|
2023-10-04 13:24:59 +03:00 |
|
edjalilov
|
5c380834ab
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# ASC.Web.sln
# ASC.Web.slnf
# common/ASC.Common/Threading/DistributedTaskProgress.cs
# common/ASC.Data.Storage/DataOperators/DataOperatorFactory.cs
# common/ASC.Data.Storage/DataOperators/IDataOperator.cs
# common/ASC.Data.Storage/DataOperators/ReadOperators/BaseReadOperator.cs
# common/ASC.Data.Storage/DataOperators/ReadOperators/TarReadOperator.cs
# common/ASC.Data.Storage/DataOperators/ReadOperators/ZipReadOperator.cs
# common/ASC.Migration/ASC.Migration.Core.csproj
# common/ASC.Migration/Core/AbstractMigration.cs
# common/ASC.Migration/Core/IMigration.cs
# common/ASC.Migration/Core/ImportableEntity.cs
# common/ASC.Migration/Core/MigrationIntegrationEvent.cs
# common/ASC.Migration/Core/MigrationIntegrationEventHandler.cs
# common/ASC.Migration/Core/MigrationLogger.cs
# common/ASC.Migration/Core/MigrationParseIntegrationEvent.cs
# common/ASC.Migration/Core/Models/Api/ImportableApiEntity.cs
# common/ASC.Migration/Core/Models/Api/MigratingApiFiles.cs
# common/ASC.Migration/Core/Models/Api/MigratingApiGroup.cs
# common/ASC.Migration/Core/Models/Api/MigratingApiUser.cs
# common/ASC.Migration/Core/Models/Api/MigrationApiInfo.cs
# common/ASC.Migration/Core/Models/Api/MigrationCore.cs
# common/ASC.Migration/Core/Models/Api/MigratorMeta.cs
# common/ASC.Migration/Core/Models/MigratingFiles.cs
# common/ASC.Migration/Core/Models/MigratingUser.cs
# common/ASC.Migration/Core/Models/MigrationInfo.cs
# common/ASC.Migration/Core/Providers/ASC/Models/Parse/WorkspaceFiles.cs
# common/ASC.Migration/Core/Providers/ASC/Models/Parse/WorkspaceUser.cs
# common/ASC.Migration/Core/Providers/ASC/Models/WorkspaceMigrationInfo.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/GoogleWorkspaceMigration.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigratingFiles.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigratingUser.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigrationInfo.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigratingFiles.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigratingUser.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigrationInfo.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/Parse/NCUser.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/NextcloudWorkspaceMigration.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigratingFiles.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigratingUser.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigrationinfo.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/Parse/OCUser.cs
# common/ASC.Migration/Core/Providers/OwnCloud/OwnCloudMigration.cs
# common/ASC.Migration/GlobalUsings.cs
# common/ASC.Migration/Resources/MigrationResource.Designer.cs
# common/ASC.Migration/Resources/MigrationResource.resx
# config/nginx/onlyoffice.conf
# config/storage.json
# packages/client/src/components/dialogs/index.js
# packages/client/src/store/index.js
# products/ASC.Files/Core/Core/CountRoomFeature.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Startup.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/ApiModels/RequestsDto/FinishDto.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/MigrationStatusDto.cs
# web/ASC.Web.Api/GlobalUsings.cs
# web/ASC.Web.Api/Startup.cs
# web/ASC.Web.Studio/ASC.Web.Studio.csproj
# web/ASC.Web.Studio/GlobalUsings.cs
# web/ASC.Web.Studio/IntegrationEvents/RemovePortalIntegrationEventHandler.cs
# web/ASC.Web.Studio/Program.cs
# web/ASC.Web.Studio/Startup.cs
|
2023-10-04 14:57:29 +05:00 |
|
Akmal Isomadinov
|
bdddc705bb
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Entries/Folder.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/FilterTypeEnum.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs
# products/ASC.Files/Server/Api/VirtualRoomsController.cs
# products/ASC.Files/Core/Helpers/DocSpaceHelper.cs
|
2023-10-04 14:34:03 +05:00 |
|
Viktor Fomin
|
f6f3369b8a
|
Merge branch 'develop' into feature/my-documents-share
|
2023-10-02 12:21:15 +03:00 |
|
Viktor Fomin
|
524d1d15f4
|
Web: add icon
|
2023-10-02 12:18:23 +03:00 |
|
|
ad047bc372
|
Merge branch 'develop' into feature/oauth2-client
|
2023-10-02 10:05:58 +03:00 |
|
|
1e8fac378c
|
Web:Client:Plugin: apply new layouts, add delete dialog
|
2023-09-29 15:32:27 +03:00 |
|
|
84afb50b66
|
merge from develop
|
2023-09-29 14:28:10 +03:00 |
|
|
f778106bc4
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 10:36:07 +03:00 |
|
Viktor Fomin
|
7a3f743260
|
Web: change images
|
2023-09-28 22:53:34 +03:00 |
|
Viktor Fomin
|
bbdf7f8db7
|
Web: add icon
|
2023-09-28 18:50:29 +03:00 |
|
Elyor Djalilov
|
3116c25d9f
|
Merge branch 'develop' into feature/data-migration
|
2023-09-28 18:17:38 +05:00 |
|
Akmal Isomadinov
|
ec45eebb88
|
Web:FormRoom: Added empty screen
|
2023-09-28 17:21:07 +05:00 |
|
Akmal Isomadinov
|
bf05f042da
|
Web: Added icons
|
2023-09-27 13:15:44 +05:00 |
|
Elyor Djalilov
|
7a4e734699
|
added empty screen
|
2023-09-26 13:40:12 +05:00 |
|
|
dc1274fb88
|
Web:Client:PortalSettings: add OAuth empty page
|
2023-09-25 17:03:25 +03:00 |
|
|
796cbf3265
|
Merge branch 'develop' into feature/room-share-optimization
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2023-09-25 15:58:53 +03:00 |
|
|
b14d6c8ef0
|
Merge branch 'hotfix/v1.1.3' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
# config/appsettings.json
# config/nlog.config
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
# packages/client/src/pages/Confirm/sub-components/createUser.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/common/components/MoreLoginModal/index.tsx
# packages/login/src/client/components/sub-components/LoginForm.tsx
# products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Core/CspSettingsHelper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-09-25 10:53:06 +03:00 |
|
Akmal Isomadinov
|
d70c057848
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
|
2023-09-25 10:40:22 +05:00 |
|
|
5dab788680
|
Web: Files: InfoPanel: added infinite-loader to members list
|
2023-09-22 15:10:48 +03:00 |
|
Akmal Isomadinov
|
9cf396fbf7
|
Web: Added a form room icon
|
2023-09-21 19:29:53 +05:00 |
|
|
70b5c6e111
|
MErge branch 'develop' into feature/web-plugins
|
2023-09-21 14:30:04 +03:00 |
|
Elyor Djalilov
|
94685e3794
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# common/ASC.Data.Storage/DataOperators/WriteOperators/ZipWriteOperator.cs
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/ru/Settings.json
# packages/client/src/store/DialogsStore.js
# packages/client/src/store/index.js
# products/ASC.People/Server/Startup.cs
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2023-09-21 15:30:39 +05:00 |
|
gazizova-vlada
|
183b32c2aa
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 16:27:26 +03:00 |
|
|
bf48ce5393
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 14:02:42 +03:00 |
|
|
91ae0883e9
|
Web:Client:Plugins: fix plugin dialog
|
2023-09-19 08:58:48 +03:00 |
|
gazizova-vlada
|
34a7c068a7
|
Web:Client:Add onStartAgain, onTerminate.
|
2023-09-18 16:55:03 +03:00 |
|
|
d25e3e3d42
|
Web:Client:Plugins: add context menu item for all plugin actions, add opportunity change UNKNOWN file type and file.svg icon
|
2023-09-15 13:55:41 +03:00 |
|
|
e26bcc6ee2
|
Web:Client:Plugins: update list of plugins at portal settings, change settings plugin dialog
|
2023-09-14 18:27:37 +03:00 |
|
Viktor Fomin
|
4c56f2d047
|
Web: add apple icon
|
2023-09-14 14:32:01 +03:00 |
|
mushka-n
|
d96911a37c
|
merge develop + merge fix
|
2023-09-11 13:26:58 +03:00 |
|