Commit Graph

5766 Commits

Author SHA1 Message Date
61946283e5 fix 52181 2021-09-02 15:15:30 +03:00
a8f9b6a096 Files: removed empty queries 2021-09-01 19:22:30 +03:00
ed171ecb9d Merge branch 'develop' into feature/chunk-size-setting 2021-09-01 15:01:06 +03:00
de373f09fa Web: Files: added default chunkUploadSize 2021-09-01 14:50:46 +03:00
7b4cb77321 fix 52181 2021-09-01 14:37:42 +03:00
83a269ec4a Merge branch 'develop' into feature/chunk-size-setting 2021-08-31 17:37:53 +03:00
9b7464a894 Web: Client: Files: UploadDataStore: Fixed upload chunk value, now it get from settings 2021-08-31 17:35:46 +03:00
abaf381a09 Files: increase limits 2021-08-31 17:03:51 +03:00
a6b55a7496 Files: settings. Added ChunkUploadSize 2021-08-31 14:34:30 +03:00
3c0638482d Web: Files: fixed getHeaderMenu 2021-08-27 14:07:51 +03:00
4f30eb9a2a Web: removed duplicate translations from Common.json 2021-08-27 11:09:19 +03:00
6bb9cb2235 Web: People: fixed user access for module People 2021-08-26 17:47:21 +03:00
833cd9553c Web: Files: fixed FilesTableRow after merge 2021-08-26 16:20:02 +03:00
ff7f3926ce Merge branch 'develop' into feature/table-view
# Conflicts:
#	packages/asc-web-common/components/PageLayout/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	public/locales/de/Common.json
#	public/locales/it/Common.json
#	public/locales/lo/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/ro/Common.json
2021-08-26 16:05:15 +03:00
1bda036a9f Merge branch 'develop' into bugfix/render-optimization 2021-08-26 10:32:32 +03:00
040afb10fd Merge branch 'develop' into feature/file-folder-selectors 2021-08-25 19:11:14 +03:00
05c08762ea Web: Files: fixed loopTreeFolders error 2021-08-25 17:21:18 +03:00
e5c15cb7a7 Web: Files: Table: fixed drag styles 2021-08-25 16:53:26 +03:00
8727b504b7 Merge branch 'develop' into feature/table-view
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
2021-08-25 16:48:07 +03:00
3fb9cc1f24 Files: fixed uploaders 2021-08-23 15:55:42 +03:00
792f74e41a Files: optimization 2021-08-23 11:48:31 +03:00
610e31ec3b fixed equals 2021-08-20 19:04:55 +03:00
61528fb9c2
Merge branch 'develop' into feature/file-folder-selectors 2021-08-20 17:35:31 +03:00
e5faa90adb removed nuget warnings 2021-08-20 16:53:27 +03:00
57ad00d69d Files: optimization 2021-08-20 16:10:40 +03:00
c62b32ebf2 Files: optimization 2021-08-20 15:44:31 +03:00
d8583662dc People: remove log 2021-08-20 14:42:35 +03:00
421dda3eaf Files: optimization 2021-08-20 14:42:16 +03:00
91fd7615b3 Optimization 2021-08-20 10:52:52 +03:00
bbbdc79a21 WEb: Files: Added folder tree reset. 2021-08-19 19:08:58 +03:00
36987fb1f3 Web: Remove useless condition, defined display type of panels. 2021-08-19 18:35:04 +03:00
fbf82a59ca Web: Files/Editor: Fixed folder tree for select file component. 2021-08-19 16:44:41 +03:00
2f7b25b223 Web: Files: Fixed constants for filter type. 2021-08-19 16:20:34 +03:00
2057251e25 Web: Files: Deleted useless code. 2021-08-19 16:07:46 +03:00
30cf66a82f Web: Files: SelectFileDialog: Added constants for filter type. 2021-08-19 15:48:43 +03:00
1b7039d2c9 Web: Files: Deleted useless console.log. 2021-08-19 15:30:53 +03:00
258c866f73 Merge branch 'develop' into feature/file-folder-selectors 2021-08-19 15:03:01 +03:00
bbba5177c5 Web: Files: SelectFileInput: Added missing props. 2021-08-19 14:55:26 +03:00
ed70c454ac Web: SelectFileDialog/SelectFolderDialog: Optimization and refactoring components. 2021-08-19 14:10:50 +03:00
fe91f517cc Web: Files: fixed routing from settings 2021-08-19 13:29:04 +03:00
9fa19d97b6 Web: Files: Added missing import. 2021-08-19 12:12:29 +03:00
8e0320460c Web: Fixed after merge. 2021-08-19 10:40:40 +03:00
3b8cf0a275 Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/helpers/utils.js
#	web/ASC.Web.Editor/src/Editor.jsx
2021-08-19 10:08:14 +03:00
b7a57dddc4 Web: Files: fixed SharedButton.js 2021-08-18 18:44:23 +03:00
d3776ca578 Web: Files: moved TreeFolders selectedKeys to store 2021-08-18 18:38:40 +03:00
70e3e73e70 Web: Files: renamed isSelectionCount to hasSelection 2021-08-18 18:37:31 +03:00
b7ff648500 Merge branch 'develop' into bugfix/render-optimization 2021-08-18 17:18:28 +03:00
cf87addaa3 Security: added new method 2021-08-18 17:04:16 +03:00
f43e64d05d Web: People: fixed table translations 2021-08-18 16:31:51 +03:00
b7df3903dd Web: Files: fixed the hiding of the article 2021-08-18 15:52:27 +03:00