|
|
19252882ed
|
Web: Files: delete useless
|
2021-10-29 16:29:18 +03:00 |
|
|
|
34e163aac4
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/tooltip
|
2021-10-29 13:20:28 +03:00 |
|
|
|
de2be37d24
|
Web: Files: fix max width tooltip
|
2021-10-28 15:07:13 +03:00 |
|
|
|
0215599566
|
merge from develop
|
2021-10-27 19:37:12 +03:00 |
|
|
|
cb8bc701ec
|
fix migrations
|
2021-10-26 16:14:40 +03:00 |
|
|
|
b1134d239c
|
Merge branch 'develop' into feature/auto-migrations
# Conflicts:
# common/ASC.Core.Common/EF/Context/UserDbContext.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/MySqlAccountLinkContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/MySqlDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/MySqlFeedDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/MySqlMailDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20210803212546_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/MySqlMessagesContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/MySqlNotifyDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/MySqlResourceDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/MySqlTelegramDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/MySqlTenantDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210309095256_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210803213502_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/MySqlWebstudioDbContextModelSnapshot.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.Designer.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.Designer.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.Designer.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
|
2021-10-25 20:52:13 +03:00 |
|
|
|
b3747a92a4
|
Merge branch 'develop' into feature/wizard/migration
|
2021-10-25 14:54:05 +03:00 |
|
|
|
403388fbf1
|
Added solution filter
Removed unused services
replaced sh with bat
start service from source
|
2021-10-25 14:29:36 +03:00 |
|
|
|
ff4e73a54d
|
Files: update migrations
|
2021-10-22 20:11:03 +03:00 |
|
|
|
3ae83ff00c
|
Web: Files: fixed TableRow background styles
|
2021-10-22 16:12:25 +03:00 |
|
|
|
1e15174d23
|
Web: Files: fixed styles after merge
|
2021-10-22 15:01:43 +03:00 |
|
|
|
5bd9c06c1a
|
Merge branch 'develop' into table-group-menu
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-10-22 12:20:20 +03:00 |
|
|
|
dd8f77f827
|
Merge branch 'develop' into feature/wizard/migration
|
2021-10-22 11:44:21 +03:00 |
|
|
|
94a466ed48
|
Merge branch 'release/1.0.0' into develop
# Conflicts:
# packages/asc-web-components/aside/aside.js
|
2021-10-22 09:02:39 +03:00 |
|
|
|
effe9ce9fa
|
Web: Files: fixed drag
|
2021-10-21 19:20:04 +03:00 |
|
|
|
576c62e337
|
Merge pull request #400 from ONLYOFFICE/bugfix/tile-view
Bugfix/tile view
|
2021-10-21 19:16:16 +03:00 |
|
|
|
81019049d7
|
Merge branch 'develop' into feature/personal-share-dialog
|
2021-10-21 19:14:59 +03:00 |
|
Artem Tarasov
|
9bc6cc3c51
|
Web: Files: TilesView: fixed position of checkbox
|
2021-10-21 18:24:07 +03:00 |
|
|
|
556059437d
|
Web: Files: Fixed hiding context-menu before displaying share panel
|
2021-10-21 17:53:28 +03:00 |
|
|
|
d6da7a7fb2
|
Merge pull request #411 from ONLYOFFICE/bugfix/scrollbar
Bugfix/scrollbar
|
2021-10-21 16:15:24 +03:00 |
|
|
|
c2d0ff17d0
|
Merge branch 'develop' into table-group-menu
|
2021-10-21 15:34:57 +03:00 |
|
Artem Tarasov
|
d1baceb64f
|
Web: Files: TilesView: fixed position checkbox on mobile
|
2021-10-21 15:23:40 +03:00 |
|
|
|
94bd11930c
|
Merge pull request #406 from ONLYOFFICE/feature/avatar-edit-action
Feature/avatar edit action
|
2021-10-21 15:15:43 +03:00 |
|
Artem Tarasov
|
27eff81dbc
|
Merge branch 'release/1.0.0' into bugfix/tile-view
|
2021-10-21 15:14:58 +03:00 |
|
Artem Tarasov
|
489506a42f
|
Web: Files: TilesView: fixed styles
|
2021-10-21 15:13:28 +03:00 |
|
|
|
25b59177d8
|
Web: Files: disable aside scroll in Upload Panel
|
2021-10-21 15:05:13 +03:00 |
|
|
|
e88a5b6af4
|
Web: Files: Disabled the restore and download buttons while the comment is saved.
|
2021-10-21 14:13:39 +03:00 |
|
|
|
bc48169e75
|
Web: Files: Deleted useless file.
|
2021-10-21 14:03:36 +03:00 |
|
|
|
081ab8ff3e
|
Web: Files: Deleted useless code.
|
2021-10-21 13:56:36 +03:00 |
|
|
|
3a2111bfe4
|
Web: Files: Disabled save and cancel buttons when is saving comment.
|
2021-10-21 13:56:02 +03:00 |
|
|
|
c61e42e771
|
Web: Fixed styles.
|
2021-10-21 13:47:14 +03:00 |
|
|
|
ac0e803072
|
Web: Files: Remove color flicker loader on instant restoration of history.
|
2021-10-21 13:11:09 +03:00 |
|
|
|
0844c3491b
|
Merge branch 'develop' into table-group-menu
|
2021-10-21 12:34:28 +03:00 |
|
|
|
cc9857c904
|
Web: Deleted useless code.
|
2021-10-21 12:29:25 +03:00 |
|
|
|
e13f3869f8
|
Web: Fixed after merge.
|
2021-10-21 12:24:24 +03:00 |
|
|
|
30f8385466
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/scrollbar
|
2021-10-21 12:24:16 +03:00 |
|
|
|
44f5f05ae6
|
Web: Refactoring.
|
2021-10-21 12:21:10 +03:00 |
|
|
|
152207d85a
|
Merge branch 'develop' into bugfix/version-history-list
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
# products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
|
2021-10-21 12:02:57 +03:00 |
|
Artem Tarasov
|
96d92d9b6a
|
Merge pull request #407 from ONLYOFFICE/feature/create-files-without-submit
Web: Files: added file creation after focus loss
|
2021-10-21 11:40:15 +03:00 |
|
|
|
85c96024cd
|
Web: Files: fixed convert files upload
|
2021-10-21 11:30:40 +03:00 |
|
|
|
0990af91a9
|
Web: Deleted useless code.
|
2021-10-21 11:07:22 +03:00 |
|
|
|
087c7af06c
|
Web: Files: Removed the jump to the beginning of the list when the recovery process is over.
|
2021-10-21 10:55:11 +03:00 |
|
Artem Tarasov
|
623f451696
|
Web: Files: VersionHistory: fixed width of VersionHistoryPanel
|
2021-10-21 10:10:49 +03:00 |
|
|
|
aadf41f44d
|
Web: Files: fix scrollbar in upload panel
|
2021-10-20 18:44:14 +03:00 |
|
|
|
18be8a7cff
|
Web: Files: Added opportunity to open SharingPanel in module mode on personal desktop and tablet
|
2021-10-20 17:48:07 +03:00 |
|
Artem Tarasov
|
04778445dc
|
Merge branch 'bugfix/tile-view' of github.com:ONLYOFFICE/AppServer into bugfix/tile-view
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
|
2021-10-20 16:56:50 +03:00 |
|
Artem Tarasov
|
17a31e8513
|
Web: Files: TableView: fixed position of image in row
|
2021-10-20 16:51:47 +03:00 |
|
|
|
7fffe69143
|
Web: Files: Refactoring.
|
2021-10-20 16:21:20 +03:00 |
|
Artem Tarasov
|
23b30f5d8d
|
Web: Common: PageLayout: table style fix
|
2021-10-20 15:52:02 +03:00 |
|
|
|
b00836cc46
|
Web: Files: Fixed showing not version badge after scrolling.
|
2021-10-20 15:36:14 +03:00 |
|
