|
|
1972f6dc15
|
Merge branch 'develop' into feature/public-edit
# Conflicts:
# public/locales/en/Common.json
|
2024-07-25 11:25:59 +03:00 |
|
|
|
116702d286
|
Merge branch 'release/v2.6.0' into develop
# Conflicts:
# packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/ImportStep/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/UsersTableRow.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/ImportStep/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTableRow.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextcloudWorkspace/Stepper/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTypeTableRow.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/AccountsTable/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/ImportStep.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/Providers.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/RowView/UsersRowContent.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/TableView/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersTypeStep/AccountsTable/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/sub-components/UsersInfoBlock.tsx
# packages/login/src/components/Invalid.tsx
|
2024-07-22 20:23:04 +04:00 |
|
|
|
4dca95bb82
|
images: added regional logos
|
2024-07-19 15:06:42 +03:00 |
|
Akmal Isomadinov
|
820f32dd67
|
Doceditor:Components:CompletedForm Added a new design
|
2024-07-13 21:17:08 +05:00 |
|
|
|
c2fc3eada7
|
Merge branch 'develop' into feature/public-edit
|
2024-07-11 13:00:47 +03:00 |
|
|
|
99e265ebee
|
Merge branch 'release/v2.6.0' into develop
# Conflicts:
# packages/client/src/components/PrivateRouteWrapper/index.tsx
# packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
# packages/login/src/app/layout.tsx
# packages/login/src/components/LoginForm/index.tsx
# packages/login/src/middleware.ts
# packages/login/src/utils/index.ts
# packages/shared/components/table/TableHeader.tsx
# packages/shared/routes/Route.private.tsx
|
2024-07-11 12:27:31 +04:00 |
|
|
|
3a3c4a6d3c
|
Web: Files: added public-room editing
|
2024-07-10 19:07:53 +03:00 |
|
Akmal Isomadinov
|
a4b7a3663e
|
Merge branch 'release/v2.6.0' into feature/form-room
|
2024-07-10 18:26:12 +05:00 |
|
|
|
d7bd794854
|
Fix Bug 69074
|
2024-07-10 13:56:21 +03:00 |
|
Akmal Isomadinov
|
0eba3145e5
|
Shared:Components:Selector:Fixed icon size
|
2024-07-09 12:42:36 +05:00 |
|
Akmal Isomadinov
|
7ff6ccd604
|
Web:Public:Images: Added icons
|
2024-07-08 19:36:43 +05:00 |
|
|
|
0d7a02a7fc
|
Fix Bug 69003 - Hide history display for rooms based on third-party storage.
|
2024-07-08 13:00:54 +03:00 |
|
|
|
ec50a38834
|
Fix Bug 68956: Wrong documents icon on tablet/mobile
|
2024-07-03 13:20:59 +02:00 |
|
|
|
0fb2b762c0
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-24 14:01:36 +03:00 |
|
|
|
35ef0b8832
|
images: notifications: new icon
|
2024-06-22 15:08:03 +03:00 |
|
|
|
056cad63a4
|
Merge branch 'develop' into feature/embedding-settings
|
2024-06-20 15:41:14 +03:00 |
|
|
|
252eb14be5
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-19 15:16:18 +03:00 |
|
|
|
8a001cf415
|
Added new images for notifications
|
2024-06-18 18:25:18 +03:00 |
|
|
|
6145817cb8
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-18 13:12:53 +03:00 |
|
|
|
834513ecd3
|
Client: Added common flag for "sr-Cyrl-RS"
|
2024-06-17 14:55:55 +04:00 |
|
|
|
918cd0db9c
|
Merge branch 'develop' into feature/embedding-settings
# Conflicts:
# packages/client/src/components/panels/EditLinkPanel/index.js
# packages/shared/themes/base.ts
# packages/shared/themes/dark.ts
|
2024-06-14 15:48:00 +03:00 |
|
|
|
f60ef3547d
|
Renaming.
|
2024-06-14 13:19:28 +03:00 |
|
|
|
b7fbb88185
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-14 12:32:13 +03:00 |
|
Akmal Isomadinov
|
2a52259060
|
Merge branch 'develop' into feature/form-room
|
2024-06-06 17:16:16 +05:00 |
|
|
|
9419551e8c
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-06 12:39:08 +03:00 |
|
|
|
aa588ddf7f
|
Merge branch 'develop' into feature/embedding-settings
|
2024-06-06 11:56:58 +04:00 |
|
|
|
43a2d37596
|
Web: Files: fixed palm cursor
|
2024-06-05 13:22:21 +03:00 |
|
Akmal Isomadinov
|
70c3a24e4f
|
Doceditor: Added CompletedForm page
|
2024-05-31 21:34:29 +05:00 |
|
|
|
2779f4c0b8
|
Web: Files: added document embedding
|
2024-05-30 18:35:14 +03:00 |
|
Akmal Isomadinov
|
6a9410379d
|
Client:Dialogs:CreatedPDFFormDialog Added actions and update icons
|
2024-05-30 18:14:00 +05:00 |
|
Akmal Isomadinov
|
fb77fa76da
|
Client:EmptyView Added folder empty screen
|
2024-05-30 17:01:20 +05:00 |
|
Akmal Isomadinov
|
def84f02a4
|
Client:Public:Image:EmptyView Fixed empty images
|
2024-05-29 22:56:08 +05:00 |
|
Akmal Isomadinov
|
4725272d39
|
Merge branch 'feature/form-room-new-icons' into feature/form-room
# Conflicts:
# packages/client/public/locales/en/EmptyView.json
# packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.helpers.tsx
# packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.tsx
# packages/shared/components/empty-view/EmptyView.styled.ts
# public/images/emptyview/upload.device.pdf.form.svg
# public/images/emptyview/upload.pdf.form.svg
|
2024-05-29 21:14:25 +05:00 |
|
|
|
7d8cb75c93
|
Web: Files: EmbeddingPanel: fixed icon, added bar
|
2024-05-29 17:56:28 +03:00 |
|
Akmal Isomadinov
|
af4a9196e6
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/src/store/ContextOptionsStore.js
|
2024-05-28 17:39:01 +05:00 |
|
|
|
996c79d617
|
Revert "Merge branch 'develop'"
This reverts commit da29dab3bf.
|
2024-05-28 14:05:49 +03:00 |
|
|
|
da29dab3bf
|
Merge branch 'develop'
|
2024-05-28 14:04:24 +03:00 |
|
|
|
d78e24f4bf
|
Merge branch 'develop' into feature/oauth2-client
|
2024-05-28 14:00:07 +03:00 |
|
|
|
4b81764d18
|
Merge branch 'develop' into feature/selector-input
|
2024-05-28 11:39:09 +04:00 |
|
|
|
02b4294e63
|
Merge branch 'develop' into feature/oauth2-client
|
2024-05-28 10:32:48 +03:00 |
|
Akmal Isomadinov
|
10231dee4c
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/pages/Home/Section/Header/index.js
|
2024-05-28 11:07:30 +05:00 |
|
Akmal Isomadinov
|
28dae97d48
|
Client:Components:EmptyContainer: Added share option
|
2024-05-27 21:59:35 +05:00 |
|
namushka
|
9af68dbd94
|
updated icons for RoomIcon component
|
2024-05-24 14:02:49 +03:00 |
|
|
|
33bc642d0d
|
Fix errors after merge develop
|
2024-05-23 19:20:26 +03:00 |
|
|
|
3bb3c7d5ea
|
Merge branch 'develop' into feature/oauth2-client
|
2024-05-23 18:23:05 +03:00 |
|
Akmal Isomadinov
|
debee1490b
|
Public:images:EmptyView Fixed color
|
2024-05-22 20:43:01 +05:00 |
|
|
|
e77b80f227
|
Add images for selector input item
|
2024-05-22 17:03:58 +03:00 |
|
Akmal Isomadinov
|
e754d7c069
|
Public:Image:EmptyView Added new icons
|
2024-05-22 17:34:32 +05:00 |
|
Akmal Isomadinov
|
d2f91f35e6
|
Merge branch 'develop' into feature/form-room-new-icons
|
2024-05-17 17:25:17 +05:00 |
|
Akmal Isomadinov
|
ab24b2ff79
|
Public:images:EmptyView Added new icons
|
2024-05-14 20:07:40 +05:00 |
|
