|
|
a9bbbbabdc
|
Fixed Bug53161 - Client.Files.Fixed table view header length.
|
2022-01-27 10:35:36 +03:00 |
|
|
|
4c6d130ea9
|
Web:Files:Added MediaViewer closing handling when the Close button is clicked.
|
2022-01-26 20:56:01 +03:00 |
|
Dmitry Kulak
|
23fc1a7b46
|
Web: Files: Badges: Renamed VersionBadgeWrapper to BadgeWrapper
|
2022-01-26 15:16:45 +03:00 |
|
Dmitry Kulak
|
b25e0c75b0
|
Web: Files: Tiles: Added border on hover for ok/cancel buttons while renaming
|
2022-01-26 14:42:01 +03:00 |
|
Dmitry Kulak
|
926f0c6a2e
|
Web: Files: Changed "shared" icon
|
2022-01-26 14:09:43 +03:00 |
|
|
|
0518fa7636
|
Fixed Bug 55056 - Client.Files. Added selection reset after dialog close.
|
2022-01-26 11:30:20 +03:00 |
|
|
|
2bfc182d1e
|
Web: Files: fixed error notification
|
2022-01-26 11:28:40 +03:00 |
|
|
|
de1a88247a
|
Web: Files: Removed loader when switch from settings module to files module.
|
2022-01-26 10:43:00 +03:00 |
|
|
|
ef6682ab32
|
Web:Files:Added check for open MediaViewer. Added checkURLchange function to MediaViewer.
|
2022-01-25 18:20:59 +03:00 |
|
|
|
07cbae407d
|
Fixed Bug 55057 - Client.Files.Clouds. Fixed display provider dialog when drag’n’drop thirdparty files.
|
2022-01-25 17:19:42 +03:00 |
|
|
|
0a3d7a0dc4
|
Fixed Bug 55056 - Client.Files. Added reset selections.
|
2022-01-25 15:56:24 +03:00 |
|
|
|
6d17e0a37d
|
Web: Files: Added opportunity to react on move/delete file on socket.io
|
2022-01-25 15:45:01 +03:00 |
|
Dmitry Kulak
|
0e6c866ca6
|
Web: Files: Badges: Extracted common Badge props to object
|
2022-01-25 14:24:27 +03:00 |
|
|
|
b03ac6d58f
|
Fixed Bug 55062 - Client.Files. Renamed operation panel button.
|
2022-01-25 14:16:17 +03:00 |
|
|
|
509332fb23
|
Web: restored classNames for autotest after merge
|
2022-01-25 12:31:18 +03:00 |
|
|
|
403704c9c1
|
Web: Files: Socket: Added new data parameter for "s:modify-folder"
|
2022-01-25 12:03:15 +03:00 |
|
Dmitry Kulak
|
eb6573bea0
|
Web: Files: Badges: Renamed handleClick to onClick
|
2022-01-24 21:04:46 +03:00 |
|
|
|
eb75b0b32a
|
Web: Files: Added opportunity to react on modify-folder with socket
|
2022-01-24 20:43:24 +03:00 |
|
Dmitry Kulak
|
8b6936265c
|
Web: Files: Tiles: removed background while renaming
|
2022-01-24 17:17:58 +03:00 |
|
Dmitry Kulak
|
c70e17459b
|
Web: Files: Tiles: Added wrapper for version and "New" badges, refactoring
|
2022-01-24 16:49:27 +03:00 |
|
|
|
cfb5705f60
|
edit Convert (fr, es, it, ro)
|
2022-01-24 16:45:11 +03:00 |
|
|
|
7bc5511cf7
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
|
2022-01-24 16:19:01 +03:00 |
|
|
|
0cc9ce3f19
|
Web: Files: Deleted useless translation.
|
2022-01-24 16:18:25 +03:00 |
|
|
|
c29abf9119
|
Fixed Bug 54870 - Client.Files.Clouds.Drag’n’drop. Fixed 'itemOperationToFolder is not defined' error
|
2022-01-24 15:58:44 +03:00 |
|
|
|
b25f339c3e
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
|
2022-01-24 15:43:04 +03:00 |
|
|
|
e6f92c3142
|
Merge pull request #493 from ONLYOFFICE/feature/convert-password
Feature/convert password
|
2022-01-24 15:03:55 +03:00 |
|
|
|
e865ee0c46
|
Fixed Bug 55056 - Client.Files. Removed the possibility of simultaneous operations with files.
|
2022-01-24 14:17:14 +03:00 |
|
|
|
83e7b1193b
|
Web: Files: Fixed translation.
|
2022-01-24 14:03:29 +03:00 |
|
|
|
226dd96d0c
|
Web: Files: Fixed translation.
|
2022-01-24 13:15:46 +03:00 |
|
|
|
d865a9602b
|
Web: Files: Fixed floating button deletion if the floating button was displayed with a warning and the user tried to convert this file again.
|
2022-01-24 13:01:27 +03:00 |
|
|
|
7f707428f2
|
Web: Files: Added auto-focus when entering a password with an error.
|
2022-01-24 12:09:26 +03:00 |
|
Dmitry Kulak
|
dc7e3d78d0
|
Web: Files: Tiles: Changed font size for file and folder names
|
2022-01-24 10:54:29 +03:00 |
|
|
|
a36b5642e2
|
Web: Files: Added KeyDown support in the convert dialog with password.
|
2022-01-24 10:20:53 +03:00 |
|
|
|
9137620740
|
Web: Files: Added KeyDown support in the upload panel, added auto-focused property to the input.
|
2022-01-24 10:06:08 +03:00 |
|
|
|
ee2fd6bb0f
|
Web:Files:Added a check for the absence of other pictures in the playlist for moving through the picture via a direct link in MediaViewer.
|
2022-01-21 19:21:29 +03:00 |
|
|
|
2abdb3fc21
|
Web: Files: Fixed button color, the button is disabled if the user has not entered a character.
|
2022-01-21 16:52:40 +03:00 |
|
Dmitry Kulak
|
83fd179e0a
|
Web: Files: Tiles: Fix after merge
|
2022-01-21 16:51:59 +03:00 |
|
Dmitry Kulak
|
b740a4d00a
|
Merge branch 'develop' into feature/redesign-tiles
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Server/DocStore
|
2022-01-21 16:47:39 +03:00 |
|
|
|
292f00e225
|
WEb: files: Moved api copy method.
|
2022-01-21 15:50:59 +03:00 |
|
|
|
88a6f82297
|
Web: Files: Deleted useless code.
|
2022-01-21 15:21:43 +03:00 |
|
|
|
efe799d712
|
Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
# products/ASC.Files/Client/src/helpers/utils.js
|
2022-01-21 14:44:06 +03:00 |
|
|
|
8de8ffbb86
|
Web: Files: Deleted useless code.
|
2022-01-21 14:40:13 +03:00 |
|
|
|
e3497f0ad1
|
Web: Files: Added header translation.
|
2022-01-21 14:14:17 +03:00 |
|
|
|
e1d07c5699
|
Web: Files: Added English translation.
|
2022-01-21 13:45:52 +03:00 |
|
|
|
32c398c044
|
Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS
|
2022-01-21 12:53:29 +03:00 |
|
|
|
34441d6335
|
Web: Moved some translations from Files to COMMON for asc-web-components
|
2022-01-21 11:49:16 +03:00 |
|
|
|
97624451a8
|
Web: Files: Fixed Regular expression.
|
2022-01-21 11:24:54 +03:00 |
|
|
|
f7779b3056
|
Web: Files: refactoring.
|
2022-01-21 10:51:01 +03:00 |
|
|
|
720ca53c70
|
Web: Files: Added password error handler to HOCs.
|
2022-01-21 10:49:52 +03:00 |
|
|
|
1e5877faef
|
Web: Files: Added row loader when creation file or folder.
|
2022-01-21 10:38:34 +03:00 |
|
|
|
5c34a2b770
|
Web: Files: Changed file encoding to UTF8 with BOM
|
2022-01-20 22:05:59 +03:00 |
|
|
|
0f13f686c2
|
Web: Renamed usage of translations key "folder", "file"
|
2022-01-20 22:04:59 +03:00 |
|
|
|
1392659acf
|
Web: Tests: Fix UselessTranslationKeysTest issues: removed useless keys: "TitleCreated", "TitleModified", "TitleUploaded"
|
2022-01-20 18:38:25 +03:00 |
|
|
|
7824786afc
|
Web: Removed useless translation key "SelectFolder"
|
2022-01-20 18:25:12 +03:00 |
|
|
|
525439ff72
|
Web: Renamed translations key switchToThumbnails to SwitchToThumbnails
|
2022-01-20 18:21:01 +03:00 |
|
|
|
b23ac1c5f8
|
Web: Fix badges titles
|
2022-01-20 18:20:13 +03:00 |
|
Dmitry Kulak
|
64e608dba9
|
Web: Files: Tiles: Fixed shadows from badges and quickbuttons for more visibility
|
2022-01-20 17:51:13 +03:00 |
|
|
|
63243003ec
|
Web: Removed duplicate
|
2022-01-20 17:02:15 +03:00 |
|
|
|
9b593d5c79
|
Web: Fix translations issues by tests
|
2022-01-20 16:56:32 +03:00 |
|
|
|
99105f5d73
|
Merge branch 'develop' into component-tooltips
# Conflicts:
# packages/asc-web-components/icon-button/index.js
# products/ASC.Files/Client/public/locales/de/Article.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/en/Article.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/fr/Article.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/Article.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/pt-BR/Article.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Article.json
# products/ASC.Files/Client/public/locales/ro/Translations.json
# products/ASC.Files/Client/public/locales/ru/Article.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/sk/Article.json
# products/ASC.Files/Client/public/locales/sk/Translations.json
|
2022-01-20 15:45:24 +03:00 |
|
Dmitry Kulak
|
2410bb9a5c
|
Web: Files: Tiles: Removed unused code
|
2022-01-20 13:56:33 +03:00 |
|
Dmitry Kulak
|
877373e3a3
|
Web: Files: Tiles: Tiles now change color while checked or active
|
2022-01-20 13:55:58 +03:00 |
|
|
|
d4b28b7de3
|
Fixed Bug 53524 - VersionHistory: User's display name with diacritics invalid
|
2022-01-20 11:43:16 +03:00 |
|
|
|
4cbb25048f
|
Web: Files: Added password error handler.
|
2022-01-20 11:09:40 +03:00 |
|
Dmitry Kulak
|
61d8d33ad2
|
Web: Files: Tiles: Fixed badge padding
|
2022-01-20 10:22:55 +03:00 |
|
|
|
68f2952975
|
Web: Files: Added loader for button.
|
2022-01-19 17:09:08 +03:00 |
|
|
|
3ac17188cb
|
Fixed Bug 54083 - Client.Files. Fixed file selection reset
|
2022-01-19 17:07:33 +03:00 |
|
Dmitry Kulak
|
8fa4d6e86d
|
Web: Files: Removed unused code, fixes
|
2022-01-19 17:05:27 +03:00 |
|
|
|
c3687bc804
|
Web: Files: Added warning about creating a file with an error.
|
2022-01-19 17:04:58 +03:00 |
|
|
|
384a3b1129
|
Web: files: Added dialog description.
|
2022-01-19 16:56:40 +03:00 |
|
|
|
fd5b61dce1
|
Web: Files: Added warning about successful file creation.
|
2022-01-19 15:56:37 +03:00 |
|
Dmitry Kulak
|
efbfb62e2f
|
Web: Files: withLoader: Fixes
|
2022-01-19 15:35:15 +03:00 |
|
Dmitry Kulak
|
1a1d597a82
|
Web: Files: Tiles: Separated clashing styles for rename wrapper
|
2022-01-19 15:31:42 +03:00 |
|
Dmitry Kulak
|
da4b9d0db9
|
Web: Files: Tiles: Fixed option button padding
|
2022-01-19 15:29:17 +03:00 |
|
|
|
53eee989e6
|
Web: Files: Added warning toastr about file protecting.
|
2022-01-19 15:28:53 +03:00 |
|
|
|
fde1f1c015
|
Web:Files:Сhanged history.pushState method to history.push.
|
2022-01-19 12:27:17 +03:00 |
|
Dmitry Kulak
|
2876ef58ef
|
Web: Files: Tiles: Fixed quick buttons appearance conditions
|
2022-01-19 11:23:46 +03:00 |
|
Dmitry Kulak
|
e21b7a2176
|
Web: Files: Tiles: Refactoring
|
2022-01-19 11:05:59 +03:00 |
|
|
|
832b422007
|
Web: Files: Added logic for entering a password when creating a form template from a text file.
|
2022-01-19 10:24:07 +03:00 |
|
Dmitry Kulak
|
6cb00cd777
|
Web: Files: Tiles: Added quick buttons, refactoring
|
2022-01-18 19:19:56 +03:00 |
|
|
|
0a90636703
|
Web: Files: When confirming the creation of a file, the buttons were removed. Added password entry process.
|
2022-01-18 18:35:13 +03:00 |
|
|
|
aea69a3077
|
Fixed Bug 54884 - Client.Files. Removed the possibility of simultaneous operations with files.
|
2022-01-18 18:08:27 +03:00 |
|
|
|
1271bae470
|
Web: Files: Added copy api method to create form template, added closing editors tab.
|
2022-01-18 12:22:55 +03:00 |
|
|
|
28bbc72ad5
|
Web:Files:Added history.pushState method to display images in HOC withFileActions.
|
2022-01-18 10:46:02 +03:00 |
|
|
|
1a8d88345a
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
# yarn.lock
|
2022-01-17 19:02:40 +03:00 |
|
|
|
474f754dd9
|
Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1
|
2022-01-17 17:20:35 +03:00 |
|
|
|
9e49ae6a75
|
Web: Files: Refactoring, removed bug with memory leak.
|
2022-01-17 16:21:10 +03:00 |
|
|
|
87fa4afcd3
|
Web: Files: Refactoring.
|
2022-01-17 15:57:37 +03:00 |
|
|
|
aa8903b0ef
|
Web: Files: Added copy method to save in 'oform' format.
|
2022-01-17 15:54:14 +03:00 |
|
|
|
a853d511e5
|
Web: Files: Added new prop.
|
2022-01-17 15:50:42 +03:00 |
|
|
|
753e8c48bd
|
Fixed Bug 54881 - Client.Files. Disabled "Move to Trash" button when no item is selected
|
2022-01-17 15:35:20 +03:00 |
|
|
|
83c952bf7e
|
Web: Files: removed recent request for private folder
|
2022-01-17 11:40:35 +03:00 |
|
|
|
77937390ef
|
Web: Fix crash of Wizard with default en-US language
|
2022-01-14 19:12:58 +03:00 |
|
Dmitry Kulak
|
8e62da40a3
|
Web: Files: Tiles: Removed unused code
|
2022-01-14 17:46:52 +03:00 |
|
|
|
783bdd27f0
|
WEb: Files: Change the password dialog due to modification of the password imitation component.
|
2022-01-14 14:36:14 +03:00 |
|
|
|
e6647c835f
|
Web: Files: Simplification of the password imitating component.
|
2022-01-14 12:17:59 +03:00 |
|
|
|
bed51de56e
|
Web: Files: Refactoring.
|
2022-01-13 16:21:08 +03:00 |
|
|
|
4cec0e7828
|
Fixed Bug 54870 - Client.Files.Clouds.Drag’n’drop. Fixed drag'n'drop movement third-party storage folders.
|
2022-01-13 15:37:19 +03:00 |
|
|
|
9a236cabf5
|
Web: Files: Added possibility to change width of password input.
|
2022-01-13 15:36:40 +03:00 |
|
|
|
23c8a8358e
|
Web: Files: Added password dialog.
|
2022-01-13 15:35:56 +03:00 |
|
Dmitry Kulak
|
fe75b6fa32
|
Merge branch 'develop' into feature/redesign-tiles
|
2022-01-13 13:59:50 +03:00 |
|
|
|
6fd00f52c5
|
Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
# products/ASC.Files/Client/src/store/UploadDataStore.js
|
2022-01-13 13:14:03 +03:00 |
|
|
|
e6f89afb6d
|
Web: Files: Transferring actions to a row file.
|
2022-01-13 12:53:30 +03:00 |
|
|
|
1681507100
|
Fixed Bug 54580 - Docs. Private Rooms. Unable to load form file '.oform'
|
2022-01-13 12:13:48 +03:00 |
|
|
|
94a4ddb146
|
Web: files: Fixed import.
|
2022-01-13 11:40:46 +03:00 |
|
|
|
d8ee3de51a
|
Web: Files: Moving a component to a separate folder.
|
2022-01-13 11:37:24 +03:00 |
|
|
|
52c48a810c
|
Web: files: Added error toastr.
|
2022-01-13 11:18:41 +03:00 |
|
|
|
6f90864ed8
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
|
2022-01-13 10:49:43 +03:00 |
|
|
|
dbb80ac38b
|
Web: Files: Added new translation.
|
2022-01-13 10:13:54 +03:00 |
|
|
|
3a0684d24b
|
Web: Files: Fixed translations for languages.
|
2022-01-13 10:03:53 +03:00 |
|
|
|
549c381ca1
|
Web: Files: Fixed translations for Italian language.
|
2022-01-13 09:59:50 +03:00 |
|
|
|
baeadfd93a
|
Web: Files: fixed fr translations.
|
2022-01-13 09:56:52 +03:00 |
|
|
|
7e74cf8c91
|
Web: Files: fixed translations.
|
2022-01-13 09:55:05 +03:00 |
|
|
|
253ae7aa19
|
Web: Files: Renaming of translations keys.
|
2022-01-13 09:40:26 +03:00 |
|
|
|
c81fe84da2
|
Web: Files: Fixed translations.
|
2022-01-13 09:28:17 +03:00 |
|
|
|
8b327ceb66
|
Web: Socket.IO: Extended /api/2.0/settings with socketUrl + refactoring of client socket usage
|
2022-01-12 20:13:30 +03:00 |
|
|
|
a91d767c66
|
Merge branch 'hotfix/v1.1.1' into bugfix/conversion-dialog-in-sorted-folders
|
2022-01-12 17:26:48 +03:00 |
|
|
|
332fc5866a
|
Web: Files: Hide the file destination when checkbox is not set.
|
2022-01-12 17:09:21 +03:00 |
|
|
|
ee71dbb2cd
|
Web: updated icons of modules
|
2022-01-12 15:51:36 +03:00 |
|
|
|
5c5aac9244
|
Web:Files:Removed momentJS from DateCell and FilesRowContent components. Combined the getStatusByDate and getTableStatusByDate methods into the getStatusByDate method in the withContent HOC`s. Added parameters for the toLocaleString method in the getStatusByDate method. Replaced the comma from date string inside the getStatusByDate method.
|
2022-01-12 15:33:30 +03:00 |
|
|
|
d2fb921a7c
|
Web:Files: Refactoring.
|
2022-01-11 18:59:35 +03:00 |
|
|
|
1941ceee28
|
Web: Files: Added toast for success conversion.
|
2022-01-11 18:48:09 +03:00 |
|
|
|
6ba659ac04
|
Web: Files: Added translations.
|
2022-01-11 18:43:43 +03:00 |
|
|
|
8b9ea275de
|
Web: Files: Renaming.
|
2022-01-11 17:08:42 +03:00 |
|
|
|
a87a1a22b5
|
Web: Files: Added information about file destination.
|
2022-01-11 17:05:36 +03:00 |
|
|
|
0c341f0709
|
Merge branch 'hotfix/v1.1.1' into feature/convert-password
|
2022-01-11 16:14:46 +03:00 |
|
|
|
15f15da4a0
|
Web: files: Added translations.
|
2022-01-11 15:46:53 +03:00 |
|
|
|
3565666fd2
|
Web: Table: fixed default columns size, fixed styles
|
2022-01-11 12:34:54 +03:00 |
|
|
|
ac157df98d
|
Web: Files: The converted file does not appear in the sorted folders.
|
2022-01-11 11:17:06 +03:00 |
|
|
|
d3de3a11f2
|
Web:Files:Badges:Styling badges.
|
2022-01-10 18:08:56 +03:00 |
|
|
|
3522dea939
|
Web:Files:Badges:Fix props lineHeightBadge for table view.
|
2022-01-10 16:30:37 +03:00 |
|
|
|
1d83359aa7
|
Web:Files:Badges:Added check for isTablet for tablet badges view. Added changing the font size of badges depending on the view.
|
2022-01-10 15:50:26 +03:00 |
|
|
|
6cbd02b71c
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
# products/ASC.Files/Client/webpack.config.js
# products/ASC.Files/Server/DocStore
# yarn.lock
|
2022-01-10 11:06:32 +03:00 |
|
|
|
5a193e50f8
|
Web:Files:Badges:Fixed styles badges.Removed inactive lock and favorite badges in mobile view.
|
2022-01-08 13:58:29 +03:00 |
|
|
|
7a47ff8fc9
|
Web:Files:Badges:Styling badges.
|
2022-01-08 00:13:19 +03:00 |
|
|
|
a7da94a8a2
|
Web:Files:Badges:Styling badges in a mobile view.
|
2022-01-07 19:27:49 +03:00 |
|
|
|
6a1a9d2bf3
|
Web:Files:Badges:Disabled display of Share on mobile device when row view.
|
2021-12-30 18:57:07 +03:00 |
|
|
|
f8035967b5
|
Web: Socket: Changed room settings
|
2021-12-30 15:54:23 +03:00 |
|
|
|
3c23f4d892
|
Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
|
2021-12-30 14:34:49 +03:00 |
|
|
|
5fb4de9537
|
Web:Files:Badges:Added check for isTablet device for row view.
|
2021-12-30 14:29:46 +03:00 |
|
|
|
f2134c7600
|
Web: Files: Fixed last page operations after merge.
|
2021-12-30 12:55:49 +03:00 |
|
Dmitry Kulak
|
e014ff614e
|
Web: Files: Tiles: Loaders aligned with content, fixes
|
2021-12-30 10:55:16 +03:00 |
|
Dmitry Kulak
|
fd7a5d97f2
|
Web: Files: Tiles: Fixed styles for name renaming
|
2021-12-29 18:45:47 +03:00 |
|
|
|
1645386669
|
Fix after merge
|
2021-12-29 18:30:05 +03:00 |
|
|
|
ddead9c17f
|
WEb: Files: Refactoring.
|
2021-12-29 17:28:32 +03:00 |
|
|
|
493a112811
|
Merge branch 'feature/redesign-badges' of github.com:ONLYOFFICE/AppServer into feature/redesign-badges
|
2021-12-29 16:41:09 +03:00 |
|
|
|
c9e7503e35
|
Web: Files: Changed password input logic.
|
2021-12-29 16:00:03 +03:00 |
|
Dmitry Kulak
|
b5bcf38456
|
Merge remote-tracking branch 'origin/develop' into feature/redesign-tiles
|
2021-12-29 15:48:41 +03:00 |
|
Artem Tarasov
|
3b75038803
|
Merge branch 'develop' into feature/redesign-badges
# Conflicts:
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/Icons.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# public/images/access.edit.react.svg
|
2021-12-29 15:45:33 +03:00 |
|
|
|
df6a18db6a
|
Merge branch 'develop' into feature/redesign-badges
|
2021-12-29 14:11:44 +03:00 |
|
