Commit Graph

7872 Commits

Author SHA1 Message Date
Vladislav Makhov
7d6d7d2bc8 Revert "Fix filter search"
This reverts commit 783c81fdb4.
2020-10-14 17:23:24 +03:00
Vladislav Makhov
5fe6fd0497 Remove filter reset 2020-10-14 17:22:17 +03:00
Vladislav Makhov
9fa9560d8e Filter reset while select another node. 2020-10-14 14:11:22 +03:00
Vladislav Makhov
4531619362 Merge branch 'feature/files' into feature/files-favorites 2020-10-14 13:45:13 +03:00
Vladislav Makhov
783c81fdb4 Fix filter search 2020-10-14 13:17:44 +03:00
70ff8c62ae Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
2020-10-14 13:00:37 +03:00
d41b12cdc8 DbTenant: fix 2020-10-14 12:59:37 +03:00
34cb8329ae
Merge pull request #95 from ONLYOFFICE/feature/avatar-editor-redesign
Feature/avatar editor redesign
2020-10-13 21:18:50 +03:00
18aad95bf0
Merge pull request #97 from ONLYOFFICE/feature/remove-FileOperationsManagerHelper
remove-FileOperationsManagerHelper: first version
2020-10-13 18:06:59 +03:00
Alexey Kostenko
09d4229c8c web: components: bump version 2020-10-13 17:44:51 +03:00
Alexey Kostenko
9bdf52ce07 Web: Components: Fix warning 2020-10-13 17:44:42 +03:00
Alexey Kostenko
52b1c73edf web: components: bump version 2020-10-13 17:31:43 +03:00
Alexey Kostenko
87d2c42a6b Web: Component: Style fix 2020-10-13 17:31:36 +03:00
Alexey Kostenko
f16145ae62 Merge branch 'feature/files' into feature/avatar-editor-redesign 2020-10-13 17:00:18 +03:00
Alexey Kostenko
d99d4f5f99 web: components: bump version 2020-10-13 16:57:58 +03:00
Alexey Kostenko
e95be64ea6 Web: Components/People: Small refactoring 2020-10-13 16:57:44 +03:00
49f5a52433 Update yarn.lock files 2020-10-13 16:52:17 +03:00
8205c230c7 Web: Clients: Added displaying Loader.Filter for MainButton 2020-10-13 16:43:41 +03:00
2884bd8de3 web: common: bump version 2020-10-13 16:33:22 +03:00
2fa205cb6f Web: Clients: Fixed catching of initial API errors 2020-10-13 16:31:21 +03:00
Alexey Kostenko
8e5db50b9a Web: People: Show data loss warning on exit 2020-10-13 16:24:46 +03:00
746ecc7f40 Web: Clients: Fixed applying single cursor on loading 2020-10-13 16:20:49 +03:00
Alexey Kostenko
e5254e0a54 Web: People: Fixed saving empty image when creating user 2020-10-13 15:53:53 +03:00
3dd9f71dda Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-13 15:51:24 +03:00
5d76e7e6b0 Web: Redesigned displaying of loading processes 2020-10-13 15:51:14 +03:00
5c42b9d04e Merge branch 'master' into feature/remove-FileOperationsManagerHelper 2020-10-13 15:50:51 +03:00
668cb3e893 Merge branch 'master' into feature/files 2020-10-13 15:27:31 +03:00
788bddeb4f Studio: fix 2020-10-13 15:26:54 +03:00
Alexey Kostenko
1bf8b3e886 web: components: bump version 2020-10-13 14:52:55 +03:00
Alexey Kostenko
9a144cb8c4 Web: Components: Style fix 2020-10-13 14:52:45 +03:00
Vladislav Makhov
632f83927b Merge branch 'feature/files' into feature/files-favorites 2020-10-13 14:26:31 +03:00
ca8c5625e2
Merge pull request #96 from ONLYOFFICE/feature/fix_API_return
fix_API_return: first version
2020-10-13 14:06:48 +03:00
Alexey Kostenko
30032bdce9 Web: People: Removed "is loading" from save button when upload image 2020-10-13 14:06:36 +03:00
0ae5ec1b1b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-13 14:02:11 +03:00
b53e34a0f0 Web: Removed useless Link duplicates 2020-10-13 14:02:04 +03:00
Alexey Kostenko
31fee3c405 Web: People: Reset profile after editing or creating profile 2020-10-13 13:49:11 +03:00
Artem Tarasov
24a0fe17b4 web: common: bump version 2020-10-13 13:45:40 +03:00
Artem Tarasov
a4a959f972 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-13 13:43:16 +03:00
Artem Tarasov
2623c91e80 Web: Files: fixed render loader 2020-10-13 13:42:28 +03:00
9968873305 Merge branch 'master' into feature/fix_API_return
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2020-10-13 13:33:24 +03:00
01f00d49ae web: common: bump version 2020-10-13 13:32:46 +03:00
1d4b3785bb Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-10-13 13:31:24 +03:00
0712677297 Web: Common: fixed MediaViewer close, fixed share dropdown styles 2020-10-13 13:30:26 +03:00
Artem Tarasov
e2bb4a8405 Web: Files: TreeSettings: fixed render of settings before receiving a response from the server 2020-10-13 13:15:17 +03:00
a504251359
Merge pull request #99 from ONLYOFFICE/feature/fix-changing-language
Feature/fix changing language
2020-10-13 12:55:37 +03:00
02f39a9c71 Merge branch 'master' into feature/files
# Conflicts:
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	web/ASC.Web.Core/Files/FileUtility.cs
2020-10-13 12:52:28 +03:00
Artem Tarasov
33d0322fb4 Web: Files: TreeSettings: refactoring 2020-10-13 12:50:39 +03:00
TatianaLopaeva
579d543292 Merge branch 'feature/files' into feature/fix-changing-language 2020-10-13 12:38:46 +03:00
TatianaLopaeva
4ef2db2ed0 Web: Update yarn.lock 2020-10-13 12:37:34 +03:00
TatianaLopaeva
dbdc134ef0 web: common: bump version 2020-10-13 12:18:48 +03:00