mushka
|
2f774803f4
|
added close button to Connecting account dialog
|
2022-07-19 17:47:17 +03:00 |
|
TimofeyBoyko
|
d6dd1c4639
|
Web:Files: add new translate keys for checked items of group menu
|
2022-07-19 17:41:26 +03:00 |
|
|
067e105814
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-19 16:58:02 +03:00 |
|
TimofeyBoyko
|
b19839cd9c
|
Web:Files:Header: fix back to parent room
|
2022-07-19 16:47:09 +03:00 |
|
TimofeyBoyko
|
e3aac59cb1
|
Web:Files: fix bug after delete useless page
|
2022-07-19 16:33:12 +03:00 |
|
TimofeyBoyko
|
5a3ec004bd
|
Web:Files: delete useless virtual rooms page and useless store
|
2022-07-19 16:32:02 +03:00 |
|
TimofeyBoyko
|
29f3603703
|
Web:Files:Article: hide buttons for main button mobile for rooms page
|
2022-07-19 16:30:47 +03:00 |
|
|
b98524532f
|
Merge branch 'develop' into feature/migrations-fix
# Conflicts:
# common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
# common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220711152836_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/20220711152837_VoipDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
|
2022-07-19 16:04:29 +03:00 |
|
TimofeyBoyko
|
49825e7c7d
|
Web:Files:Filter: remove filter search withSubfolders and searchInContent for rooms filter
|
2022-07-19 16:02:00 +03:00 |
|
TimofeyBoyko
|
21e641291f
|
Web:Files:Article: delete useless code
|
2022-07-19 15:48:06 +03:00 |
|
TimofeyBoyko
|
228c8ae3fa
|
Web:Files: add new translation key 'NewRoom'
|
2022-07-19 15:43:02 +03:00 |
|
TimofeyBoyko
|
614502c888
|
Web:Files:TilesView: fix margin bottom after rooms list
|
2022-07-19 14:02:58 +03:00 |
|
TimofeyBoyko
|
bfada1a415
|
Web:Files:RowsView: disable quickButtons for files and folder at rooms list
|
2022-07-19 13:57:29 +03:00 |
|
TimofeyBoyko
|
f51f2fbb9c
|
Web:Files:TableView: fix displaying rooms with subfolders
|
2022-07-19 13:49:46 +03:00 |
|
TimofeyBoyko
|
7a7e2a2858
|
Web:Files:FilesStore: add sorting folder to filesList
|
2022-07-19 13:39:13 +03:00 |
|
TimofeyBoyko
|
46363072c5
|
Web:Files:Paging: update logic for rooms
|
2022-07-19 12:58:31 +03:00 |
|
TimofeyBoyko
|
18bc69774a
|
Web:Files:Header: update action menu for rooms
|
2022-07-19 12:37:47 +03:00 |
|
TimofeyBoyko
|
50ac0f5add
|
Web:Files:Article: update main button for rooms
|
2022-07-19 12:22:57 +03:00 |
|
TimofeyBoyko
|
9b7df9abb4
|
Web:Files:Images: add icon for create room action
|
2022-07-19 12:21:57 +03:00 |
|
TimofeyBoyko
|
c5d47efeaf
|
Web:Files:FilesStore: update canCreate for rooms
|
2022-07-19 12:21:36 +03:00 |
|
TimofeyBoyko
|
a5b57add2a
|
Web:Files:Filter: add withSubfolder and searchInContent for filter
|
2022-07-18 20:26:46 +03:00 |
|
TimofeyBoyko
|
96f3c74f00
|
Web:Files:Utils: add new helpers getDefaultRoomsName
|
2022-07-18 20:08:09 +03:00 |
|
TimofeyBoyko
|
f305990514
|
Web:Files:Constants: add new constatns for filter keys and groups
|
2022-07-18 20:07:45 +03:00 |
|
|
1d0db523a8
|
Merge branch 'develop' into feature/rooms-filter
|
2022-07-18 17:27:57 +03:00 |
|
|
e849ccd635
|
Files: refactor
|
2022-07-18 17:15:17 +03:00 |
|
|
cab55d68f3
|
Files: fix filter, refactor, removed unnecessary
|
2022-07-18 17:11:50 +03:00 |
|
Artem Tarasov
|
10f2cde731
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# .gitignore
|
2022-07-18 17:05:53 +03:00 |
|
TimofeyBoyko
|
cd6c60c5d7
|
Web:Files:Home: update filter for selected items under filter row
|
2022-07-18 13:33:59 +03:00 |
|
TimofeyBoyko
|
fb05e22bb7
|
Web:Files:Store: add new tagsStore
|
2022-07-17 14:29:24 +03:00 |
|
TimofeyBoyko
|
8832aece23
|
Web:Files: move logic from virtual room page to home page
|
2022-07-16 09:50:32 +03:00 |
|
TimofeyBoyko
|
5074451a98
|
Web:Files:add room logo
|
2022-07-16 09:49:22 +03:00 |
|
|
fe993907ad
|
Merge branch 'feature/modal-redesign' of https://github.com/ONLYOFFICE/AppServer into feature/add-17keys
|
2022-07-15 15:09:49 +03:00 |
|
|
bb51d53cc4
|
add new keys-17
|
2022-07-15 15:02:07 +03:00 |
|
|
d8980cc3a7
|
fix 57917
|
2022-07-14 20:00:43 +03:00 |
|
mushka
|
d106647ecf
|
tweaked DownloadDialog and fixed overall aside body scroll
|
2022-07-14 17:45:18 +03:00 |
|
mushka
|
1b895976f5
|
fixed DownloadAs panel
|
2022-07-14 17:26:21 +03:00 |
|
Vashchuk Nikita
|
6507c4b999
|
Merge branch 'develop' into feature/migrations-fix
# Conflicts:
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
# web/ASC.Web.Core/GlobalUsings.cs
|
2022-07-14 11:56:07 +03:00 |
|
TimofeyBoyko
|
7532dc199f
|
Web:Files:Article: remove useless 'type' from onClick and work with folder id
|
2022-07-14 07:12:31 +03:00 |
|
TimofeyBoyko
|
bfc1422ba7
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-14 06:01:51 +03:00 |
|
|
ee9e381b26
|
fixed async
|
2022-07-13 20:09:43 +03:00 |
|
mushka
|
41731b9b36
|
removed Move translation key
|
2022-07-13 18:07:41 +03:00 |
|
mushka
|
f63c570349
|
fixed ConvertDialog translations
|
2022-07-13 17:55:30 +03:00 |
|
mushka
|
25941ceb50
|
fixed missed translation key bug in ConflictResolve dialog
|
2022-07-13 16:02:11 +03:00 |
|
mushka
|
523b974fc5
|
deleted unused translation keys
|
2022-07-13 15:26:52 +03:00 |
|
|
552d2adda8
|
Files: deleted unnecessary
|
2022-07-13 13:42:40 +03:00 |
|
|
256885f4e3
|
Files: fix, deleted unnecessary
|
2022-07-13 13:42:17 +03:00 |
|
|
ea00433ff1
|
Files: tests. refactoring
|
2022-07-13 13:00:08 +03:00 |
|
Vashchuk Nikita
|
9348ad1a46
|
fix files tests
|
2022-07-13 12:52:13 +03:00 |
|
|
120a57c1bf
|
Merge branch 'develop' into feature/room_tests
|
2022-07-13 11:56:48 +03:00 |
|
|
e7831d9b94
|
Files: moved parameter from body to query
|
2022-07-13 11:47:15 +03:00 |
|
|
06a98c508e
|
Merge branch 'develop' into feature/room_tests
# Conflicts:
# .gitignore
|
2022-07-12 22:48:47 +03:00 |
|
|
a8ba7ae685
|
removed logo test
|
2022-07-12 22:44:10 +03:00 |
|
|
a2129001c9
|
Files: added withoutTags, withoutMe parameters, refactor
|
2022-07-12 19:25:34 +03:00 |
|
|
bab140aaf3
|
Files: reworked rooms filter, added withoutTags, withoutMe parameters
|
2022-07-12 19:24:39 +03:00 |
|
TimofeyBoyko
|
77e62baad1
|
Web:Files:VirtualRooms: add fetching tags after fetching rooms
|
2022-07-12 19:07:58 +03:00 |
|
mushka
|
30ed90b8e9
|
Merge branch 'feature/modal-redesign' of github.com:ONLYOFFICE/AppServer into feature/modal-redesign
|
2022-07-12 18:25:36 +03:00 |
|
mushka
|
9242d571b8
|
deleted InfoPanel/views folder
|
2022-07-12 18:25:21 +03:00 |
|
|
536282eaf3
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 17:53:37 +03:00 |
|
TimofeyBoyko
|
645be6d794
|
Web:Files:SelectedFolderStore: set roomType = null if roomType doesnt exists in selectedFolder
|
2022-07-12 17:19:52 +03:00 |
|
TimofeyBoyko
|
09122918f6
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-12 16:19:00 +03:00 |
|
|
c1be6ecb61
|
Settings: ignore id
|
2022-07-12 15:33:46 +03:00 |
|
|
72b00ffe94
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 14:24:11 +03:00 |
|
|
fa8898d522
|
Files: fixed converter
|
2022-07-12 14:18:26 +03:00 |
|
TimofeyBoyko
|
9bfb54bcc3
|
Web:Files:VirtualRooms: add group menu for virtual room pages
|
2022-07-12 14:05:51 +03:00 |
|
mushka
|
96e85f9cb3
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 12:34:43 +03:00 |
|
TimofeyBoyko
|
1bee56d3aa
|
Web:Files:VirtualRooms: disable open archived rooms and fix logo
|
2022-07-12 10:22:46 +03:00 |
|
|
b2b55bfa5b
|
fixed subfolders method
|
2022-07-11 22:22:56 +03:00 |
|
mushka
|
75a3a741c6
|
fixed SelectFile and SelectFolder styles
|
2022-07-11 21:20:52 +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 |
|
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 |
|
TimofeyBoyko
|
67d1a49ffa
|
Web:Files:Home: upgrage onClickFolder at section header to work with rooms
|
2022-07-11 16:09:27 +03:00 |
|
TimofeyBoyko
|
a754d7fb71
|
Web:Files:Home: upgrage onBackToParentFolder at section header to work with rooms
|
2022-07-11 15:57:39 +03:00 |
|
Vashchuk Nikita
|
f13263c75a
|
fix contexts after merge
|
2022-07-11 15:43:06 +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 |
|
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 |
|
|
45ae2510ab
|
Merge branch 'bugfix/fix-rooms-filter' into feature/rooms-api
|
2022-07-11 13:41:43 +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 |
|
Artem Tarasov
|
120f5f7b17
|
Web: Files/People/Client/Login: updated version webpack-cli 4.9.0 -> 4.10.0
|
2022-07-10 12:34:16 +03:00 |
|
Artem Tarasov
|
55198d0e7f
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# web/ASC.Web.Editor/src/i18n.js
# web/ASC.Web.Editor/webpack.config.js
# yarn.lock
|
2022-07-10 11:23:44 +03:00 |
|
TimofeyBoyko
|
42cc6dc5a5
|
Web:Files:Home: remove useless sorting from section body of tile view
|
2022-07-08 18:06:52 +03:00 |
|
|
70c1476686
|
Files: added sorting by room type/tags
|
2022-07-08 17:31:37 +03:00 |
|
mushka
|
58e68c1c12
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-08 17:23:02 +03:00 |
|
|
63c2c34d44
|
refactoring tests
|
2022-07-08 15:31:07 +03:00 |
|
TimofeyBoyko
|
fffe60a1c7
|
Web:Files:VirtualRooms:TileView/TableView: add select tag to filter function
|
2022-07-08 15:00:30 +03:00 |
|
TimofeyBoyko
|
ee572da527
|
Web:Files:RoomsActionsStore: add onSelectTag action
|
2022-07-08 14:41:55 +03:00 |
|
TimofeyBoyko
|
a6a0bb9cc2
|
Web:Files:Store: init roomsActionsStore
|
2022-07-08 14:41:32 +03:00 |
|
Vashchuk Nikita
|
4628769136
|
fix Contexts,
fix migrations,
removed MailDbContext.cs,
moved ResourceDbContext.cs
|
2022-07-08 14:24:18 +03:00 |
|
TimofeyBoyko
|
4a2aa14722
|
Web:Files:Article: delete useless code after merge
|
2022-07-08 13:23:06 +03:00 |
|
mushka
|
3facc47665
|
removed reasssign data link and unuseful comment from DeleteUser and ConnectCloud
|
2022-07-08 12:50:44 +03:00 |
|