Commit Graph

22933 Commits

Author SHA1 Message Date
ee761e6811 Web: add icons 2022-07-11 23:10:20 +03:00
7b42f63d28 Web: Components: ContextMenuButton: fix warning 2022-07-11 22:53:12 +03:00
b2b55bfa5b fixed subfolders method 2022-07-11 22:22:56 +03:00
mushka
83cb430911 small tweaks on DebugInfo 2022-07-11 22:15:53 +03:00
mushka
96a2d4530e fixed DebugInfo styles 2022-07-11 22:11:55 +03:00
mushka
75a3a741c6 fixed SelectFile and SelectFolder styles 2022-07-11 21:20:52 +03:00
mushka
7d22e52c70 fixed mobile keyboard interaction with dialogs 2022-07-11 20:43:25 +03:00
mushka
35bde337bc fixed dialogs for create and rename global actions 2022-07-11 19:31:59 +03:00
Vashchuk Nikita
5cfb69ae48 recreated all migrations 2022-07-11 18:33:57 +03:00
Vashchuk Nikita
bc0ad53e8f changed int type to tinyint(1) for bool 2022-07-11 18:31:00 +03:00
mushka
9d13e3a4c4 Merge branch 'develop' into feature/modal-redesign 2022-07-11 17:39:20 +03:00
mushka
ada4ab71b8 fixed backdrop height on mobile browsers 2022-07-11 17:37:28 +03:00
Artem Tarasov
a77f413e9a Web: Doceditor: modified webpack config 2022-07-11 17:33:22 +03:00
Artem Tarasov
68b375faf3 Web: Doceditor: updated webpack version, updated yarn.lock 2022-07-11 17:32:22 +03:00
477f386047
Merge pull request #698 from ONLYOFFICE/feature/create-from-modal
Feature/create from modal
2022-07-11 17:28:09 +03:00
14ec770253
Merge branch 'develop' into feature/create-from-modal 2022-07-11 17:19:39 +03:00
TimofeyBoyko
58bd9509a1 Web:Files:Hocs: fix keyup on create docx after merge 2022-07-11 17:13:51 +03:00
1face3ea40 Files: added searching rooms without tags only 2022-07-11 17:13:30 +03:00
TimofeyBoyko
a0651ecca4 Web:Files:HOCs: fix create operation with hotkeys 2022-07-11 16:36:46 +03:00
TimofeyBoyko
76dd9dd97d Web:Files:VirtualRooms: add open room action to all view 2022-07-11 16:23:02 +03:00
TimofeyBoyko
8838d7282a Web:Files:Store: add onOpenRoom action 2022-07-11 16:22:37 +03:00
TimofeyBoyko
cdd6bc40b5 Web:Files:Home: refactoring section header 2022-07-11 16:20:59 +03:00
9793470a71 Web: Files: Article: init profile item 2022-07-11 16:18:35 +03:00
TimofeyBoyko
67d1a49ffa Web:Files:Home: upgrage onClickFolder at section header to work with rooms 2022-07-11 16:09:27 +03:00
TimofeyBoyko
8bad489bf1 Web:Common:Navigation: add isRootRoom as second argument to onClick item 2022-07-11 16:08:40 +03:00
70a8100235 Bug 53348 - Client.Account termination. Account deletion confirmation page when following an invalid link. 2022-07-11 15:58:13 +03:00
TimofeyBoyko
a754d7fb71 Web:Files:Home: upgrage onBackToParentFolder at section header to work with rooms 2022-07-11 15:57:39 +03:00
16acccc4e3 Sql: Added hosting_instance_registration table 2022-07-11 15:48:53 +03:00
Vashchuk Nikita
f13263c75a fix contexts after merge 2022-07-11 15:43:06 +03:00
e3c039942d Web: Client: hide header on desktop 2022-07-11 15:17:48 +03:00
TimofeyBoyko
95e03a49d2 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-11 14:55:50 +03:00
TimofeyBoyko
91ca312871 Merge branch 'develop' into feature/create-from-modal 2022-07-11 14:51:45 +03:00
baea63043c Web: Components: Utils: fix hugeMobile size 2022-07-11 14:48:25 +03:00
136a0d45bf Web: Client: TfaActivation: fix layout 2022-07-11 14:47:57 +03:00
TimofeyBoyko
5f41dc12ed Web:Files:Store: delete useless selectedRoomsStore 2022-07-11 14:21:47 +03:00
TimofeyBoyko
50620640eb Web:Files:SelectedFolderStore: add isPinned and roomType 2022-07-11 14:21:21 +03:00
TimofeyBoyko
4e63873bc4 Web:Files:FilesStore: add isRoom and isRootRoom for navigationPath at fetchFiles 2022-07-11 14:20:47 +03:00
65a739d871 Removed ASC.Web.Campaigns (moved to separated repository) 2022-07-11 14:15:51 +03:00
3cbfa3d952 Web: Client: TfaAuth: fix layout 2022-07-11 13:57:58 +03:00
mushka
44fc6509f3 Merge branch 'develop' into feature/modal-redesign 2022-07-11 13:54:06 +03:00
45ae2510ab Merge branch 'bugfix/fix-rooms-filter' into feature/rooms-api 2022-07-11 13:41:43 +03:00
Vashchuk Nikita
ab5279ae4c fix Backup Context 2022-07-11 13:37:20 +03:00
mushka
2fb38338e5 fixed backdrop and Debug dialog 2022-07-11 13:30:55 +03:00
Vashchuk Nikita
e49d082fa3 Merge branch 'develop' into feature/migrations-fix
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Core/Acl.cs
#	common/ASC.Core.Common/GlobalUsings.cs
#	common/ASC.Core.Common/Messaging/EventMessage.cs
#	common/ASC.Core.Common/Messaging/LoginEvent.cs
#	common/ASC.Core.Common/Messaging/MessageTarget.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20220708104402_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/CoreDbContextPostgreSql/20211012145321_CoreDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/TenantDbContextPostgreSql/20211012145343_TenantDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20211012145323_UserDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20220708104403_UserDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/PostgreSqlUserDbContextModelSnapshot.cs
#	common/ASC.Data.Backup.Core/Migrations/MySql/BackupsContextMySql/20220708104422_BackupsContextMySql.Designer.cs
#	common/ASC.Data.Backup.Core/Migrations/PostgreSql/BackupsContextPostgreSql/20220708104423_BackupsContextPostgreSql.Designer.cs
#	common/ASC.MessagingSystem/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.MessagingSystem/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Resource.Manager/ResourceData.cs
#	common/services/ASC.AuditTrail/GlobalUsings.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyAccount.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/20211022170841_FilesDbContextPostgreSql.cs
#	products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	web/ASC.Web.Api/GlobalUsings.cs
2022-07-11 13:28:49 +03:00
6719ff0e72 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings 2022-07-11 12:39:34 +03:00
Vashchuk Nikita
dcd6faf781 fix for merge 2022-07-11 12:29:45 +03:00
a9e94046c8 Merge branch 'master' into develop 2022-07-11 12:16:37 +03:00
b3324ad875 Web: Client: NavMenu: fix namespace 2022-07-11 11:28:25 +03:00
15fc78111a
Merge pull request #718 from ONLYOFFICE/release/v1.2
Release/v1.2
2022-07-11 10:47:33 +03:00
Artem Tarasov
05cf3b7d18 Web: Doceditor: fixed deletion of initial state 2022-07-10 13:01:18 +03:00