IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,005 Commits 40 Branches 22 Tags 420 MiB
feature/VDR-room
Commit Graph

581 Commits

Author SHA1 Message Date
DmitrySychugov
93a04c0392 Merge branch 'feature/VDR-room' into feature/VDR-indexing 
# Conflicts:
#	packages/client/src/HOCs/withQuickButtons.js
#	packages/client/src/components/FilesPanels/index.js
#	packages/client/src/components/QuickButtons.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/store/ContextOptionsStore.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/client/src/store/SelectedFolderStore.ts
 2024-07-11 12:35:06 +05:00
Aleksandr Lushkin
d68eb46c9b Merge branch 'refs/heads/feature/VDR-room' into feature/vdr-export-room-index 
# Conflicts:
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/store/ContextOptionsStore.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/client/src/store/SelectedFolderStore.ts
#	packages/shared/api/rooms/index.ts
 2024-07-09 17:53:35 +02:00
gopienkonikita
0f8994bd52 Merge branch 'feature/VDR-room' into feature/VDR-lifetime 
# Conflicts:
#	packages/client/public/locales/en/Files.json
#	packages/client/public/locales/en/InfoPanel.json
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/shared/components/navigation/Navigation.types.ts
 2024-06-27 17:08:52 +03:00
DmitrySychugov
14a766bbb1 Merge branch 'develop' into feature/VDR-room 2024-06-27 15:13:15 +05:00
Aleksandr Lushkin
7e88a1567f Client: Add showing progress bar during index export 2024-06-25 12:17:06 +02:00
Aleksandr Lushkin
796d90aa9f Client: Add new icon for export room index 2024-06-25 12:13:10 +02:00
DmitrySychugov
1788aacf93 Merge branch 'develop' into feature/VDR-indexing 
# Conflicts:
#	packages/client/public/locales/en/CreateEditRoomDialog.json
#	packages/client/src/components/FilesPanels/index.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableContainer.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/shared/api/files/index.ts
#	packages/shared/components/table/TableHeader.tsx
#	packages/shared/enums/index.ts
#	packages/shared/themes/dark.ts
#	public/locales/en/Common.json
 2024-06-24 14:12:56 +05: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
gopienkonikita
4e77bdf335 Merge branch 'feature/VDR-room' into feature/VDR-lifetime 
# Conflicts:
#	packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx
#	packages/client/src/store/FilesActionsStore.js
 2024-06-20 11:45:20 +03:00
gopienkonikita
33145f2a3f Merge branch 'develop' into feature/VDR-room 
# Conflicts:
#	packages/shared/enums/index.ts
#	public/locales/en/Common.json
 2024-06-20 11:44:03 +03:00
Andrey Savihin
8a001cf415 Added new images for notifications 2024-06-18 18:25:18 +03:00
Alexey Safronov
834513ecd3 Client: Added common flag for "sr-Cyrl-RS" 2024-06-17 14:55:55 +04:00
gopienkonikita
0bfe24d0cb Merge branch 'feature/VDR-room' into feature/VDR-lifetime 
# Conflicts:
#	packages/client/src/components/FilesPanels/index.js
#	packages/shared/components/selector/Selector.tsx
#	packages/shared/components/selector/sub-components/Body.tsx
#	packages/shared/components/selector/sub-components/Item.tsx
#	packages/shared/selectors/Files/FilesSelector.types.ts
#	packages/shared/selectors/Files/index.tsx
 2024-06-17 12:38:16 +03:00
gopienkonikita
47d70ea8f2 Merge branch 'develop' into feature/VDR-room 
# Conflicts:
#	packages/client/public/locales/en/CreateEditRoomDialog.json
 2024-06-17 12:34:23 +03: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
DmitrySychugov
d15445301c Merge branch 'develop' into feature/VDR-indexing 
# Conflicts:
#	packages/client/public/locales/en/CreateEditRoomDialog.json
#	packages/client/public/locales/en/Files.json
#	packages/client/src/components/dialogs/CreateEditRoomDialog/data/index.js
#	packages/client/src/helpers/filesUtils.js
#	packages/client/src/store/CreateEditRoomStore.js
#	public/locales/en/Common.json
 2024-06-10 16:05:56 +05:00
gopienkonikita
3af4f321cb Merge branch 'develop' into feature/VDR-room 
# Conflicts:
#	packages/client/public/locales/en/CreateEditRoomDialog.json
#	packages/client/public/locales/en/Files.json
#	packages/client/src/components/dialogs/CreateEditRoomDialog/data/index.js
#	packages/client/src/helpers/filesUtils.js
#	packages/client/src/store/CreateEditRoomStore.js
#	public/locales/en/Common.json
 2024-06-07 16:25:58 +03:00
Akmal Isomadinov
2a52259060 Merge branch 'develop' into feature/form-room 2024-06-06 17:16:16 +05: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
gopienkonikita
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
gopienkonikita
7d8cb75c93 Web: Files: EmbeddingPanel: fixed icon, added bar 2024-05-29 17:56:28 +03:00
DmitrySychugov
49d9c7c3d9 Merge branch 'develop' into feature/VDR-indexing 
# Conflicts:
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
 2024-05-29 13:32:12 +05:00
DmitrySychugov
377779d9d3 Merge remote-tracking branch 'remotes/origin/feature/VDR-room' into feature/VDR-indexing 
# Conflicts:
#	packages/client/src/HOCs/withQuickButtons.js
#	packages/client/src/components/QuickButtons.js
#	packages/client/src/pages/Home/Section/Filter/index.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/store/ContextOptionsStore.js
#	packages/client/src/store/FilesStore.js
#	packages/client/src/store/TableStore.js
#	packages/client/src/store/index.js
#	packages/shared/api/files/index.ts
#	packages/shared/enums/index.ts
#	public/locales/en/Common.json
 2024-05-29 13:29:15 +05: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
Alexey Safronov
4b81764d18 Merge branch 'develop' into feature/selector-input 2024-05-28 11:39:09 +04: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
Akmal Isomadinov
debee1490b Public:images:EmptyView Fixed color 2024-05-22 20:43:01 +05:00
Timofey Boyko
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
gopienkonikita
68c06ac91a Merge branch 'feature/VDR-room' into feature/VDR-lifetime 
# Conflicts:
#	packages/client/src/components/FilesPanels/index.js
#	packages/client/src/components/FilesSelector/index.tsx
#	packages/client/src/components/QuickButtons.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/components/selector/Selector.types.ts
#	packages/components/selector/index.tsx
#	packages/components/selector/sub-components/Body/Body.types.ts
#	packages/components/selector/sub-components/Item/Item.types.ts
#	packages/components/selector/sub-components/Item/StyledItem.ts
#	packages/components/selector/sub-components/Item/index.tsx
#	packages/components/themes/base.js
#	packages/shared/components/navigation/Navigation.tsx
#	packages/shared/components/selector/sub-components/Body.tsx
#	packages/shared/themes/dark.ts
 2024-05-21 14:38:28 +03:00
gopienkonikita
a3c9c55ad4 Merge branch 'develop' into feature/VDR-room 
# Conflicts:
#	packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/Rooms/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/History/index.js
 2024-05-21 12:55:23 +03: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
Akmal Isomadinov
bdca686c83 Public:images:EmptyView Fixed typo 2024-05-14 13:15:09 +05:00
Akmal Isomadinov
5f4a0e142a Public:images:EmptyView Added new default icons 2024-05-13 21:08:24 +05:00
Alexey Safronov
5aee9c9982 Merge branch 'hotfix/v2.5.1' into develop 2024-05-13 18:23:45 +04:00
Alexey Safronov
bb7b865498 Web: Added si flag 2024-05-13 18:05:48 +04:00
Alexey Safronov
b4acdd2b2f Merge branch 'hotfix/v2.5.1' into develop 2024-05-13 11:23:36 +04:00
Akmal Isomadinov
403d8bc558 Client:Components:QuickButtons Fixed bug 67799 added lock icon 2024-05-08 16:21:10 +05:00
Alexey Safronov
fcc50d6dfc Merge branch 'hotfix/v2.5.1' into develop 2024-04-26 18:05:43 +04:00