IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,575 Commits 40 Branches 22 Tags 420 MiB
c0f37568fc
Commit Graph

5548 Commits

Author SHA1 Message Date
AlexeySafronov
a26e475c94 Web: fix no license warning 2021-08-11 20:39:24 +03:00
AlexeySafronov
85d77ed4e6 Web: Files: fix mobx warning 2021-08-11 19:53:44 +03:00
AlexeySafronov
9074195906 Web: Files: fix promise chain 2021-08-11 19:50:53 +03:00
AlexeySafronov
55b14255c5 Web: Fix [mobx] Out of bounds read: 1 2021-08-11 19:36:15 +03:00
Dmitry Sychugov
5e45c75a9d Web: Files: added loading to unlock file 2021-08-11 17:52:57 +05:00
AlexeySafronov
73752acab9 Merge branch 'develop' into bugfix/canShare 
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
 2021-08-11 15:19:41 +03:00
Dmitry Sychugov
3fab96db22 Merge branch 'release/1.0.0' into bugfix/fix-button-remove-from-favorites 2021-08-11 17:12:50 +05:00
Dmitry Sychugov
6243590778 Web: Files: Fixed 51810 and 51853, fix check for isFavorite, group selector: changed the delete button to remove from favorites 2021-08-11 17:11:04 +05:00
AlexeySafronov
3ce5c1eb2d Web: Files: Fix canShare 2021-08-11 14:58:52 +03:00
Tatiana Lopaeva
1d849f210f Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-11 11:03:22 +03:00
Tatiana Lopaeva
cfbee379cd Fix Bug 51497 Client.Download.Before downloading, redirect to a new tab 2021-08-11 11:03:02 +03:00
Viktor Fomin
3f56790c85 Fix bug 51365: update avatar in header 2021-08-11 10:18:10 +03:00
Viktor Fomin
0a36c1c98b Fix bug 51757: apps block style 2021-08-11 09:10:18 +03:00
pavelbannov
0d10967912 Merge branch 'develop' into release/1.0.0 2021-08-10 18:48:36 +03:00
pavelbannov
13ef66c542 Files: optimization 2021-08-10 17:55:53 +03:00
pavelbannov
78b98ea80b Thumbnail: optimization 2021-08-10 17:54:56 +03:00
Viktor Fomin
d84918b6e5 Fix bug 51861: esc closed MediaViewer 2021-08-10 16:49:17 +03:00
Dmitry Sychugov
8f12b3b76a Merge branch 'release/1.0.0' into bugfix/remove-extra-group-selector-buttons 2021-08-10 16:12:05 +05:00
Dmitry Sychugov
f997fa4ec2 Web: Files: Fixed 51857 and 51851, added conditions on group selector for categories recent and favorites 2021-08-10 16:10:39 +05:00
Viktor Fomin
ab457722b6 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-10 14:00:48 +03:00
Viktor Fomin
15b46ca366 Fix bug 51706: missing icons 2021-08-10 13:19:44 +03:00
Alexey Safronov
44b2446282
Merge pull request #320 from ONLYOFFICE/bugfix/extra-items-in-the-recent-category 
Bugfix/extra items in the recent category
 2021-08-10 11:18:11 +03:00
pavelbannov
af18e175dc Merge branch 'develop' into release/1.0.0 2021-08-10 11:13:17 +03:00
AlexeySafronov
d6c7a66dd3 Fix double path /products/files/ 2021-08-10 10:58:30 +03:00
Viktor Fomin
e005a29a69 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-09 15:54:28 +03:00
Viktor Fomin
dfa6e97c94 Fix bug 51437: no ability to share files available for viewing 2021-08-09 15:53:54 +03:00
Dmitry Sychugov
d7446c7c12 Merge branch 'release/1.0.0' into bugfix/extra-items-in-the-recent-category 2021-08-09 17:28:51 +05:00
Dmitry Sychugov
35efbc002e Web: Files: Fixed 51813, added condition for filter options for category recent 2021-08-09 17:27:29 +05:00
AlexeySafronov
b44bd94805 Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0 2021-08-09 15:04:23 +03:00
AlexeySafronov
d770fe58fe Fix bug 51698: .svg files not open in MediaViewer 2021-08-09 15:04:13 +03:00
Viktor Fomin
3087dfdb7c Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-09 14:39:43 +03:00
Viktor Fomin
847400c953 Web: Files: added key action on delete dialog 2021-08-09 14:39:33 +03:00
pavelbannov
546c1872a3 Added asp logging 2021-08-08 16:19:54 +03:00
Alexey Bannov
83d0602b65 fixed warnings in calendar 2021-08-06 18:44:47 +03:00
pavelbannov
90bb8a139a UserManager: fix for personal 2021-08-06 17:30:51 +03:00
Dmitry Sychugov
360e7392d0 Merge branch 'release/1.0.0' into bugfix/remove-access-btn 2021-08-06 18:30:58 +05: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
TatianaLopaeva
45ebe5edea Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-06 14:11:20 +03:00
TatianaLopaeva
45b3b462de WEb: Editor: Deleted redirect to a new tab before downloading. 2021-08-06 14:10:55 +03:00
Viktor Fomin
4d696cd7ec Web: Files: added restore version progress bar 2021-08-06 13:20:55 +03:00
Viktor Fomin
cf66b2041a Web: Files: fixed sharing 2021-08-06 12:13:45 +03:00
Viktor Fomin
40c1ede888 Web: Files: fixed file preview 2021-08-06 11:52:42 +03:00
Dmitry Sychugov
70a91995e3 Merge branch 'release/1.0.0' into bugfix/remove-access-btn 2021-08-06 13:45:41 +05:00
Dmitry Sychugov
7e57f0a1a8 Web: Files: Fixed 51747, added conditions to last and favorites categories for group selector 2021-08-06 13:43:49 +05:00
Viktor Fomin
a2c1a30d18 Web: Files: added missing icons 2021-08-06 11:14:04 +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
TatianaLopaeva
5b4597d004 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-05 18:35:30 +03:00
TatianaLopaeva
8a5f333070 WEb: Editor: Removed the edit context menu item for view-only formats. 2021-08-05 18:35:17 +03:00
Dmitry Sychugov
d38749f584 Merge branch 'release/1.0.0' into bugfix/filterlist-extra-items 2021-08-05 19:37:53 +05:00
Ilya Oleshko
1dcce83c5a
Merge pull request #317 from ONLYOFFICE/bugfix/sorting-type-not-displayed 
Bugfix/sorting type not displayed
 2021-08-05 17:31:47 +03:00
TatianaLopaeva
10d5b0e403 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-08-05 17:30:17 +03:00
TatianaLopaeva
4ed125bd19 Web: Editor: Fixed preview and edit options for not supported formats. 2021-08-05 17:30:07 +03:00
Dmitry Sychugov
fffeb8ae92 Merge branch 'release/1.0.0' into bugfix/sorting-type-not-displayed 2021-08-05 18:52:51 +05:00
Dmitry Sychugov
2cb1f466e9 Web: Files: Fixed bug 51551, fixed search input base type 2021-08-05 18:50:55 +05:00
Viktor Fomin
45e3e01b62 Web: Files: fixed favorite icon 2021-08-05 16:28:21 +03:00
Viktor Fomin
05574085b8 Web: Files: fixed download app block 2021-08-05 16:05:50 +03:00
pavelbannov
7b36d262d3 fix Bug 50652 2021-08-04 12:38:20 +03:00
Dmitry Sychugov
390430c3ee Merge branch 'release/1.0.0' into bugfix/filterlist-extra-items 2021-08-04 14:33:06 +05:00
Dmitry Sychugov
684f295042 Web: Files: Fixed bug 51471, fixing extra filtering items for the favorites and recent 2021-08-04 14:31:24 +05:00
pavelbannov
72ad5c6e91 fix Bug 51451 2021-08-03 23:07:03 +03:00
pavelbannov
67106638e1 fixed download as archive 2021-08-03 22:03:20 +03:00
Dmitry Sychugov
d25ddb032c Merge branch 'release/1.0.0' into bugfix/files-unblock 2021-08-03 17:26:05 +05:00
Dmitry Sychugov
6aee1ae65b Web: Files: Fixed bug 51635, fix onLock condition 2021-08-03 16:55:22 +05:00
Viktor Fomin
7dfecd51d6 Web: Files: fixed show edit icon 2021-08-03 13:49:29 +03:00
Viktor Fomin
578ab81947 Web: People: fixed error with change avatar 2021-08-02 14:41:19 +03:00
Viktor Fomin
1eb0e87950 Web: Files: fixed delete folder message on personal 2021-07-30 11:50:36 +03:00
Viktor Fomin
b6258b4ff1 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0 
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withLoader.js
 2021-07-28 20:15:09 +03:00
Viktor Fomin
c4163231a2 Web: Files: moved links in constant 2021-07-28 14:20:15 +03:00
Viktor Fomin
18fb288ad3 Web: Files: fixed loader hoc 2021-07-28 14:13:22 +03:00
Alexey Safronov
5c5235cf3a
Merge branch 'develop' into feature/editor-extention 2021-07-28 13:43:49 +03:00
TatianaLopaeva
f99090ec9b Web: Files: Remove Comments. 2021-07-28 12:33:09 +03:00
Alexey Safronov
cf7d002bc1
Merge branch 'develop' into feature/calendar 2021-07-28 12:16:39 +03:00
TatianaLopaeva
48d94b4a2d Merge branch 'develop' into feature/editor-extention 2021-07-28 11:53:36 +03:00
TatianaLopaeva
3be8ab673c Web: Editor: Fixed not displaying data of Sharing Panel. 2021-07-28 11:15:55 +03:00
Alexey Bannov
1035ac6244 crm: set listitem id for dto object 2021-07-27 19:05:25 +03:00
NikolayRechkin
6fbdaf0d31 Calendar: post-merge fixes 2021-07-27 16:09:30 +03:00
TatianaLopaeva
eddb323ff6 Web: Editor/Files: Added create new file option. 2021-07-27 15:47:08 +03:00
Viktor Fomin
050ce4ce8d Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-07-27 14:00:39 +03:00
Viktor Fomin
ee35713b89 Web: Files: added download app list 2021-07-27 13:59:59 +03:00
Viktor Fomin
43c079e15e Web: Files: added translations 2021-07-27 13:58:23 +03:00
NikolayRechkin
f1668a3b43 Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar 2021-07-27 12:43:01 +03:00
AlexeySafronov
e2d3f3195d Merge branch 'develop' into release/1.0.0 2021-07-26 15:40:05 +03:00
TatianaLopaeva
fcd46cfe3c Web: Files: Deleted preview and edit options for not supported formats. 2021-07-26 14:19:30 +03:00
AlexeySafronov
538d65c724 Web: Remove query hash from remoteEntry.js 2021-07-26 14:02:10 +03:00
TatianaLopaeva
be2322a1ca Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-07-26 12:58:51 +03:00
Viktor Fomin
30b41aac42 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-07-26 12:37:01 +03:00
TatianaLopaeva
a57f018def Web: Files: Added icon for fb2 format. 2021-07-26 11:59:08 +03:00
AlexeySafronov
0f27a6c673 Merge branch 'develop' into release/1.0.0 2021-07-23 17:34:43 +03:00
AlexeySafronov
675fb8de21 Web: Fix caching remoteEntry.js 2021-07-23 17:20:42 +03:00
pavelbannov
573862f0b7 FactoryIndexer: fix async 2021-07-22 15:43:43 +03:00
AlexeySafronov
fa500d094f Merge branch 'develop' into release/1.0.0 2021-07-22 11:12:37 +03:00
Viktor Fomin
e703927239 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-07-21 18:30:33 +03:00
AlexeySafronov
13f8f5ef7d Fix sw.js creation 2021-07-21 18:28:56 +03:00
Viktor Fomin
f7ce0e210b Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 
# Conflicts:
#	packages/asc-web-common/utils/sw-helper.js
 2021-07-21 07:20:51 +03:00
AlexeySafronov
653066af0c Merge branch 'develop' into release/1.0.0 
# Conflicts:
#	config/nginx/onlyoffice.conf
 2021-07-20 18:21:00 +03:00
Viktor Fomin
829edbbda5 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-07-20 13:22:44 +03:00
AlexeySafronov
eab97bbfed Web: init new single sw.js creation 2021-07-20 12:32:27 +03:00
pavelbannov
6585acce04 Calendar: fixed download ical 2021-07-18 19:59:26 +03:00