Commit Graph

3437 Commits

Author SHA1 Message Date
70a91995e3 Merge branch 'release/1.0.0' into bugfix/remove-access-btn 2021-08-06 13:45:41 +05:00
7e57f0a1a8 Web: Files: Fixed 51747, added conditions to last and favorites categories for group selector 2021-08-06 13:43:49 +05:00
a2c1a30d18 Web: Files: added missing icons 2021-08-06 11:14:04 +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
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
8a5f333070 WEb: Editor: Removed the edit context menu item for view-only formats. 2021-08-05 18:35:17 +03:00
d38749f584 Merge branch 'release/1.0.0' into bugfix/filterlist-extra-items 2021-08-05 19:37:53 +05:00
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
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
4ed125bd19 Web: Editor: Fixed preview and edit options for not supported formats. 2021-08-05 17:30:07 +03:00
fffeb8ae92 Merge branch 'release/1.0.0' into bugfix/sorting-type-not-displayed 2021-08-05 18:52:51 +05:00
2cb1f466e9 Web: Files: Fixed bug 51551, fixed search input base type 2021-08-05 18:50:55 +05:00
45e3e01b62 Web: Files: fixed favorite icon 2021-08-05 16:28:21 +03:00
05574085b8 Web: Files: fixed download app block 2021-08-05 16:05:50 +03:00
7b36d262d3 fix Bug 50652 2021-08-04 12:38:20 +03:00
390430c3ee Merge branch 'release/1.0.0' into bugfix/filterlist-extra-items 2021-08-04 14:33:06 +05:00
684f295042 Web: Files: Fixed bug 51471, fixing extra filtering items for the favorites and recent 2021-08-04 14:31:24 +05:00
72ad5c6e91 fix Bug 51451 2021-08-03 23:07:03 +03:00
67106638e1 fixed download as archive 2021-08-03 22:03:20 +03:00
d25ddb032c Merge branch 'release/1.0.0' into bugfix/files-unblock 2021-08-03 17:26:05 +05:00
6aee1ae65b Web: Files: Fixed bug 51635, fix onLock condition 2021-08-03 16:55:22 +05:00
7dfecd51d6 Web: Files: fixed show edit icon 2021-08-03 13:49:29 +03:00
1eb0e87950 Web: Files: fixed delete folder message on personal 2021-07-30 11:50:36 +03:00
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
c4163231a2 Web: Files: moved links in constant 2021-07-28 14:20:15 +03:00
18fb288ad3 Web: Files: fixed loader hoc 2021-07-28 14:13:22 +03:00
f99090ec9b Web: Files: Remove Comments. 2021-07-28 12:33:09 +03:00
48d94b4a2d Merge branch 'develop' into feature/editor-extention 2021-07-28 11:53:36 +03:00
3be8ab673c Web: Editor: Fixed not displaying data of Sharing Panel. 2021-07-28 11:15:55 +03:00
eddb323ff6 Web: Editor/Files: Added create new file option. 2021-07-27 15:47:08 +03:00
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
ee35713b89 Web: Files: added download app list 2021-07-27 13:59:59 +03:00
43c079e15e Web: Files: added translations 2021-07-27 13:58:23 +03:00
e2d3f3195d Merge branch 'develop' into release/1.0.0 2021-07-26 15:40:05 +03:00
fcd46cfe3c Web: Files: Deleted preview and edit options for not supported formats. 2021-07-26 14:19:30 +03:00
538d65c724 Web: Remove query hash from remoteEntry.js 2021-07-26 14:02:10 +03:00
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
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
a57f018def Web: Files: Added icon for fb2 format. 2021-07-26 11:59:08 +03:00
0f27a6c673 Merge branch 'develop' into release/1.0.0 2021-07-23 17:34:43 +03:00
675fb8de21 Web: Fix caching remoteEntry.js 2021-07-23 17:20:42 +03:00
573862f0b7 FactoryIndexer: fix async 2021-07-22 15:43:43 +03:00
fa500d094f Merge branch 'develop' into release/1.0.0 2021-07-22 11:12:37 +03:00
e703927239 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-07-21 18:30:33 +03:00
13f8f5ef7d Fix sw.js creation 2021-07-21 18:28:56 +03:00
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
653066af0c Merge branch 'develop' into release/1.0.0
# Conflicts:
#	config/nginx/onlyoffice.conf
2021-07-20 18:21:00 +03:00
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