Commit Graph

13849 Commits

Author SHA1 Message Date
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
0745110a44 Test: fix 2021-08-19 15:58:25 +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
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
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
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
db15747c9b Merge branch 'bugfix/render-optimization' of github.com:ONLYOFFICE/AppServer into bugfix/render-optimization 2021-08-18 17:18:12 +03:00
f53d7eb718 Web: Common: fixed article unpin 2021-08-18 17:17:45 +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
5f4b824216
Merge branch 'develop' into bugfix/render-optimization 2021-08-18 17:02:29 +03:00
82e64781fe Build: deploy public files 2021-08-18 16:52:23 +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
8add130cfa Web: Files: fixed Home re-render 2021-08-18 14:30:19 +03:00
63f02392db Web: Files: fixed Header re-render 2021-08-18 14:28:20 +03:00
d0b7e2d82d Web: Files: fixed Article Body re-render 2021-08-18 14:27:25 +03:00
93d011aee6 Web: Files: fixed ItemIcon 2021-08-18 14:26:25 +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