IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,588 Commits 40 Branches 22 Tags 420 MiB
839492dd27
Commit Graph

611 Commits

Author SHA1 Message Date
Alexey Safronov
ee7fe469b2 Merge branch 'hotfix/v2.6.1' into develop 
# Conflicts:
#	packages/client/src/pages/Confirm/sub-components/createUser.js
#	packages/client/src/pages/Home/Section/Body/TableView/sub-components/RecentRowData.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/styled-containers/StyledCertificatesTable.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/CertificatesTable.js
#	packages/client/src/pages/Wizard/index.js
#	packages/client/src/store/TableStore.js
#	packages/shared/themes/base.ts
#	packages/shared/themes/dark.ts
 2024-08-29 14:27:18 +04:00
Ilya Oleshko
f61b262c0d Shared: OperationContainer: Added logo for dark theme 2024-08-28 10:10:53 +03:00
Akmal Isomadinov
5995b8c8e0 Client:EmptyScreenGroups Added new empty screen for groups 2024-08-23 18:29:09 +05:00
Akmal Isomadinov
f593055dc9 Images:EmptyView Fixed icon size 2024-08-22 14:55:05 +05:00
Akmal Isomadinov
05efe67fdc Client:AccountsBody:EmptyScreen Added new empty screen for group 2024-08-20 20:59:22 +05:00
Akmal Isomadinov
62cf485588 Merge branch 'develop' into feature/new-empty-screen 
# Conflicts:
#	packages/client/src/components/EmptyContainer/index.js
#	packages/client/src/pages/Home/Section/AccountsBody/EmptyScreen.js
#	packages/client/src/store/ContextOptionsStore.js
 2024-08-20 14:04:49 +05:00
Alexey Safronov
556df6e20c Merge branch 'hotfix/v2.6.1' into develop 
# Conflicts:
#	packages/client/src/components/Article/MainButton/index.js
#	packages/client/src/components/GlobalEvents/ChangeUserTypeEvent.js
#	packages/client/src/components/dialogs/ChangeUserStatusDialog/index.js
#	packages/client/src/pages/Confirm/sub-components/auth.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/store/DialogsStore.js
#	packages/shared/components/access-right-select/AccessRightSelect.tsx
 2024-08-19 17:26:45 +04:00
Ilya Oleshko
32180ce6e2 Shared: OperationContainer: Added OperationContainer component 2024-08-16 15:53:38 +03:00
Akmal Isomadinov
ac1b9f4e05 Client:Plugins Updated icon 2024-08-16 13:23:20 +05:00
Akmal Isomadinov
f92de7c14b Web:EmptyContainer Updated icons for the RoomNoAccess component 2024-08-15 17:42:42 +05:00
Akmal Isomadinov
ce440c1704 Web:EmptyContainer Added a empty screen for the Accounts 2024-08-15 17:09:34 +05:00
Akmal Isomadinov
0616b6d465 Web:Public:Images Added new icons 2024-08-15 16:22:25 +05:00
Akmal Isomadinov
1f3bc2c502 Web:EmptyContainer Added empty screen for the trash page 2024-08-13 16:14:31 +05:00
Akmal Isomadinov
53e41f461b Web:Public:Images Added new icons 2024-08-13 15:58:58 +05:00
Akmal Isomadinov
cd20d199c7 Web:Public:Images Added new icons 2024-08-12 17:29:45 +05:00
Akmal Isomadinov
f1231446e2 Web:EmptyContainer Added rooms empty options 2024-08-09 17:17:27 +05:00
Akmal Isomadinov
2dc9a52ba4 Web:Public:Images Added new icons 2024-08-08 19:34:50 +05:00
Akmal Isomadinov
ff81b58c9e Merge branch 'develop' into feature/new-empty-screen 2024-08-08 13:03:43 +05:00
Akmal Isomadinov
88b4c17bb5 Web:Public:Images Added new icons 2024-08-05 17:59:33 +05:00
Akmal Isomadinov
738fb331f6 Web:Public:Images Added new icons 2024-08-02 19:58:46 +05:00
Akmal Isomadinov
443c23936d Web:Public:Images Added new icons 2024-08-01 18:03:15 +05:00
Akmal Isomadinov
cffd4c66b7 Web:Public:Images Fixed icon color 2024-08-01 18:02:51 +05:00
gopienkonikita
1972f6dc15 Merge branch 'develop' into feature/public-edit 
# Conflicts:
#	public/locales/en/Common.json
 2024-07-25 11:25:59 +03:00
Alexey Safronov
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
Andrey Savihin
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
gopienkonikita
c2fc3eada7 Merge branch 'develop' into feature/public-edit 2024-07-11 13:00:47 +03:00
Alexey Safronov
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
gopienkonikita
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
Viktor Fomin
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
Tatiana Lopaeva
0d7a02a7fc Fix Bug 69003 - Hide history display for rooms based on third-party storage. 2024-07-08 13:00:54 +03:00
Aleksandr Lushkin
ec50a38834 Fix Bug 68956: Wrong documents icon on tablet/mobile 2024-07-03 13:20:59 +02:00
Timofey Boyko
0fb2b762c0 Merge branch 'develop' into feature/oauth2-client 2024-06-24 14:01:36 +03:00
Andrey Savihin
35ef0b8832 images: notifications: new icon 2024-06-22 15:08:03 +03:00
gopienkonikita
056cad63a4 Merge branch 'develop' into feature/embedding-settings 2024-06-20 15:41:14 +03:00
Timofey Boyko
252eb14be5 Merge branch 'develop' into feature/oauth2-client 2024-06-19 15:16:18 +03:00
Andrey Savihin
8a001cf415 Added new images for notifications 2024-06-18 18:25:18 +03:00
Timofey Boyko
6145817cb8 Merge branch 'develop' into feature/oauth2-client 2024-06-18 13:12:53 +03:00
Alexey Safronov
834513ecd3 Client: Added common flag for "sr-Cyrl-RS" 2024-06-17 14:55:55 +04:00
gopienkonikita
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
Tatiana Lopaeva
f60ef3547d Renaming. 2024-06-14 13:19:28 +03:00
Timofey Boyko
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
Timofey Boyko
9419551e8c Merge branch 'develop' into feature/oauth2-client 2024-06-06 12:39:08 +03:00
Alexey Safronov
aa588ddf7f Merge branch 'develop' into feature/embedding-settings 2024-06-06 11:56:58 +04:00
gopienkonikita
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