IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,457 Commits 38 Branches 22 Tags 359 MiB
aa6c02b190
Commit Graph

7693 Commits

Author SHA1 Message Date
Tatiana Lopaeva
52ae3d2732 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-09-07 09:49:25 +03:00
Tatiana Lopaeva
184adfa53a Fix Bug 52249 - Client.Editor.Favorite. "Add to favorites" button for a third-party user opened by an external link of a registered file. 2021-09-07 09:49:00 +03:00
Viktor Fomin
0eaee99856 Fix bug 51365: update avatar in header 2021-09-07 02:31:56 +03:00
pavelbannov
5a5bb8fb25 Merge branch 'develop' into release/1.0.0 2021-09-05 22:59:31 +03:00
pavelbannov
d099326e7f Merge branch 'develop' into feature/backup.core 
# Conflicts:
#	common/services/ASC.Data.Backup/Program.cs
 2021-09-05 12:50:05 +03:00
SuhorukovAnton
8171563965 backup.core: move backup.core 2021-09-02 15:41:54 +03:00
Ilya Oleshko
fa204303f5 Merge branch 'develop' into release/1.0.0 2021-09-01 16:08:41 +03:00
Tatiana Lopaeva
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
Tatiana Lopaeva
99903b3fab Merge branch 'develop' into feature/compare-files-in-editor 2021-09-01 10:25:39 +03:00
SuhorukovAnton
b4c5edfa21 Merge branch 'develop' into feature/backup.core 2021-08-31 17:58:07 +03:00
pavelbannov
a6b55a7496 Files: settings. Added ChunkUploadSize 2021-08-31 14:34:30 +03:00
SuhorukovAnton
4b3cb1b4fb backup.core: first version 2021-08-31 12:40:28 +03:00
Tatiana Lopaeva
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
Tatiana Lopaeva
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
Tatiana Lopaeva
cd66c4ffdb Web: Editor: Refactoring. 2021-08-27 14:21:51 +03:00
Tatiana Lopaeva
beb2a6c707 Web:Editor: Refactoring. 2021-08-27 14:13:50 +03:00
Tatiana Lopaeva
19290bf8cb Web: Editor: Added translation for documents type. 2021-08-27 13:46:03 +03:00
Tatiana Lopaeva
7fba408991 Web: Editor: Added option "Compare files" for editor. 2021-08-27 13:25:23 +03:00
Tatiana Lopaeva
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
Ilya Oleshko
30afd1eca0
Merge branch 'develop' into feature/file-folder-selectors 2021-08-26 09:51:21 +03:00
pavelbannov
14e8c59b17 Merge branch 'develop' into release/1.0.0 2021-08-25 21:17:41 +03:00
pavelbannov
c37fd46e6f fix remove photo 2021-08-25 21:17:06 +03:00
Tatiana Lopaeva
040afb10fd Merge branch 'develop' into feature/file-folder-selectors 2021-08-25 19:11:14 +03:00
gopienkonikita
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
gopienkonikita
a8f2f7348a Web: Files: Editor: fixed successAuth 2021-08-23 18:20:36 +03:00
pavelbannov
a0f5c4231f fixed run via vs 2021-08-23 15:55:19 +03:00
Tatiana Lopaeva
68e0da72d7 Web: Added no selection of logo. 2021-08-23 13:56:35 +03:00
Tatiana Lopaeva
0cfb70d9e2 Error 52089 - Client.Files. Elements of the page are not selected using left mouse button. 2021-08-23 13:50:21 +03:00
pavelbannov
9207238d8d Merge branch 'develop' into release/1.0.0 2021-08-20 16:12:40 +03:00
Tatiana Lopaeva
b377c450a2 Merge branch 'develop' into feature/file-folder-selectors 2021-08-19 19:14:42 +03:00
Tatiana Lopaeva
bbbdc79a21 WEb: Files: Added folder tree reset. 2021-08-19 19:08:58 +03:00
pavelbannov
6767c2ac2e Api: release config 2021-08-19 17:36:13 +03:00
Tatiana Lopaeva
02d2f04b94 Web: Editor: Fixed renaming of documents when save as. 2021-08-19 17:23:16 +03:00
Tatiana Lopaeva
fbf82a59ca Web: Files/Editor: Fixed folder tree for select file component. 2021-08-19 16:44:41 +03:00
Tatiana Lopaeva
258c866f73 Merge branch 'develop' into feature/file-folder-selectors 2021-08-19 15:03:01 +03:00
Tatiana Lopaeva
fc32619c9a WEb: Editor: Deleted useless code. 2021-08-19 14:55:39 +03:00
Viktor Fomin
779f52b028 Web: Editor: rewrite with loadScript 2021-08-19 13:31:17 +03:00
Tatiana Lopaeva
1bc7863168 Web: Editor: Fixed sharing settings display. 2021-08-19 11:45:03 +03:00
Tatiana Lopaeva
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
pavelbannov
cf87addaa3 Security: added new method 2021-08-18 17:04:16 +03:00
AlexeySafronov
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
Tatiana Lopaeva
03a030ebd0 Web: Editor: Added missing await syntactic. 2021-08-18 09:57:55 +03:00
Viktor Fomin
34408c6e41 Web: Components: added style props for snackbar 2021-08-17 21:20:31 +03:00
Tatiana Lopaeva
0f2bb18bb4 Web: Editor: Deleted useless code. 2021-08-17 12:53:23 +03:00
Tatiana Lopaeva
c6ec0fbee6 Web: Editor: Refactoring. 2021-08-17 12:52:33 +03:00
Tatiana Lopaeva
e634b5c72f Web: Editor: Fixed converting file when open in new tab. 2021-08-16 13:17:49 +03:00
Tatiana Lopaeva
92f0126e5d Web: Editor: Added displaying tooltip with the message instead of info toastr. 2021-08-16 11:21:14 +03:00
AlexeySafronov
9715719994 Merge branch 'develop' into bugfix/canShare 2021-08-16 11:07:30 +03:00
AlexeySafronov
e60815b15d Web: Refactoring and API calls optimization 2021-08-13 20:32:50 +03:00
AlexeySafronov
e992b9f3e5 Web: Files: Re-written code to canShare and canEdit from Server's fileInfo 2021-08-13 19:26:37 +03:00
Tatiana Lopaeva
6e9ceea8c0 Web: Editor: Added link for insert image and mail merge. 2021-08-13 14:50:24 +03:00
Tatiana Lopaeva
922d25dcb4 WEb: Editor: Fixed sharing access (added canShare function), fixed rename function (added accessEdit function). 2021-08-12 17:38:17 +03:00
AlexeySafronov
b9d242df6f Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2021-08-12 16:19:23 +03:00
AlexeySafronov
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
Alexey Bannov
9aafaa21ea
Merge pull request #319 from ONLYOFFICE/feature/log 
Feature/log
 2021-08-12 15:00:53 +03:00
Tatiana Lopaeva
39b93080bd Web: Editor: Added config id for editor. 2021-08-12 14:41:57 +03:00
AlexeySafronov
4919b34fd0 Web: Webpack: increased performance maxEntrypointSize and maxAssetSize 2021-08-11 20:40:31 +03:00
AlexeySafronov
a26e475c94 Web: fix no license warning 2021-08-11 20:39:24 +03:00
Viktor Fomin
f642090c66 Web: Client: fixed 2021-08-11 10:44:00 +03:00
Viktor Fomin
3f56790c85 Fix bug 51365: update avatar in header 2021-08-11 10:18:10 +03:00
Tatiana Lopaeva
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
pavelbannov
0d10967912 Merge branch 'develop' into release/1.0.0 2021-08-10 18:48:36 +03:00
pavelbannov
643b7b66dc Optimization: removed autofac ILifetimeScope 2021-08-10 17:56:38 +03:00
TatianaLopaeva
75f659a9eb WEb:Editor: Fixed removing current open document from recents. 2021-08-10 12:54:10 +03:00
TatianaLopaeva
b92b29e510 Web: Editor: Added error handler for recent folders. 2021-08-10 12:49:51 +03:00
AlexeySafronov
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
AlexeySafronov
a0722a17d3 Editor: Optimized getting recent 2021-08-09 19:53:13 +03:00
Viktor Fomin
b04b8c7edb Fix bug 51828: about links 2021-08-09 16:39:03 +03:00
Viktor Fomin
634ea15ec2 Fix bug 51815: editor favicon 2021-08-09 16:15:17 +03:00
Viktor Fomin
dfa6e97c94 Fix bug 51437: no ability to share files available for viewing 2021-08-09 15:53:54 +03:00
pavelbannov
546c1872a3 Added asp logging 2021-08-08 16:19:54 +03:00
TatianaLopaeva
5ec78df6ee Fix Bug 51547 Client.Files. "When opened for viewing, the document is opened for editing" 2021-08-06 16:26:42 +03:00
AlexeySafronov
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
AlexeySafronov
5687e6bca2 Merge branch 'develop' into release/1.0.0 2021-08-05 19:11:02 +03:00
AlexeySafronov
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
Viktor Fomin
88b55606bc Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-05 14:38:03 +03:00
TatianaLopaeva
3beec799e7 Web: Editor: Added action link. 2021-08-05 14:05:09 +03:00
Viktor Fomin
514387652e Web: Client: fixed about 2021-08-05 12:30:14 +03:00
TatianaLopaeva
89b79b8523 Web: Files/Editor: Fixed styles. 2021-08-04 12:42:59 +03:00
Viktor Fomin
fbf0ee3bf0 Web: Client: added about dialog 2021-08-04 12:06:37 +03:00
Viktor Fomin
a9734f78e1 Web: Client: added about content 2021-08-04 12:06:16 +03:00
TatianaLopaeva
98032d281c Web: Editor: Added mail merge option. 2021-08-04 11:32:14 +03:00
Viktor Fomin
d2fbca0a27 Web: Client: rewrite about page 2021-08-03 16:01:56 +03:00
Viktor Fomin
fb922f04d6 Web: Client: change About translations 2021-08-03 16:01:31 +03:00
TatianaLopaeva
93f51a19e2 Web: Editor: Added possibility to save in folder where access is not denied. 2021-08-03 12:04:18 +03:00
TatianaLopaeva
e05aaf6042 Web:Editor: Added condition for footer 2021-08-03 10:09:08 +03:00
TatianaLopaeva
dddef0e03b Web: Editor: Add option "Insert Image" only if user is logged in. 2021-08-02 11:05:30 +03:00
TatianaLopaeva
ba37ea8be6 Web: Editor: SelectFolder: Added header, refactoring, fixed height (aside view). 2021-07-30 19:23:23 +03:00
TatianaLopaeva
a20956e5c7 Web: Editor: Fixed styles. 2021-07-30 17:54:30 +03:00
TatianaLopaeva
fdefba1514 Web: Editor/Files: SelectFile: Added editor folders tree for select file component. 2021-07-30 17:50:02 +03:00
TatianaLopaeva
b85b2dfa52 Web: Editor/Files: SelectFile: Refactoring, the component has been extended. 2021-07-30 16:26:26 +03:00
TatianaLopaeva
4a0c42e97d Web: Editor: Added translations. 2021-07-30 15:50:25 +03:00
TatianaLopaeva
52b1e2f741 Web: Editor: First selected folder from root is temporary commented out. 2021-07-30 15:24:59 +03:00
TatianaLopaeva
304df579ce Web: Editor: Refactoring. 2021-07-30 15:16:53 +03:00
TatianaLopaeva
24c1b73a45 Web: Editor: Add option "Save as" only if user is logged in. 2021-07-30 15:13:10 +03:00
TatianaLopaeva
a7e3fd60cb Web: Editor: Added selector folder. 2021-07-30 15:04:24 +03:00
TatianaLopaeva
4f593df4c4 WEb: Editor: The folder identifier of selected folder is temporary commented out. 2021-07-29 20:04:17 +03:00
TatianaLopaeva
9b7d74733a Web: Editor: Added folder id and refactoring. 2021-07-29 19:41:49 +03:00
TatianaLopaeva
a7ba985ea0 Web: Files/Editor: Added tree folder for editor. 2021-07-29 15:52:30 +03:00
TatianaLopaeva
dba5275eb2 Web: Editor/Files: Component expansion for modal view, refactoring. 2021-07-29 14:35:27 +03:00