Commit Graph

1942 Commits

Author SHA1 Message Date
010875e7ef Web: Files: removed fetchFiles from filter 2020-08-10 11:42:15 +03:00
65ef03615e Web: Files: fixed update tree after files operations 2020-08-07 17:36:54 +03:00
4abfc3385e Web: Files: fixed update tree folders 2020-08-07 17:21:51 +03:00
7d69c3e7e4 Web: Files: added new update logic for badge 2020-08-07 16:54:26 +03:00
e34be36031 Web: Files: fixed focus in the sharing panel 2020-08-07 16:52:43 +03:00
9ceee0dfc6 Web: Files: fixed items select 2020-08-06 16:47:28 +03:00
53ab16529d Web: Files: fixed close group-button-menu 2020-08-06 16:09:20 +03:00
6c69ece258 Web: Files: added close events by keys, fixed focus in aside 2020-08-05 15:17:21 +03:00
f8b791fa54 Merge branch 'master' into feature/files 2020-08-04 10:33:33 +03:00
a9e8c89240 Files: fix add tag 2020-08-04 10:30:09 +03:00
7055672075 Web: Files: fixed document edit 2020-08-04 09:44:22 +03:00
483906fed8 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
2020-08-03 18:29:41 +03:00
1701db1a91 Files: fix CompleteVersion 2020-08-03 18:28:34 +03:00
34c2252b25 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Server/Controllers/FilesController.cs
2020-08-02 22:31:52 +03:00
6253b151e1 fix ChangeHistory, UpdateFile, added UpdateComment 2020-08-02 21:48:58 +03:00
e4501f3cd6 Web: Files: added edit comment panel to VersionHistory 2020-07-31 17:24:57 +03:00
Ilya Oleshko
fa8a0b92d8 Merge branch 'master' into feature/files 2020-07-31 15:05:58 +03:00
8ce8aed45d Web: Files: fixed items select 2020-07-31 12:14:44 +03:00
018298e921 Web: Files: fixed row warning 2020-07-31 11:31:11 +03:00
72bc996a1a Web: Files: added file operations to contextMenu, refactoring 2020-07-31 11:14:37 +03:00
547852e678 Web: Files: added new translations 2020-07-31 11:10:16 +03:00
e85c125900 Web: Files: refactoring VersionHistory page, fixed page crash when following a direct url 2020-07-30 10:52:19 +03:00
7fb40014dd Web: Files: fixed VersionHitory header styles 2020-07-30 10:45:59 +03:00
18b2935c12 fix merge 2020-07-29 14:52:37 +03:00
0231e60cc7 Merge branch 'master' into feature/files
# Conflicts:
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/src/components/icons/svg/index.js
#	web/ASC.Web.Components/src/index.js
2020-07-28 17:34:46 +03:00
585d98f8f4 Files: core. replace 2020-07-28 15:45:14 +03:00
eabb06f8a8 Web: Files: hid the progress settings in the progress bar 2020-07-24 13:48:24 +03:00
be81ca291d Update yarn.lock files + bump versions 2020-07-17 18:03:08 +03:00
d094546147 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/yarn.lock
2020-07-17 17:48:50 +03:00
ec20c66c5d Update yarn.lock files 2020-07-17 17:43:39 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
fafe83cebd Merge branch 'master' into feature/files 2020-07-16 16:53:56 +03:00
679e77a3ea Update yarn.lock files 2020-07-16 16:09:09 +03:00
4681fb0f78 fix 2020-07-16 16:02:21 +03:00
098e872a38 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
2020-07-16 15:58:43 +03:00
ec8c6a5ddb Fixed security vulnerability in lodash 2020-07-16 15:54:04 +03:00
78b10ab893 Update yarn.lock files 2020-07-16 14:55:40 +03:00
8d0d5fd908 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
#	web/ASC.Web.Components/package.json
2020-07-16 14:41:32 +03:00
ff41b28a64 DI: files fix 2020-07-16 12:08:20 +03:00
Alexey
b4304d8526 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-16 11:33:17 +03:00
a505175b58 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-16 11:00:18 +03:00
595362b2b3 Web: Files: moved files uploader to separate file, moved convert dialog to redux, added routing to MainButton actions 2020-07-16 11:00:09 +03:00
060a173691 Web: Files: fixed Delete progress 2020-07-16 10:04:25 +03:00
576e8a6de0 Files: revert 2020-07-16 00:49:25 +03:00
ddf5aa6f19 Files: additional logging 2020-07-15 23:18:35 +03:00
Alexey
965b2e97d3 Web: Common: Tile view temporarily hidden 2020-07-15 19:05:40 +03:00
531b66875f Files: fix 2020-07-15 18:27:46 +03:00
SuhorukovAnton
6da23f477b ASC.Files.Core: refactoring 2020-07-15 18:07:34 +03:00
9ee887d270 DocumentService log error 2020-07-15 18:06:35 +03:00
414e17ac1f DocumentService log error 2020-07-15 17:40:58 +03:00
SuhorukovAnton
83a88d0240 Merge branch 'master' into feature/ASC.Files.Core 2020-07-15 17:38:40 +03:00
Alexey
356a18acc6 Web:Files: Added translation to tile view 2020-07-15 17:04:29 +03:00
a54be3b64c Merge branch 'master' into feature/files 2020-07-15 16:57:14 +03:00
e10ac2ccfa BaseStartup: refactoring 2020-07-15 15:33:44 +03:00
baa71247d8 Merge branch 'master' into feature/general-startup 2020-07-15 13:06:32 +03:00
Alexey
4bf9133851 Web: Files: Tile: fix styles and small refactoring 2020-07-15 11:31:23 +03:00
Alexey
b573555024 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-15 08:00:04 +03:00
Alexey
e886437d83 Web: Files: Fix tile styles 2020-07-15 07:30:59 +03:00
SuhorukovAnton
5bf0bd22b6 ASC.Files.Core: first version 2020-07-14 13:03:53 +03:00
bb507b5aeb Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-14 10:16:21 +03:00
bc671b4332 Web: Files: fixed pathParts error 2020-07-14 10:14:53 +03:00
88e932a0a7 Merge branch 'master' into feature/files 2020-07-13 16:46:42 +03:00
a347f4e4f3 fix 2020-07-13 16:18:31 +03:00
Alexey
e5b71cff4f Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
2020-07-13 16:00:32 +03:00
a822f9b349 Files: fix 2020-07-13 15:57:39 +03:00
dfd8bbfdb8 Merge branch 'master' into feature/api-defaultvalue 2020-07-13 15:28:11 +03:00
a0fddf446d Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-13 13:17:09 +03:00
d109aab32b Web: Files: moved progress to redux 2020-07-13 13:17:00 +03:00
Alexey
3ca42459a1 Web: Files: Separated the logic of the Filter and ViewSelector 2020-07-13 12:10:40 +03:00
b7d79e9a2f Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-12 20:48:30 +03:00
4efe98ff9e Revert "Fix Re-rendered because of props changes: props.onClick"
This reverts commit 7c8f84ab8b.
2020-07-12 20:48:15 +03:00
Alexey
e3294771ce Web: Files: Home: Fixed selection of elements on Tile view 2020-07-12 12:49:25 +03:00
Alexey
031788ba50 Web: Files: Home: Fixed init styled TileContent outside render 2020-07-12 11:52:56 +03:00
Alexey
5b027aa170 Web: Files: Home: Removed the header if there are no files or folders. Refactoring 2020-07-12 11:37:25 +03:00
064160a1ea Files: onedrive 2020-07-10 18:37:02 +03:00
Alexey
5423d392f8 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-10 16:01:48 +03:00
Ilya Oleshko
63bf62d331 Web: Files: Home: Fixed check event for onEditComplete action 2020-07-10 16:00:09 +03:00
Alexey
b99d3c5e7d Web: Files: Tile: Mobile style fix 2020-07-10 15:41:06 +03:00
45678da8e5 Merge branch 'master' into feature/files 2020-07-10 14:58:37 +03:00
56df9a98ef Files: resources 2020-07-10 14:57:42 +03:00
6f316242cb Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-10 14:38:44 +03:00
Ilya Oleshko
2ff6c73876 Web: Files: Home: Fixed context menu actions for edit 2020-07-10 14:40:47 +03:00
d8597a8602 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-10 14:15:40 +03:00
7c8f84ab8b Fix Re-rendered because of props changes: props.onClick 2020-07-10 14:15:30 +03:00
Alexey
dbc98c1a84 Web: Files: Home: Fixed onEditComplete function bind for tile 2020-07-10 14:05:46 +03:00
SuhorukovAnton
2925ff25b4 api-defaultvalue: add System.Text.Json 2020-07-10 13:35:24 +03:00
Ilya Oleshko
e55e2414b9 Web: Files: Home: Fixed onEditComplete function bind for row 2020-07-10 13:14:09 +03:00
e48c202528 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-10 11:42:14 +03:00
9cbef5763f Web: Files: Added why-did-you-render package (https://github.com/welldone-software/why-did-you-render) 2020-07-10 11:42:06 +03:00
Ilya Oleshko
950eaf2d43 Web: Files: Home: Fixed init styled RowContent outside render 2020-07-10 11:39:55 +03:00
Alexey
c6fa5aecef Web: Files: fixed tile styles 2020-07-10 10:35:36 +03:00
Alexey
132242b06a Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-10 08:54:01 +03:00
d0f66c66e7 Web: Files: Implemented CompleteVersion 2020-07-09 22:26:43 +03:00
c9040bd1e3 Files: fix CompleteVersion 2020-07-09 22:26:00 +03:00
SuhorukovAnton
f8e42cbd08 api-defaultvalue: add JsonPropertyNames 2020-07-09 22:06:08 +03:00
SuhorukovAnton
28e70e91f6 api-defaultvalue: add JsonPropertyNames 2020-07-09 18:37:36 +03:00
e48c6077a2 Web: Files: Replace bind to data-api usage 2020-07-09 18:03:44 +03:00
3db51c32e1 Web: Files: Replace bind to data-api usage 2020-07-09 16:28:01 +03:00
ddfe9f05bf Web: Files: Replace bind to data-api usage 2020-07-09 16:20:56 +03:00
8a4d7a4da2 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-09 15:59:02 +03:00