Commit Graph

7506 Commits

Author SHA1 Message Date
0eaee99856 Fix bug 51365: update avatar in header 2021-09-07 02:31:56 +03:00
5a5bb8fb25 Merge branch 'develop' into release/1.0.0 2021-09-05 22:59:31 +03:00
d099326e7f Merge branch 'develop' into feature/backup.core
# Conflicts:
#	common/services/ASC.Data.Backup/Program.cs
2021-09-05 12:50:05 +03:00
8171563965 backup.core: move backup.core 2021-09-02 15:41:54 +03:00
fa204303f5 Merge branch 'develop' into release/1.0.0 2021-09-01 16:08:41 +03:00
1fdb42a53a Fix Error 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries. 2021-09-01 15:25:20 +03:00
99903b3fab Merge branch 'develop' into feature/compare-files-in-editor 2021-09-01 10:25:39 +03:00
b4c5edfa21 Merge branch 'develop' into feature/backup.core 2021-08-31 17:58:07 +03:00
a6b55a7496 Files: settings. Added ChunkUploadSize 2021-08-31 14:34:30 +03:00
4b3cb1b4fb backup.core: first version 2021-08-31 12:40:28 +03:00
51c2341248 Fix Bug 52089 - Client.Files. Elements of the page are not selected using left mouse button. 2021-08-30 15:59:17 +03:00
e52cd01fa2 Fix Error 52249 - Client.Editor.Favorite. "Add to favorites" button for a third-party user opened by an external link of a registered file. 2021-08-30 14:47:56 +03:00
cd66c4ffdb Web: Editor: Refactoring. 2021-08-27 14:21:51 +03:00
beb2a6c707 Web:Editor: Refactoring. 2021-08-27 14:13:50 +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
c66268a9c2 Merge branch 'develop' into release/1.0.0
# Conflicts:
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/helpers/utils.js
2021-08-26 13:49:25 +03:00
30afd1eca0
Merge branch 'develop' into feature/file-folder-selectors 2021-08-26 09:51:21 +03:00
14e8c59b17 Merge branch 'develop' into release/1.0.0 2021-08-25 21:17:41 +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
20e5efec70 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-23 18:20:44 +03:00
a8f2f7348a Web: Files: Editor: fixed successAuth 2021-08-23 18:20:36 +03:00
a0f5c4231f fixed run via vs 2021-08-23 15:55:19 +03:00
68e0da72d7 Web: Added no selection of logo. 2021-08-23 13:56:35 +03:00
0cfb70d9e2 Error 52089 - Client.Files. Elements of the page are not selected using left mouse button. 2021-08-23 13:50:21 +03:00
9207238d8d Merge branch 'develop' into release/1.0.0 2021-08-20 16:12:40 +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
779f52b028 Web: Editor: rewrite with loadScript 2021-08-19 13:31:17 +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
46a97efb52 Merge branch 'develop' into release/1.0.0
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
2021-08-18 16:59:00 +03:00
03a030ebd0 Web: Editor: Added missing await syntactic. 2021-08-18 09:57:55 +03:00
34408c6e41 Web: Components: added style props for snackbar 2021-08-17 21:20:31 +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