|
61946283e5
|
fix 52181
|
2021-09-02 15:15:30 +03:00 |
|
|
a8f9b6a096
|
Files: removed empty queries
|
2021-09-01 19:22:30 +03:00 |
|
|
9f69a836ca
|
Merge pull request #333 from ONLYOFFICE/feature/compare-files-in-editor
Feature/compare files in editor
|
2021-09-01 16:05:43 +03:00 |
|
|
bdc190de13
|
Merge branch 'develop' into feature/compare-files-in-editor
|
2021-09-01 15:46:58 +03:00 |
|
|
fe0193a284
|
Merge pull request #335 from ONLYOFFICE/feature/chunk-size-setting
Feature/chunk size setting
|
2021-09-01 15:36:42 +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 |
|
|
99903b3fab
|
Merge branch 'develop' into feature/compare-files-in-editor
|
2021-09-01 10:25:39 +03:00 |
|
|
fce956991e
|
nginx: fix
|
2021-08-31 18:38:59 +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 |
|
|
a84bddad3c
|
fix
|
2021-08-30 19:17:57 +03:00 |
|
|
2addb81adf
|
Quota: Price2 removed
|
2021-08-30 18:19:20 +03:00 |
|
|
d7ea8a84a7
|
Merge branch 'develop' into feature/compare-files-in-editor
|
2021-08-27 17:18:34 +03:00 |
|
|
43ee204e80
|
Merge pull request #312 from ONLYOFFICE/feature/table-view
Feature/table view
|
2021-08-27 16:26:29 +03:00 |
|
|
cd66c4ffdb
|
Web: Editor: Refactoring.
|
2021-08-27 14:21:51 +03:00 |
|
|
45865753a2
|
Web: Components: Table: fixed onResize error
|
2021-08-27 14:18:13 +03:00 |
|
|
beb2a6c707
|
Web:Editor: Refactoring.
|
2021-08-27 14:13:50 +03:00 |
|
|
3c0638482d
|
Web: Files: fixed getHeaderMenu
|
2021-08-27 14:07:51 +03:00 |
|
|
a4d12a2c75
|
Web: Files: removed console.log
|
2021-08-27 14:06:24 +03:00 |
|
|
19290bf8cb
|
Web: Editor: Added translation for documents type.
|
2021-08-27 13:46:03 +03:00 |
|
|
7fba408991
|
Web: Editor: Added option "Compare files" for editor.
|
2021-08-27 13:25:23 +03:00 |
|
|
4f30eb9a2a
|
Web: removed duplicate translations from Common.json
|
2021-08-27 11:09:19 +03:00 |
|
|
f740b63fa5
|
Web: Components: fixed hasAccess
|
2021-08-26 17:50:27 +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 |
|
|
bb7cec933e
|
Merge pull request #327 from ONLYOFFICE/bugfix/render-optimization
Bugfix/render optimization
|
2021-08-26 15:43:06 +03:00 |
|
|
26c5d2ed90
|
Web: Common: PageLayout: moved isArticlePinned to settingsStore
|
2021-08-26 15:07:29 +03:00 |
|
|
1bda036a9f
|
Merge branch 'develop' into bugfix/render-optimization
|
2021-08-26 10:32:32 +03:00 |
|
|
e20f2dbf21
|
Merge pull request #328 from ONLYOFFICE/feature/file-folder-selectors
Feature/file folder selectors
|
2021-08-26 10:15:39 +03:00 |
|
|
30afd1eca0
|
Merge branch 'develop' into feature/file-folder-selectors
|
2021-08-26 09:51:21 +03:00 |
|
|
c37fd46e6f
|
fix remove photo
|
2021-08-25 21:17:06 +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 |
|
|
a0f5c4231f
|
fixed run via vs
|
2021-08-23 15:55:19 +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 |
|
|
9f83801f88
|
Nlog: optimization
|
2021-08-20 15:42:43 +03:00 |
|
|
d8583662dc
|
People: remove log
|
2021-08-20 14:42:35 +03:00 |
|