|
dd9e5e9b5d
|
Merge branch 'develop' into feature/webhooks
|
2021-08-26 15:17:53 +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 |
|
Vashchuk Nikita
|
c41361bdd8
|
fix
|
2021-08-24 11:08:58 +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 |
|
Vashchuk Nikita
|
c851641b6c
|
Merge remote-tracking branch 'remotes/origin/feature/webhooks' into feature/webhooks
|
2021-08-23 13:01:48 +03:00 |
|
Vashchuk Nikita
|
9f0e41b880
|
Merge branch 'develop' into feature/webhooks
|
2021-08-23 12:36:01 +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 |
|
|
421dda3eaf
|
Files: optimization
|
2021-08-20 14:42:16 +03:00 |
|
|
91fd7615b3
|
Optimization
|
2021-08-20 10:52:52 +03:00 |
|
|
b377c450a2
|
Merge branch 'develop' into feature/file-folder-selectors
|
2021-08-19 19:14:42 +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 |
|
|
6767c2ac2e
|
Api: release config
|
2021-08-19 17:36:13 +03:00 |
|
|
02d2f04b94
|
Web: Editor: Fixed renaming of documents when save as.
|
2021-08-19 17:23:16 +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 |
|
Vashchuk Nikita
|
3dc5ca5afc
|
Merge branch 'develop' into feature/webhooks
|
2021-08-19 15:58:57 +03:00 |
|
|
0745110a44
|
Test: fix
|
2021-08-19 15:58:25 +03:00 |
|
Vashchuk Nikita
|
66be58c759
|
fix
|
2021-08-19 15:56:14 +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 |
|
|
fc32619c9a
|
WEb: Editor: Deleted useless code.
|
2021-08-19 14:55:39 +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 |
|
Vashchuk Nikita
|
e1c648e06a
|
Merge branch 'develop' into feature/webhooks
|
2021-08-19 13:49:16 +03:00 |
|
Vashchuk Nikita
|
5e72bcc224
|
fix
|
2021-08-19 13:17:54 +03:00 |
|
Vashchuk Nikita
|
2859d05ce3
|
fix
|
2021-08-19 12:25:43 +03:00 |
|
|
9fa19d97b6
|
Web: Files: Added missing import.
|
2021-08-19 12:12:29 +03:00 |
|
Vashchuk Nikita
|
7d4b22ca83
|
added tests, migrations
|
2021-08-19 12:11:26 +03:00 |
|
|
1bc7863168
|
Web: Editor: Fixed sharing settings display.
|
2021-08-19 11:45:03 +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 |
|
|
cf87addaa3
|
Security: added new method
|
2021-08-18 17:04:16 +03:00 |
|
|
d5646eaa92
|
Revert "Build: deploy public files"
This reverts commit 82e64781fe .
|
2021-08-18 17:03:16 +03:00 |
|
|
82e64781fe
|
Build: deploy public files
|
2021-08-18 16:52:23 +03:00 |
|
|
357a351762
|
Merge pull request #326 from ONLYOFFICE/bugfix/canShare
Bugfix/can share
|
2021-08-18 14:02:52 +03:00 |
|
|
d1598f2553
|
Merge branch 'develop' into bugfix/canShare
|
2021-08-18 13:36:45 +03:00 |
|