Commit Graph

13692 Commits

Author SHA1 Message Date
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
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
03a030ebd0 Web: Editor: Added missing await syntactic. 2021-08-18 09:57:55 +03:00
88d18dd648 Web: Files: fixed row styles 2021-08-17 17:55:11 +03:00
33b414e319 Merge branch 'bugfix/canShare' of github.com:ONLYOFFICE/AppServer into bugfix/canShare 2021-08-17 16:47:41 +03:00
56eadd95a7 Web: Files: fixed canShare 2021-08-17 16:47:34 +03:00
48c6d35a20 Web: AuthStore: Removed useless code 2021-08-17 16:32:19 +03:00
d1dd00e107 Web: Files: Turn off wdyr 2021-08-17 16:31:32 +03:00
11f6ab96bc Files: fixed tests 2021-08-17 15:50:05 +03:00
93c2b06f06 Web: Files: removed unused code 2021-08-17 15:38:59 +03:00
6ebffc1784 Web: Components: fixed Link re-render 2021-08-17 15:19:33 +03:00
c563ad1956 Web: Files: Added commented variant of re-render fix 2021-08-17 15:11:56 +03:00
4c1105f63c Web: Files: Decomposed item (fix re-render) 2021-08-17 15:11:23 +03:00
12f005ccb5 Web: Files: Added useCallback (fix re-render) 2021-08-17 15:09:56 +03:00
6647d238b5 Web: Files: Turn on wdyr 2021-08-17 15:08:21 +03:00
5a5c735894 WEb: Files: SelectFileDialog: Optimization (removed repeated API call when the selected folder doesn't change). 2021-08-17 13:22:10 +03:00
4d8ab266d4 Merge branch 'develop' into bugfix/canShare 2021-08-17 13:09:06 +03:00
0f2bb18bb4 Web: Editor: Deleted useless code. 2021-08-17 12:53:23 +03:00
c6ec0fbee6 Web: Editor: Refactoring. 2021-08-17 12:52:33 +03:00
cad8055f5f Web: Files: SelectFileDialog: API calls optimization. 2021-08-17 12:44:02 +03:00
0a947fb739 Web: Files: SelectFileDialog: Deleted useless code. 2021-08-17 12:04:51 +03:00
e8085b1ff2
Merge pull request #325 from ONLYOFFICE/feature/nginx-static
Feature/nginx static
2021-08-17 12:04:27 +03:00
3dcad79429 Web: Files: SelectFolderDialog/SelectFileDialog: Deleted useless authStore.init(). 2021-08-17 11:59:33 +03:00
b6b09ed758 Web: SelectFolderDialog: Refactoring and API calls optimization. 2021-08-17 11:51:45 +03:00
bba83d2e9f build.static.bat: Removed pause (for buildAndDeploy.bat) 2021-08-17 11:19:56 +03:00
07ea37bdfc build.bat: Added comment 2021-08-17 11:12:30 +03:00
5c492ee583 Build: Optimization of build process 2021-08-17 11:00:36 +03:00
9873ea6fa0 Nginx: config for developers 2021-08-16 19:26:16 +03:00
b6a7e46d09 Web: Files: fixed showShare 2021-08-16 18:21:08 +03:00
3bfe3865e1 Web: Files: fixed HOCs render 2021-08-16 17:50:31 +03:00
46d3720216 Web: SelectFile/SelectFolder: Fixed displaying "Not available folders" for empty third-party folders. 2021-08-16 16:51:32 +03:00
f3ec5bb0e0 Nginx: static config 2021-08-16 15:18:45 +03:00
e634b5c72f Web: Editor: Fixed converting file when open in new tab. 2021-08-16 13:17:49 +03:00
92f0126e5d Web: Editor: Added displaying tooltip with the message instead of info toastr. 2021-08-16 11:21:14 +03:00
9715719994 Merge branch 'develop' into bugfix/canShare 2021-08-16 11:07:30 +03:00
e60815b15d Web: Refactoring and API calls optimization 2021-08-13 20:32:50 +03:00
e992b9f3e5 Web: Files: Re-written code to canShare and canEdit from Server's fileInfo 2021-08-13 19:26:37 +03:00
996b438a6b Web: Api: Added opportunity to skipLogout on 401 error 2021-08-13 19:24:48 +03:00
6bb6064599 Files: Added canShare, canEdit, RootFolderId to FileEntryWrapper 2021-08-13 19:22:57 +03:00
5bf9bfae27 Files: optimization 2021-08-13 18:59:17 +03:00
b23fe977cb Kafka: fix 2021-08-13 17:05:11 +03:00
6e9ceea8c0 Web: Editor: Added link for insert image and mail merge. 2021-08-13 14:50:24 +03:00
4362018a2c Files: fix transaction 2021-08-13 11:09:57 +03:00
86248a3ad1 Kafka: fix create topic 2021-08-13 11:09:01 +03:00
922d25dcb4 WEb: Editor: Fixed sharing access (added canShare function), fixed rename function (added accessEdit function). 2021-08-12 17:38:17 +03:00
508bb59f0f Build: Added yarn install to build.static.bat 2021-08-12 16:24:09 +03:00
b9d242df6f Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2021-08-12 16:19:23 +03:00
fc99e05504 Build: Added build.static.bat 2021-08-12 16:19:16 +03:00