Commit Graph

7481 Commits

Author SHA1 Message Date
4b3cb1b4fb backup.core: first version 2021-08-31 12:40:28 +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
a0f5c4231f fixed run via vs 2021-08-23 15:55:19 +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
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
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
1bc7863168 Web: Editor: Fixed sharing settings display. 2021-08-19 11:45:03 +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
03a030ebd0 Web: Editor: Added missing await syntactic. 2021-08-18 09:57:55 +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
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
6e9ceea8c0 Web: Editor: Added link for insert image and mail merge. 2021-08-13 14:50:24 +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
b9d242df6f Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2021-08-12 16:19:23 +03:00
fad2a178d8 Build: Added build.static.bat + change rimraf, mkdirp packages to single shx package (npm command line util) 2021-08-12 16:18:48 +03:00
9aafaa21ea
Merge pull request #319 from ONLYOFFICE/feature/log
Feature/log
2021-08-12 15:00:53 +03:00
39b93080bd Web: Editor: Added config id for editor. 2021-08-12 14:41:57 +03:00
4919b34fd0 Web: Webpack: increased performance maxEntrypointSize and maxAssetSize 2021-08-11 20:40:31 +03:00
a26e475c94 Web: fix no license warning 2021-08-11 20:39:24 +03:00
f642090c66 Web: Client: fixed 2021-08-11 10:44:00 +03:00
3f56790c85 Fix bug 51365: update avatar in header 2021-08-11 10:18:10 +03:00
999e1157d5 Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
#	web/ASC.Web.Editor/src/Editor.jsx
2021-08-11 09:59:57 +03:00
0d10967912 Merge branch 'develop' into release/1.0.0 2021-08-10 18:48:36 +03:00
643b7b66dc Optimization: removed autofac ILifetimeScope 2021-08-10 17:56:38 +03:00
75f659a9eb WEb:Editor: Fixed removing current open document from recents. 2021-08-10 12:54:10 +03:00
b92b29e510 Web: Editor: Added error handler for recent folders. 2021-08-10 12:49:51 +03:00
94d1939613 Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0 2021-08-09 19:53:21 +03:00
a0722a17d3 Editor: Optimized getting recent 2021-08-09 19:53:13 +03:00
b04b8c7edb Fix bug 51828: about links 2021-08-09 16:39:03 +03:00
634ea15ec2 Fix bug 51815: editor favicon 2021-08-09 16:15:17 +03:00
dfa6e97c94 Fix bug 51437: no ability to share files available for viewing 2021-08-09 15:53:54 +03:00
546c1872a3 Added asp logging 2021-08-08 16:19:54 +03:00
5ec78df6ee Fix Bug 51547 Client.Files. "When opened for viewing, the document is opened for editing" 2021-08-06 16:26:42 +03:00
9230d4c62d Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0 2021-08-05 19:11:20 +03:00
5687e6bca2 Merge branch 'develop' into release/1.0.0 2021-08-05 19:11:02 +03:00
a3fae3bc2a Fix Bug 51695 Client.Files. ‘Firefox prevented this site from opening pop-up window’ on FF 2021-08-05 19:10:08 +03:00
88b55606bc Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-05 14:38:03 +03:00
3beec799e7 Web: Editor: Added action link. 2021-08-05 14:05:09 +03:00