|
|
34e4f2e47f
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2022-07-13 19:39:05 +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 |
|
|
|
1c491af30c
|
Files: refactor
|
2022-07-13 17:11:06 +03:00 |
|
|
|
5116642b95
|
Files: added private
|
2022-07-13 17:10:51 +03:00 |
|
|
|
c03e1a443a
|
Files: added restrictions on sharing for private rooms
|
2022-07-13 16:33:44 +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 |
|
|
|
cad67a6f57
|
Web: RestoreBackup: Refactoring.
|
2022-07-13 12:20:33 +03:00 |
|
|
|
b0eb883e20
|
Web: Fixed saving settings, refactoring.
|
2022-07-13 12:20:33 +03:00 |
|
|
|
51418fc141
|
WEb: AutoBackup: Added new option for third-party accounts.
|
2022-07-13 12:20:30 +03:00 |
|
|
|
05db277f00
|
Web: AutoBackup: Added disable input if folder was deleted, added removing folder when switch between options.
|
2022-07-13 12:20:30 +03:00 |
|
|
|
41a2c421b1
|
Web: ManualBackup: Added new option for Third-party accounts.
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/DesktopView.js
|
2022-07-13 12:20:29 +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 |
|
|
|
7dfaf60592
|
Files: refactoring
|
2022-07-10 22:21:09 +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 |
|
|
|
cc052101e7
|
Files: added blocking rewriting for encrypted files
|
2022-07-08 14:34:13 +03:00 |
|
Vashchuk Nikita
|
4628769136
|
fix Contexts,
fix migrations,
removed MailDbContext.cs,
moved ResourceDbContext.cs
|
2022-07-08 14:24:18 +03:00 |
|
|
|
b294b557b0
|
removed ConfigureAwait
|
2022-07-08 13:39:07 +03:00 |
|
|
|
e80613e8db
|
Files: fix
|
2022-07-08 13:28:27 +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 |
|
TimofeyBoyko
|
c8feb7899b
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-08 12:32:26 +03:00 |
|
TimofeyBoyko
|
f85b116721
|
Web:Files:Home: refactoring section filter
|
2022-07-08 12:23:57 +03:00 |
|
TimofeyBoyko
|
723716dbc8
|
Web:Files:VirtualRooms: update filter
|
2022-07-08 12:10:17 +03:00 |
|
TimofeyBoyko
|
f46add9687
|
Web:Files:RoomsStore: add filterRooms, sortRooms, searchRoom
|
2022-07-08 12:09:57 +03:00 |
|
|
|
0504838691
|
fix tests
|
2022-07-08 11:46:34 +03:00 |
|
|
|
59a78409b4
|
Files: optimization
|
2022-07-08 11:17:11 +03:00 |
|
TimofeyBoyko
|
0ecb0ed9f7
|
Web:Files:VirtualRooms: delete tag from row info
|
2022-07-08 10:49:53 +03:00 |
|
mushka
|
89dd7ab365
|
fixed translations, styles and dark theme for ConnectCloud
|
2022-07-07 19:25:31 +03:00 |
|
|
|
4dcd8ba31a
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
|
2022-07-07 19:09:35 +03:00 |
|
|
|
b8a2cf5292
|
Files: update docstore submodule
- update en demo templates
- update empty az
- added gl-ES, eu-ES, hy-AM, ms-MY
|
2022-07-07 18:11:42 +03:00 |
|
|
|
c78370b5b1
|
Merge branch 'develop' into feature/private-virtual-rooms
|
2022-07-07 17:58:04 +03:00 |
|
|
|
c8458858e0
|
Merge branch 'develop' into feature/room_tests
|
2022-07-07 17:56:40 +03:00 |
|
|
|
f8c27acc7d
|
Merge branch 'develop' into feature/room_tests
|
2022-07-07 17:56:15 +03:00 |
|
|
|
912bb3ed36
|
Merge pull request #711 from ONLYOFFICE/feature/rooms-archive-delete-after
Feature/rooms-archive-delete-after
|
2022-07-07 17:55:40 +03:00 |
|
mushka
|
4ef6970583
|
fixed translations and styles on ThirdPartyMove dialog
|
2022-07-07 17:54:28 +03:00 |
|
|
|
2bc07e0a1d
|
Files: added DeleteAfter for archiving/unarchiving rooms
|
2022-07-07 17:52:20 +03:00 |
|
|
|
b5d082d816
|
room tests:first version
|
2022-07-07 17:45:23 +03:00 |
|
|
|
7af929fee8
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# products/ASC.People/Server/Models/MemberModel.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-07-07 17:41:41 +03:00 |
|
mushka
|
2ba523da5f
|
fixed translations in ConflictResolve, Convert, MoveToTrash, DeleteUser and DeleteUsers dialogs
|
2022-07-07 17:40:23 +03:00 |
|
|
|
c3b505f08e
|
fix Bug 58035
|
2022-07-07 16:34:47 +03:00 |
|
|
|
f52162827e
|
Files: added DeleteAfter for rooms
|
2022-07-07 16:20:44 +03:00 |
|
|
|
f28a372418
|
Fix Bug 58040: active download button
|
2022-07-07 14:52:26 +03:00 |
|
|
|
75251220ba
|
Web: Files: ThirdPartyDialog: fix condition
|
2022-07-07 13:45:26 +03:00 |
|
|
|
a171129d5f
|
Fix Bug 58041: add cloud button not work
|
2022-07-07 13:36:19 +03:00 |
|
|
|
0b21b748fc
|
Merge branch 'develop' into feature/private-virtual-rooms
|
2022-07-07 11:28:57 +03:00 |
|
|
|
12eb702d2d
|
Merge branch 'develop' into bugfix/fix-rooms-filter
|
2022-07-07 10:28:11 +03:00 |
|
|
|
ca799f867f
|
Fix Bug 57980: wrong tip position
|
2022-07-07 00:20:22 +03:00 |
|
|
|
1867ec9822
|
Files: fixed type/tags filters with subfolders
|
2022-07-06 23:14:45 +03:00 |
|
|
|
45466dad44
|
Files: removed unnecessary
|
2022-07-06 23:13:43 +03:00 |
|
|
|
baa72db316
|
removed referencies
|
2022-07-06 18:47:16 +03:00 |
|
|
|
e06c076f80
|
Fix Bug 58009 - Client.Clouds.AsNew. The New label of a third-party storage folder will not disappear after marking Mark all as read by the icon next to the folder.
|
2022-07-06 18:46:17 +03:00 |
|
mushka
|
3fd65e887d
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-07-06 18:13:33 +03:00 |
|
|
|
398a87fc3d
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-06 18:07:22 +03:00 |
|
|
|
27109aae4a
|
Fix Bug 57965: Added a scrollbar for the list of formats.
|
2022-07-06 18:06:32 +03:00 |
|
mushka
|
b80f1c3237
|
redesigned SendInviteDialog and fixed VersionHistory
|
2022-07-06 18:01:38 +03:00 |
|
|
|
671addab40
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-06 17:56:59 +03:00 |
|
|
|
fcb184a036
|
Fixed Bug 57646 - Removed the hanging of loaders when creating files sequentially.
|
2022-07-06 17:56:32 +03:00 |
|
|
|
771dffbcce
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-06 17:47:15 +03:00 |
|
|
|
58c9da7e52
|
Fix Bug 58006 - Client.Files.Clouds. The edit icon for the file 'pencil' in the third-party storage folder only disappears after a page refresh.
|
2022-07-06 17:47:01 +03:00 |
|
|
|
31e5027d74
|
edit it (Translations.json)
|
2022-07-06 14:52:53 +03:00 |
|
|
|
600487e25d
|
Fixed Bug 58011 - Client.Files. Fixed file selection after renaming
|
2022-07-06 14:34:52 +03:00 |
|
|
|
1a00edc87c
|
Fixed Bug 57639: Added new icons for form actions. Fixed accordion menu sublevel padding and restored icons displaying.
|
2022-07-06 14:23:27 +03:00 |
|
mushka
|
a1b9fe1523
|
redesigned ThirdPartyMove and fixed radio buttons on ConflictResolve
|
2022-07-06 13:49:56 +03:00 |
|
|
|
2b5bd41a9a
|
Web: Files: removed duplicate openDocEditor function, changed file status after opening file
|
2022-07-06 13:14:01 +03:00 |
|
mushka
|
ce4e9c26fd
|
removed divider from ConflicResolve and added second btn to ChangeEmail and ChangePassword
|
2022-07-06 13:02:52 +03:00 |
|
|
|
a58cf941d3
|
fixed finalize version
|
2022-07-06 11:50:50 +03:00 |
|
|
|
a9004e30dc
|
Fix Bug 58003: editing component background
|
2022-07-06 11:39:37 +03:00 |
|
TimofeyBoyko
|
459b812d16
|
Web:Files:VirtualRooms: update section directory
|
2022-07-06 11:01:23 +03:00 |
|
|
|
c7d1850f58
|
Fix Bug 57999: footer on ThirdPartyDialog
|
2022-07-05 23:36:24 +03:00 |
|
|
|
dc711916a6
|
Fix Bug 57944 - Client.Files.Thumbnails. Instead of a preview of the document, the file icon is displayed after editing it.
|
2022-07-05 22:39:34 +03:00 |
|
|
|
373ece222e
|
Fix Bug 57945 - Client.Files.Thumbnails. Icons 'pencil' and icon-button 'share' are disappear after thumbnail has been created
|
2022-07-05 18:55:47 +03:00 |
|
|
|
82f1759813
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-05 17:25:12 +03:00 |
|
|
|
7f38577332
|
Web: Translations: Removed useless translation key 'SharingSettings' (Replaced with "SharingPanel:SharingSettingsTitle")
|
2022-07-05 17:25:06 +03:00 |
|
mushka
|
cdcfdccb57
|
fixed SelectFile and SelectFolder panels && moved their footers to ModalDialog.Footer subcomponent
|
2022-07-05 17:23:59 +03:00 |
|
|
|
aeac8613a8
|
Merge branch 'develop' into features/enum_generator
|
2022-07-05 17:22:43 +03:00 |
|
|
|
69fccb5086
|
fix Bug 57979
|
2022-07-05 17:17:50 +03:00 |
|
|
|
e45541e8f8
|
Web: Translations: Removed useless translation key 'DeleteThirdParty'
|
2022-07-05 17:07:40 +03:00 |
|
|
|
1218d31a42
|
enum generator
|
2022-07-05 16:58:11 +03:00 |
|
|
|
ed45bb0118
|
Fix Bug 57978 - Client.Clouds. Rename button 'Delete third-party' to 'Disconnect'
|
2022-07-05 16:58:05 +03:00 |
|
|
|
393282ea92
|
Push: resources
|
2022-07-05 16:40:16 +03:00 |
|
|
|
e7ece44c01
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-05 16:37:57 +03:00 |
|
|
|
ac38e7c9a9
|
fix
|
2022-07-05 16:37:28 +03:00 |
|
|
|
077dfbd334
|
Web: Translations: Removed useless translations (key "MoveConfirmationAlert").
|
2022-07-05 16:35:49 +03:00 |
|
|
|
e9f790e95c
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-05 16:31:09 +03:00 |
|
|
|
4d62881a3c
|
Fixed Bug 57984: Tapping on folder title after canceling creation of form from file leads to an error
|
2022-07-05 16:30:59 +03:00 |
|
|
|
f54fd4ef71
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-05 16:19:13 +03:00 |
|
|
|
5c550849e2
|
Web: Files: Deleted useless code.
|
2022-07-05 16:19:02 +03:00 |
|
|
|
b7ca559bd4
|
fix
|
2022-07-05 16:03:31 +03:00 |
|
|
|
6ddb05512a
|
Fixed Bug 57973 - Web: Files: Changed view for "Move to" dialog.
|
2022-07-05 15:56:26 +03:00 |
|
|
|
273854bf84
|
Push: fix FirebaseHelper
|
2022-07-05 15:55:46 +03:00 |
|
mushka
|
6566ca8645
|
removed unnecessary extra margin from second button on several dialogs
|
2022-07-05 15:31:17 +03:00 |
|
mushka
|
6c13d87e92
|
fixed MoveFileToTrash dialog
|
2022-07-05 14:05:00 +03:00 |
|
mushka
|
3efe86b053
|
Merge branch 'feature/modal-redesign' of github.com:ONLYOFFICE/AppServer into feature/modal-redesign
|
2022-07-05 13:55:08 +03:00 |
|
mushka
|
58aa87ff19
|
fixed Article CloseBtn and Header offset
|
2022-07-05 13:53:43 +03:00 |
|
|
|
a15fdeb4f1
|
Fixed Bug 57986 - Client.Files. Fixed file selection after clicking on the context menu
|
2022-07-05 13:35:29 +03:00 |
|
|
|
9841588f65
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-05 13:09:42 +03:00 |
|
|
|
62e6a84b51
|
Fix Bug 57964 - Client.Files.Share. Rename Sharing setting on 'ru'
|
2022-07-05 13:09:35 +03:00 |
|
|
|
422ec8baf2
|
Fix Bug 57982: console error if filter by missing file types
|
2022-07-05 13:05:59 +03:00 |
|
|
|
04b211f1bd
|
fix
|
2022-07-05 12:59:15 +03:00 |
|
|
|
c8c40948a2
|
Fixed Bug 57789 - Mobile. Redesigned delete dialog
|
2022-07-05 12:57:36 +03:00 |
|
mushka
|
15d1c4d65b
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-05 12:54:41 +03:00 |
|
mushka
|
34ac4b7e5d
|
Fix Bug 57981: changed wrong icon on Open location ContextMenu action
|
2022-07-05 12:54:33 +03:00 |
|
|
|
f041359d3a
|
Fix Bug 57953: show new badge on folder tile
|
2022-07-05 12:54:27 +03:00 |
|
|
|
c7b556131e
|
Web: Files: Header: Fixed translation keys for sublevel of creating menu
|
2022-07-05 12:43:09 +03:00 |
|
|
|
7391469381
|
Web: Files: Article: Fixed displaying icons on sublevel
|
2022-07-05 12:42:11 +03:00 |
|
mushka
|
9f002e3249
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-07-05 12:17:58 +03:00 |
|
mushka
|
b179390243
|
fix of DeleteForever dialog
|
2022-07-05 12:12:44 +03:00 |
|
TimofeyBoyko
|
5be87292a4
|
Web:Files:Store: update rooms store and context options store, add rooms actions store and selected rooms store
|
2022-07-05 10:05:56 +03:00 |
|
TimofeyBoyko
|
3bd7b6f465
|
Web:Files:VirtualRooms: add filter for rooms
|
2022-07-05 10:05:17 +03:00 |
|
TimofeyBoyko
|
c6eaa0f41a
|
Web:Files:VirtualRooms: refactoring tile view
|
2022-07-05 10:04:41 +03:00 |
|
TimofeyBoyko
|
65819730b9
|
Web:Files:VirtualRooms: refactoring table view and add sorting
|
2022-07-05 10:04:19 +03:00 |
|
|
|
90fe1383b7
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-04 18:04:06 +03:00 |
|
|
|
ba8b14273a
|
Web: Files: SharingPanel: delete useless import
|
2022-07-04 17:53:26 +03:00 |
|
|
|
f95f91d737
|
Fix Bug 53335: disable save button if no change
|
2022-07-04 17:51:14 +03:00 |
|
|
|
d8a459f397
|
Web: i18n: Replaced i18next-http-backend package with custom realization from @appserver/common/utils/i18next-http-backend (fix issue: too many same translations files are loading at once)
|
2022-07-04 17:47:12 +03:00 |
|
|
|
b2779ff9ac
|
Fix Bug 57955: click new badge error
|
2022-07-04 17:28:53 +03:00 |
|
|
|
45406dec07
|
fix total
|
2022-07-04 16:42:29 +03:00 |
|
|
|
1e0962a11a
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-04 15:49:11 +03:00 |
|
|
|
421070f3a3
|
Fix Bug 57864: For phones in landscape orientation, shifting the list of access rights to the right in ExternalLink to personal.
|
2022-07-04 15:48:42 +03:00 |
|
|
|
19095f9108
|
files: async fix
|
2022-07-04 14:51:17 +03:00 |
|
|
|
1576609ed9
|
Fix Bug 57951: clear trash doesn't work on mobile
|
2022-07-04 14:27:36 +03:00 |
|
|
|
18c415c9d3
|
Fix Bug 57947: show cancel button
|
2022-07-04 14:07:13 +03:00 |
|
TimofeyBoyko
|
5789eb1f1f
|
Web:Files:VirtualRooms: update virtual rooms section header with selected store
|
2022-07-04 14:05:28 +03:00 |
|
|
|
d8af680616
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-04 13:55:47 +03:00 |
|
|
|
630ae2489b
|
Fixed Bug 57681 - Client. Removed the checkbox when opening the context menu
|
2022-07-04 13:55:38 +03:00 |
|
|
|
bff918c442
|
Files: added block trash for deleting files in private virtual rooms
|
2022-07-04 12:38:14 +03:00 |
|
|
|
2f9cada7e2
|
Files: fix
|
2022-07-04 12:36:56 +03:00 |
|
mushka
|
f88b82670a
|
tweaks on ModalDialog component
|
2022-07-04 12:12:02 +03:00 |
|
|
|
fb09f62881
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-04 11:39:38 +03:00 |
|
|
|
0f901bf6e3
|
added hy-AM
|
2022-07-04 11:38:57 +03:00 |
|
|
|
5ea7dfcb0c
|
Web: Files: MainButton: use withoutIcon
|
2022-07-04 07:24:32 +03:00 |
|
|
|
c6691b5de6
|
Web: Files: MainButton: add submenu for mobile
|
2022-07-04 07:10:07 +03:00 |
|
|
|
d37a6eaede
|
Web: Files: Header: add submenu for plus
|
2022-07-04 06:17:00 +03:00 |
|
TimofeyBoyko
|
8b87d68924
|
Web:Files:VirtualRooms: refactoring
|
2022-07-04 04:58:40 +03:00 |
|
TimofeyBoyko
|
c2356c6f7b
|
Web:Files:VirtualRooms: refactoring tile view
|
2022-07-04 04:51:34 +03:00 |
|
TimofeyBoyko
|
4f627eac5d
|
Web:Files:VirtualRooms: refactoring table view
|
2022-07-04 04:51:20 +03:00 |
|
TimofeyBoyko
|
8326d99c4a
|
Web:Files:VirtualRooms: add row view
|
2022-07-04 04:50:57 +03:00 |
|
|
|
29b8826ab3
|
fix
|
2022-07-03 22:39:43 +03:00 |
|
|
|
0e423430be
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
|
2022-07-03 22:19:53 +03:00 |
|
|
|
d6b7db91e3
|
Web: Translations: Added translations minimization
|
2022-07-03 13:25:41 +03:00 |
|
TimofeyBoyko
|
62e8b7d761
|
Web:Files:Article: fix double fetching rooms after change root room
|
2022-07-03 08:11:54 +03:00 |
|
Artem Tarasov
|
2ef94f75da
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Editor/webpack.config.js
# yarn.lock
|
2022-07-01 23:41:10 +03:00 |
|
|
|
5d4715e674
|
fix
|
2022-07-01 17:37:09 +03:00 |
|
|
|
d8291efa30
|
Fixed Bug 57933 - Client.Files.Info. Fixed console error ‘Uncaught (in promise) TypeError: l.findIndex is not a function’
|
2022-07-01 17:30:08 +03:00 |
|
|
|
d1677a8070
|
Web: Files: fixed hotkeys scroll
|
2022-07-01 16:02:14 +03:00 |
|
|
|
c9d3382b34
|
Fixed Bug 57927 - Client.FormsGallary.Info. ‘Something went wrong’ when opening the info-panel
|
2022-07-01 14:58:24 +03:00 |
|
|
|
85ef85df76
|
Web: Translations: Removed useless translations (key "FormTemplateInfo")
|
2022-07-01 14:34:58 +03:00 |
|
|
|
634bae6002
|
Fix Bug 57926 - Client.FormsGallary.Info.The name of the info panel in some languages in two lines.
|
2022-07-01 14:33:38 +03:00 |
|
Vashchuk Nikita
|
bdbd6bd65e
|
Recreating and fixing migrations
|
2022-07-01 14:27:28 +03:00 |
|
Vashchuk Nikita
|
5a0acc8eaa
|
Renaming folders for contexts and models
|
2022-07-01 14:23:07 +03:00 |
|
|
|
3a85143514
|
Files: added block removing to trash from private virtual room
|
2022-07-01 14:02:08 +03:00 |
|
|
|
381d9165cb
|
Fix Bug 57920: Fixed clearing selection after update items list on delete elements
|
2022-07-01 13:00:48 +03:00 |
|
|
|
7e34e45371
|
ElasticSearch: disabled by default
|
2022-07-01 12:53:18 +03:00 |
|
TimofeyBoyko
|
b107cad79b
|
Web:Files:Store: update context menu archive item for archived rooms
|
2022-07-01 11:48:11 +03:00 |
|
TimofeyBoyko
|
bca685850a
|
Merge branch 'feature/virtual-rooms-page' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-page
|
2022-07-01 11:22:56 +03:00 |
|
|
|
45ce1387ba
|
Web: Files: hidden context menu button for editing component
|
2022-07-01 10:43:07 +03:00 |
|
TimofeyBoyko
|
3e07ef1efc
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-01 10:09:47 +03:00 |
|
|
|
74d238bde8
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Common/Caching/KafkaCache.cs
# common/ASC.Common/Logging/Log.cs
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Backup.Core/BackupResource.Designer.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
# products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs
# products/ASC.Files/Core/Core/Compress/CompressToZip.cs
# products/ASC.Files/Core/Core/Compress/ICompress.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Resources/FilesJSResource.Designer.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
|
2022-06-30 16:13:31 +03:00 |
|
|
|
f9902d1524
|
Fix Bug 57833: mobile open cloud
|
2022-06-30 16:09:18 +03:00 |
|
|
|
ffd5c0b3aa
|
Files: changed title for docspace, refactor
|
2022-06-30 14:57:24 +03:00 |
|
|
|
1b1005f8bf
|
Files: added new key, renamed virtualrooms, archive
|
2022-06-30 14:56:28 +03:00 |
|
|
|
6da2935874
|
Fix Bug 57890: incorrect cursor
|
2022-06-30 14:56:19 +03:00 |
|
|
|
98be4769b4
|
Web: Files: fix getIsEmptyTrash
|
2022-06-30 14:31:20 +03:00 |
|
|
|
a357badf78
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-30 13:30:41 +03:00 |
|
|
|
bdb26fe251
|
Fixed Bug 57881: Web: Files: Changed icon for removed from favorites option.
|
2022-06-30 13:29:43 +03:00 |
|
|
|
aeaef47115
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-30 13:16:41 +03:00 |
|
|
|
0dc5273cc7
|
Web:Files:Fix border DeleteDialog.
|
2022-06-30 13:16:27 +03:00 |
|
|
|
e891f8b6d6
|
Fixed Bug 57880: Added theme support for download dialog.
|
2022-06-30 13:14:31 +03:00 |
|
|
|
0f3da31811
|
Files: fix
|
2022-06-30 12:43:38 +03:00 |
|
|
|
5edde068f7
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-30 12:18:24 +03:00 |
|
|
|
a7456fa89b
|
Fixed Bug57856: Removed delete button from media-viewer in the favorite folder.
|
2022-06-30 12:16:50 +03:00 |
|
|
|
630250b439
|
fix tests
|
2022-06-30 12:07:30 +03:00 |
|
|
|
10a3edec61
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-30 11:46:34 +03:00 |
|
|
|
32433e10e1
|
Fix Bug 57876: blocked files while deletion is in progress
|
2022-06-30 11:45:18 +03:00 |
|
|
|
ec90de13c6
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-30 11:28:28 +03:00 |
|
|
|
e972c06d22
|
Web:Files:Added isTrashFolder.
|
2022-06-30 11:28:15 +03:00 |
|
|
|
8624e75c30
|
Fix Bug 57875: white row when create file
|
2022-06-30 11:13:58 +03:00 |
|
|
|
f4d9b4dd3a
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-30 11:05:04 +03:00 |
|
|
|
e64b4a46ac
|
Web:Files:Removed the ability to create and upload files and folders in the Favorites, Recent, Trash folders.
|
2022-06-30 11:03:53 +03:00 |
|
|
|
8f9c8b4c1b
|
Fix Bug 57836: add clear trash button
|
2022-06-30 02:48:52 +03:00 |
|
|
|
de068f869e
|
thumb: fix
|
2022-06-29 20:55:01 +03:00 |
|
|
|
75be0827d7
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
# Conflicts:
# products/ASC.Files/Service/GlobalUsings.cs
|
2022-06-29 20:01:27 +03:00 |
|
|
|
35ab5a3531
|
fix order
|
2022-06-29 19:43:29 +03:00 |
|
|
|
d78509993f
|
fixed Bug 53280
|
2022-06-29 18:40:35 +03:00 |
|
|
|
5ccd9d01a5
|
DeleteExpiredService: launch frequency
|
2022-06-29 18:34:50 +03:00 |
|
TimofeyBoyko
|
5581aa3039
|
Web:Files:VirtualRooms: fix fetching rooms if search area and filter doesn exists
|
2022-06-29 18:09:25 +03:00 |
|
|
|
517eefe3ab
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-29 18:07:25 +03:00 |
|
|
|
b52b31eaae
|
Web:Files:Changed button name to "Remove from favorites".
|
2022-06-29 18:07:13 +03:00 |
|
|
|
bbf7065532
|
Fixed Bug 53879 - Client: Check box. Fixed file selection reset after adding new icons
|
2022-06-29 18:05:53 +03:00 |
|
TimofeyBoyko
|
53311d6308
|
Web:Files:Article: fix onClick function and active element for docSpace
|
2022-06-29 18:03:39 +03:00 |
|
mushka
|
3dcc299bd9
|
fixed ConflictResolve and DeleteAll dialogs
|
2022-06-29 17:33:37 +03:00 |
|
|
|
0268d807c2
|
Fix Bug 57863: errors in console when press enter repeatedly
|
2022-06-29 17:22:57 +03:00 |
|
|
|
f8dd154c88
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-29 17:11:24 +03:00 |
|
|
|
ceb4a5491a
|
Web:Files:Fixed deleting files in the Recycle Bin using the Delete button from the Favorites and Recent folders.
|
2022-06-29 17:10:09 +03:00 |
|
TimofeyBoyko
|
4cadd39e19
|
Merge branch 'feature/virtual-rooms-page' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-page
|
2022-06-29 16:12:13 +03:00 |
|
|
|
59e64df2b6
|
Merge branch 'feature/virtual-rooms-page' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-page
|
2022-06-29 15:49:57 +03:00 |
|
|
|
667cea2ee9
|
Files: fix rooms parent folder
|
2022-06-29 15:47:52 +03:00 |
|
|
|
b807959aa8
|
Fix Bug 57853: audio files can't open
|
2022-06-29 15:42:21 +03:00 |
|
|
|
be08c35421
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-29 14:55:45 +03:00 |
|
|
|
53fe0a309a
|
Fix Bug 57848 - Client.Clouds. Non-obvious button to go to the third-party storage folder from the Connected Clouds page.
|
2022-06-29 14:55:39 +03:00 |
|
|
|
f417477cae
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-29 14:46:28 +03:00 |
|
|
|
b407da3bd2
|
Fixed Bug 57860 - Client.Files. ‘Something went wrong’ when clicking on the share icon after selected a row.
|
2022-06-29 14:46:20 +03:00 |
|
|
|
067a614c2b
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-29 14:32:40 +03:00 |
|
|
|
228258707a
|
Web:Files:Added displayType="modal" for EmptyTrashDialog.
|
2022-06-29 14:32:23 +03:00 |
|
|
|
21ea7ec019
|
first version: delete expired service
|
2022-06-29 11:55:54 +03:00 |
|
|
|
8f8041a31b
|
Web: Files: fixed download-dialog styles
|
2022-06-29 11:38:59 +03:00 |
|
|
|
e1b6d5000b
|
filedownloadoperation: added try/catch block
|
2022-06-28 18:35:26 +03:00 |
|
mushka
|
81121d5bf9
|
fix move/copy dialogs
|
2022-06-28 17:49:47 +03:00 |
|
|
|
c0ab41b6db
|
Web: Files: Icons: Changed folder icons for all formats (24/32/64/96)
|
2022-06-28 16:54:15 +03:00 |
|
TimofeyBoyko
|
fd062b7cd6
|
Web:Files: change docspace to docSpace
|
2022-06-28 16:36:48 +03:00 |
|
TimofeyBoyko
|
5aaea7d5dc
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-06-28 16:12:33 +03:00 |
|
|
|
24d2672073
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 16:09:24 +03:00 |
|
|
|
abeec34451
|
Web: Files: Actions: Added icons for menu sublevels
|
2022-06-28 16:09:14 +03:00 |
|
|
|
9e42ee80b2
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/CommunityServer-AspNetCore into release/v1.2
|
2022-06-28 15:52:30 +03:00 |
|
|
|
21b2735147
|
filedownloadoperation: restore processed and progress fields
|
2022-06-28 15:52:21 +03:00 |
|
|
|
4684f26299
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 15:39:40 +03:00 |
|
|
|
08090ea3b4
|
Web: Icons: Fixed icon bundle for items menu and folders menu
|
2022-06-28 15:39:31 +03:00 |
|
|
|
fd7a6f9ee9
|
Web: Files: Hotkeys: fixed table-header styles
|
2022-06-28 15:34:20 +03:00 |
|
|
|
d1063df40c
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-28 15:32:06 +03:00 |
|
|
|
5cc38b95df
|
add fFmpegFormats and imageFormatsCanBeCrop
|
2022-06-28 14:39:20 +03:00 |
|
TimofeyBoyko
|
a251fab458
|
Web:Files:Store: update rooms store for room context menu
|
2022-06-28 13:27:35 +03:00 |
|
TimofeyBoyko
|
9d137ce39a
|
Web:Files:VirtualRooms: add rooms store and context options store
|
2022-06-28 13:27:01 +03:00 |
|
TimofeyBoyko
|
b7946159e8
|
Web:Files:Rooms: add rooms store to virtual rooms tile view
|
2022-06-28 13:25:36 +03:00 |
|
TimofeyBoyko
|
d9e9e28803
|
Web:Files:Rooms: update table view
|
2022-06-28 13:25:05 +03:00 |
|
|
|
ccf7953a2d
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 12:30:01 +03:00 |
|
|
|
d9b640450e
|
Fix Bug 57825 - Client.Files.AsNew. New badge do not disappear on 'Mark all as read' button click
|
2022-06-28 12:29:55 +03:00 |
|
|
|
561a0bba71
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 10:53:40 +03:00 |
|
|
|
2ab43169a9
|
Web: Files: Fixed styles for convert dialog and empty trash dialog.
|
2022-06-28 10:53:34 +03:00 |
|
|
|
212fc5a405
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 10:26:41 +03:00 |
|
|
|
3ac73beb7e
|
Web: Files: fixed selection of items when clicking on the context menu
|
2022-06-28 10:26:32 +03:00 |
|
|
|
dd52a695e5
|
fix build
|
2022-06-27 23:18:23 +03:00 |
|
|
|
75737b8d12
|
fix Bug 57710
|
2022-06-27 17:52:56 +03:00 |
|
|
|
de51c8e1db
|
box: fix GetThumbnail
|
2022-06-27 16:40:26 +03:00 |
|
|
|
1b40530107
|
Fixed Bug 57814 - Client.HotKeys. Fixed setting of hotkey caret
|
2022-06-27 15:25:34 +03:00 |
|
|
|
8795b1e377
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-27 14:52:17 +03:00 |
|
|
|
6117f4b186
|
Fixed Bug 57781 - Docs: Fixed select items
|
2022-06-27 14:52:10 +03:00 |
|
|
|
060c7f371d
|
Web: Files: fixed table selection
|
2022-06-27 14:48:04 +03:00 |
|
|
|
6d98440200
|
az resources
|
2022-06-27 14:00:23 +03:00 |
|
|
|
3bcb58999d
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-27 13:46:03 +03:00 |
|
|
|
5e5b431e07
|
Fixed Bug 57811, 57812 - Client.Files. Fixed clearing selection when closing context menu.
|
2022-06-27 13:45:56 +03:00 |
|
|
|
14404198c2
|
Push: fixed a sender sink
|
2022-06-27 13:36:38 +03:00 |
|
mushka
|
0e6ed787d0
|
fix views importing
|
2022-06-27 13:32:31 +03:00 |
|
|
|
eda70aef95
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-27 13:54:56 +05:00 |
|
|
|
9ec801e233
|
Fixed bug 57697 - Web: Files: added delay for requesting a folder if is viewer mode
|
2022-06-27 13:54:45 +05:00 |
|
|
|
b6b65a1941
|
Fixed Bug 57789 - Mobile. Fixed delete dialog styles
|
2022-06-27 11:48:03 +03:00 |
|
|
|
04c385235e
|
Merge branch 'develop' into feature/private-virtual-rooms
|
2022-06-27 11:11:24 +03:00 |
|
TimofeyBoyko
|
d7b3af8089
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-06-26 15:24:13 +03:00 |
|
|
|
80addf5d86
|
fixed Bug 57463
|
2022-06-24 20:41:11 +03:00 |
|
|
|
f0f4e13633
|
Fix Bug 57771 - The text color of the hotkeys on the Hotkeys page is not adapted to the dark theme
|
2022-06-24 18:39:33 +03:00 |
|
|
|
cb9c8a35a4
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-24 17:55:21 +03:00 |
|
|
|
4f93505de9
|
Fix Bug 57777 - Docs: Hotkey Ctrl+A makes pagination block smaller by height
|
2022-06-24 17:54:33 +03:00 |
|
|
|
a0852cd105
|
Web: Files: fixed onSelectItem
|
2022-06-24 17:54:02 +03:00 |
|
|
|
6e7675281e
|
Fixed Bug 57779 - Mobile. Fixed buttons styles for dark theme
|
2022-06-24 17:00:09 +03:00 |
|
|
|
e8cf4e7906
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-24 16:24:26 +03:00 |
|
|
|
fef096b0a5
|
fix generating thumbnails for video
|
2022-06-24 16:22:52 +03:00 |
|
|
|
54fa40be47
|
Fixed Bug 57681 - Client. Removed the checkbox when opening the context menu
|
2022-06-24 15:51:55 +03:00 |
|
|
|
30d0ca4b97
|
Files: added comunity compability
|
2022-06-24 15:46:59 +03:00 |
|
|
|
1b6b71b98e
|
Web: Files: disabled hotkeys when version history panel is open
|
2022-06-24 14:23:07 +03:00 |
|
|
|
a99e3af42e
|
Files: added restrictions on moving and copying in private virtual room
|
2022-06-24 13:43:36 +03:00 |
|
|
|
f66309bfed
|
Fixed Bug 57774 - VersionHistory. Added close when Escape button is pressed
|
2022-06-24 13:12:53 +03:00 |
|
|
|
f7b4cb89f6
|
Fixed Bug 57768 - Mobile. Fixed open context menu for IOS devices.
|
2022-06-24 12:47:16 +03:00 |
|
|
|
d85c4dac29
|
fix
|
2022-06-24 12:15:56 +03:00 |
|
|
|
09612d377d
|
box: add check can create thumbnail
|
2022-06-24 11:53:12 +03:00 |
|
|
|
748d26f2ca
|
Fixed Bug 57769 - Docs: Fixed text selection in HotkeysPanel
|
2022-06-24 11:05:58 +03:00 |
|
|
|
d445b9e05d
|
Fix Bug 57753 - badge Revision is not visible clearly on dark theme
|
2022-06-24 10:44:53 +03:00 |
|
TimofeyBoyko
|
600616b9d9
|
Web:Files:Article: fix click on root rooms and fix actiove article item
|
2022-06-23 20:16:17 +03:00 |
|
TimofeyBoyko
|
c651e88681
|
Web:Files:RoomsStore: correct select root room
|
2022-06-23 20:15:07 +03:00 |
|
TimofeyBoyko
|
348169e3f4
|
Merge branch 'feature/room-types' into feature/virtual-rooms-page
|
2022-06-23 19:40:36 +03:00 |
|
TimofeyBoyko
|
fff7dd7646
|
Web:Files:Store: add rooms store
|
2022-06-23 19:38:01 +03:00 |
|
|
|
f2bf9defe6
|
Files: added property room type in dto
|
2022-06-23 18:39:00 +03:00 |
|
|
|
1c987a5b86
|
Files: added immediate removal for private rooms
|
2022-06-23 18:16:49 +03:00 |
|
|
|
2c434e2d92
|
Files: fix security, added private room check
|
2022-06-23 18:14:57 +03:00 |
|
|
|
1692bd315c
|
Files: added private
|
2022-06-23 18:12:54 +03:00 |
|
|
|
c72206eec5
|
Files: added private
|
2022-06-23 18:10:21 +03:00 |
|
|
|
a035e9bf0c
|
Merge pull request #696 from ONLYOFFICE/feature/download-dialog
Feature/download dialog
|
2022-06-23 15:41:47 +03:00 |
|
|
|
9408a5a296
|
Web: Files: Added and applied new "ErrorInternalServer" translation key to Common.json
|
2022-06-23 15:34:52 +03:00 |
|
|
|
67f276e0d0
|
Fixed Bug 57763 - Сlient.OformsGallery. Fixed form creation after back from form gallery page
|
2022-06-23 15:19:17 +03:00 |
|
|
|
20deb4458a
|
thumbnails: adaptive size
|
2022-06-23 15:18:15 +03:00 |
|
|
|
4b513bef15
|
Fixed Bug 57743 - Client.Upload. Added warning about possible data loss when refreshing the page while loading files/folders
|
2022-06-23 14:03:03 +03:00 |
|
|
|
d98a151385
|
Merge branch 'release/v1.2' into feature/download-dialog
|
2022-06-23 12:28:13 +03:00 |
|
|
|
3bf29d925c
|
Web: Files: Fix decrement of root folder counter by click on 'New' file status
|
2022-06-23 12:26:10 +03:00 |
|
|
|
af252cc949
|
fix
|
2022-06-23 12:24:20 +03:00 |
|
|
|
c9eaeed719
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
# Conflicts:
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
|
2022-06-23 12:09:13 +03:00 |
|
|
|
5bcbae5711
|
fix
|
2022-06-23 11:48:31 +03:00 |
|
TimofeyBoyko
|
d49b5afb98
|
Web:Files:Article: remove useless code
|
2022-06-22 17:33:23 +03:00 |
|
TimofeyBoyko
|
07c34da64d
|
Web:Files: change virtual rooms page url
|
2022-06-22 17:33:10 +03:00 |
|
|
|
ed2298663c
|
Web: Files: Added opportunity to turn off "New" files badge
|
2022-06-22 17:25:26 +03:00 |
|
TimofeyBoyko
|
c20c47921e
|
Web:Files:Article: send rootFolderType as type at catalog item
|
2022-06-22 17:21:57 +03:00 |
|
|
|
b9496e4d0b
|
Merge branch 'release/v1.2' into feature/download-dialog
|
2022-06-22 17:21:38 +03:00 |
|
TimofeyBoyko
|
4023e101bd
|
Web:Files:Store applied e2bdaa4
|
2022-06-22 16:27:30 +03:00 |
|
|
|
478666331b
|
fix bug 57463
|
2022-06-22 16:26:38 +03:00 |
|
TimofeyBoyko
|
fdbe61603b
|
Web:Files:Article: add empty accounts item
|
2022-06-22 16:24:18 +03:00 |
|
|
|
d05f13b143
|
fix
|
2022-06-22 16:21:39 +03:00 |
|
TimofeyBoyko
|
073c24014a
|
Web:Files:Article: add new header items: files, rooms, other
|
2022-06-22 16:14:42 +03:00 |
|
|
|
914c9bc799
|
File: fix download
|
2022-06-22 15:54:43 +03:00 |
|
|
|
274e89f51c
|
Web: Files: added limit for download action
|
2022-06-22 15:38:05 +03:00 |
|
|
|
5e4d065623
|
Fixed Bug 57720 - Client. Fixed display the current directory
|
2022-06-22 14:58:34 +03:00 |
|
|
|
5cb96c0727
|
Merge branch 'release/v1.2' into feature/download-dialog
|
2022-06-22 14:32:57 +03:00 |
|
TimofeyBoyko
|
40d69ea88f
|
Web:Files:Article: rename SettingsItems to SettingItem
|
2022-06-22 14:20:27 +03:00 |
|
TimofeyBoyko
|
6c6052293b
|
Web:Files:Article: change default icon to settings item
|
2022-06-22 14:17:35 +03:00 |
|
TimofeyBoyko
|
ceaa29e294
|
Web:Files:Article: hide thirparty list, download app list and banner for docspace
|
2022-06-22 14:17:07 +03:00 |
|
|
|
2273887a6a
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-22 14:11:19 +03:00 |
|
|
|
cd2687e260
|
Fixed Bug 57630: Web: Files: Fixed animation when switching between folders.
|
2022-06-22 14:11:07 +03:00 |
|
|
|
de7148686c
|
fix Bug 52860
|
2022-06-22 13:48:11 +03:00 |
|
TimofeyBoyko
|
4b7520c6a8
|
Web:Files:Article: add new icons for article items
|
2022-06-22 12:32:21 +03:00 |
|
|
|
1658240e2f
|
Web: Files: fixed download action
|
2022-06-22 12:07:57 +03:00 |
|
|
|
b88dadf961
|
Merge branch 'feature/download-dialog' of github.com:ONLYOFFICE/AppServer into feature/download-dialog
|
2022-06-22 11:53:01 +03:00 |
|
|
|
f84d98c6df
|
Web: Files: fixed downloadFiles toast
|
2022-06-22 11:52:37 +03:00 |
|
|
|
7189a99583
|
Merge branch 'feature/download-dialog' of https://github.com/ONLYOFFICE/AppServer into feature/download-dialog
|
2022-06-22 11:36:35 +03:00 |
|
|
|
3b99ef503c
|
Merge branch 'release/v1.2' into feature/download-dialog
|
2022-06-22 11:36:20 +03:00 |
|
mushka
|
c3fa818c13
|
added mock data
|
2022-06-22 11:34:26 +03:00 |
|
TimofeyBoyko
|
36835eea13
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-06-22 11:17:05 +03:00 |
|
|
|
f2da6fc55c
|
Merge pull request #693 from ONLYOFFICE/feature/docspace
Feature/docspace
|
2022-06-22 11:55:36 +04:00 |
|
|
|
417b13b844
|
Fix Bug 57704: left/right arrow select item in compact view
|
2022-06-21 22:09:40 +03:00 |
|
|
|
7f77633a92
|
Fix Bug 57639: different actions menu
|
2022-06-21 21:41:29 +03:00 |
|
|
|
aad8a92b4c
|
RoomInvite replaced by LinkInvite
|
2022-06-21 20:33:05 +03:00 |
|
|
|
bbcd5b7382
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 19:45:30 +03:00 |
|
|
|
95c23cc95a
|
Fix Bug 57680 - Mobile. Couldn't not select more than 1 tile in thumbnails mode
|
2022-06-21 19:45:16 +03:00 |
|
|
|
b30ec3c1bd
|
Files: added room api docs
|
2022-06-21 18:43:54 +03:00 |
|
|
|
231c99a5f0
|
fix Bug 57693
|
2022-06-21 17:52:32 +03:00 |
|
|
|
1aadf26fe2
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-21 17:05:04 +03:00 |
|
|
|
fa3b7003ba
|
Fixed Bug 57701 - Client.HotKeys. Fixed the creation of the document
|
2022-06-21 16:49:30 +03:00 |
|
|
|
8ad241fc6d
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 16:21:47 +03:00 |
|
|
|
9c1eb1e185
|
Fixed Bug 57683 - Client.Info. Hidden "Content" field for third-party folders
|
2022-06-21 16:21:07 +03:00 |
|
|
|
aaf331557e
|
Fixed Bug 57646: Web: Files: Added the ending of file/folder creation
|
2022-06-21 16:07:21 +03:00 |
|
mushka
|
d489d4ee4d
|
fixed Header and added dark theme
|
2022-06-21 14:38:40 +03:00 |
|
|
|
14eb735fed
|
Fixed Bug 57642 - Docs: Actions: Fixed form template creation after resizing window to tablet size
|
2022-06-21 14:10:01 +03:00 |
|
TimofeyBoyko
|
4bf70be27d
|
Web:Files: applied changes from 610f738
|
2022-06-21 14:09:58 +03:00 |
|
|
|
6f0fa1555f
|
Web: Files: Removed static description from GalleryForm item info
|
2022-06-21 13:23:50 +03:00 |
|
|
|
66cdf0bdaf
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 13:03:31 +03:00 |
|
mushka
|
343dd2174c
|
files
|
2022-06-21 12:42:58 +03:00 |
|
|
|
610f738ca6
|
Web: Files: Fix password protected files operations
|
2022-06-21 12:29:26 +03:00 |
|
|
|
a4d33b9939
|
Fixed Bug 57660 - Docs: Fixed display info-panel content for forms-gallery
|
2022-06-21 12:19:15 +03:00 |
|
TimofeyBoyko
|
3f1623716d
|
Web:Files: move global event args to one payload
|
2022-06-21 11:30:26 +03:00 |
|
TimofeyBoyko
|
7726b8f9ef
|
Web:Files:CreateEvent: add onClose function after user click save button
|
2022-06-21 11:29:31 +03:00 |
|
TimofeyBoyko
|
c4de30ee0f
|
Web:Files:HOCs: fix warning after removing fileActionStore
|
2022-06-21 11:28:44 +03:00 |
|
TimofeyBoyko
|
c4483f2892
|
Merge branch 'develop' into feature/create-from-modal
|
2022-06-21 11:05:53 +03:00 |
|
|
|
494b2bc1e0
|
merge
|
2022-06-21 10:53:05 +03:00 |
|
|
|
0a27a98511
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-21 10:52:53 +03:00 |
|
|
|
18f944b2c6
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 10:10:12 +03:00 |
|
|
|
b2f9e35041
|
Fixed Bug 57663: Client: Files: Fixed displaying icons for connecting accounts
|
2022-06-20 22:42:48 +03:00 |
|
|
|
fc567a1040
|
Fixed Bug 57637: Client: Files: Fixed icon size for editing item
|
2022-06-20 22:09:36 +03:00 |
|
|
|
72f0ac4f9b
|
file converter server: fixed bugs
|
2022-06-20 19:58:08 +03:00 |
|
TimofeyBoyko
|
9a58baa435
|
Web:Files: delete filesActionStore and useless code after adding global events for create and rename file/folder
|
2022-06-20 19:01:10 +03:00 |
|
|
|
c3faf982c5
|
Files: fix download
|
2022-06-20 18:29:07 +03:00 |
|
|
|
aa53acccd9
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-20 17:54:19 +03:00 |
|
|
|
fa458aa1a5
|
Web: Files: fixed selection when clicking on badge or file/folder name
|
2022-06-20 17:54:14 +03:00 |
|
|
|
e0a23a91a3
|
Web: Files: added error on download action
|
2022-06-20 17:50:32 +03:00 |
|
|
|
5ac3d3e5b6
|
Web: Files: added new logic when select file format
|
2022-06-20 17:28:55 +03:00 |
|
|
|
34cb63fd3f
|
fix
|
2022-06-20 17:23:32 +03:00 |
|
|
|
5a06f23111
|
fix Bug 57618
|
2022-06-20 17:14:37 +03:00 |
|
|
|
03e756277b
|
fixed warnings
|
2022-06-20 17:01:59 +03:00 |
|
|
|
ac94309716
|
Web: Files: removed custom format from download dialog selector
|
2022-06-20 16:55:21 +03:00 |
|
|
|
3b5cb1b7fe
|
Web: Files: fixed display of items in download dialog
|
2022-06-20 16:33:05 +03:00 |
|
|
|
c192e0fd0a
|
Merge branch 'release/v1.2' into feature/download-dialog
|
2022-06-20 15:41:53 +03:00 |
|
|
|
79cce9cfc1
|
Web: Files: Added file ext after update date on File Row view mode
|
2022-06-20 15:35:27 +03:00 |
|
TimofeyBoyko
|
fe4f4ac80d
|
Web:Files:GlobalEvents: delete console log
|
2022-06-20 15:06:04 +03:00 |
|
|
|
a8bf285dc1
|
Web: Files: Added and applied new modern row mode
|
2022-06-20 15:01:54 +03:00 |
|
|
|
57916d46ba
|
Files: removed unnecessary, refactor
|
2022-06-20 14:39:08 +03:00 |
|
|
|
44747e837a
|
Files: tag id replaced with tag name
|
2022-06-20 14:30:49 +03:00 |
|
|
|
2eb288f307
|
Web: Files: removed comments
|
2022-06-20 14:28:10 +03:00 |
|
|
|
9e99fed6b5
|
Web: Files: added new DownloadDialog, refactoring
|
2022-06-20 14:18:40 +03:00 |
|
|
|
231daa2e0b
|
Web: removed useless translations
|
2022-06-20 14:16:11 +03:00 |
|
|
|
e6602a22ab
|
Files: fix copyas
|
2022-06-20 13:21:40 +03:00 |
|
|
|
e68ac70005
|
Merge branch 'develop' into feature/docspace
|
2022-06-20 12:15:08 +03:00 |
|
TimofeyBoyko
|
413962bbaa
|
Web:Files:GlobalEvents: add title validation on rename
|
2022-06-20 12:14:49 +03:00 |
|
TimofeyBoyko
|
efa8a383d7
|
Web:Files:GlobalEvents: change dialog styles for device width less than 400px
|
2022-06-20 11:29:47 +03:00 |
|
mushka
|
d4cfd235fc
|
merge with release
|
2022-06-20 11:25:28 +03:00 |
|
TimofeyBoyko
|
991e3cc012
|
Web:Files:GlobalEvents: refactoring rename and create events
|
2022-06-20 11:05:58 +03:00 |
|
|
|
efba3d824e
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-20 11:04:43 +03:00 |
|
TimofeyBoyko
|
0bfa280c38
|
Web:Files:FilesActionsStore: fix rename event
|
2022-06-20 10:34:59 +03:00 |
|
|
|
e2bdaa40e4
|
Web: Files: returned set filter url.
|
2022-06-20 10:30:18 +03:00 |
|
TimofeyBoyko
|
c3620c6c91
|
Web:Files:Components: add rename and create global events
|
2022-06-20 10:09:03 +03:00 |
|
TimofeyBoyko
|
a71e637c98
|
Web:Files:FilesActionsStore: add type as argument to editCompleteAction and change setAction from fileActionStore to global event
|
2022-06-20 10:08:28 +03:00 |
|
TimofeyBoyko
|
71fea71531
|
Web:Files:FilesActionsStore: add type as argument to editCompleteAction and change setAction from fileActionStore to global event
|
2022-06-20 10:07:07 +03:00 |
|
TimofeyBoyko
|
3703693b34
|
Web:Files:DialogsStore: change create oform file from docx from action store to global event
|
2022-06-20 10:05:31 +03:00 |
|
TimofeyBoyko
|
fd3a45f301
|
Web:Files:ContextOptionStore: change rename file or folder from action store to global event
|
2022-06-20 10:04:33 +03:00 |
|
TimofeyBoyko
|
441786da21
|
Web:Files:Home: change create oform file from action store to global event
|
2022-06-20 10:02:48 +03:00 |
|
|
|
e2cee2c2fc
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.FederatedLogin/OAuth20Token.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/ASC.Resource.Manager/Program.cs
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# config/appsettings.json
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/ThumbnailSettings.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
# products/ASC.Files/Core/Model/SessionModel.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
# products/ASC.Files/Core/ThirdPartyApp/Token.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/DocStore
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Server/ASC.People.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
# web/ASC.Web.Core/PublicResources/Resource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
# web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-06-19 22:44:48 +03:00 |
|
|
|
72b0a81f51
|
fix
|
2022-06-17 20:51:01 +03:00 |
|
|
|
8ea04bcc81
|
Merge branch 'develop' into feature/12.0
# Conflicts:
# common/ASC.MessagingSystem/Data/MessagesRepository.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
|
2022-06-17 19:19:00 +03:00 |
|
|
|
c83bd81bd5
|
Web: Files: Styled table badge (more closer to figma)
|
2022-06-17 18:21:16 +03:00 |
|
TimofeyBoyko
|
ae66c8e4f6
|
Web:Files:Section:Header: change create file or folder from action store to global event
|
2022-06-17 16:16:14 +03:00 |
|
TimofeyBoyko
|
10a745c1e6
|
Web:Files:withHotkeys: change create file or folder from action store to global event
|
2022-06-17 16:15:54 +03:00 |
|
TimofeyBoyko
|
a029abadf5
|
Web:Files:EmptyContainer: change create file or folder from action store to global event
|
2022-06-17 16:00:15 +03:00 |
|
TimofeyBoyko
|
0ab899d5c9
|
Web:Files: add GlobalEvents component
|
2022-06-17 15:51:55 +03:00 |
|
TimofeyBoyko
|
1a34e82155
|
Web:Files:Article: change create file or folder from action store to global event
|
2022-06-17 15:49:29 +03:00 |
|
|
|
080cde2888
|
Web: Files: Fix empty second line of FileRowContent on third-party folders
|
2022-06-17 15:39:45 +03:00 |
|
TimofeyBoyko
|
bac023f04c
|
Web:Files:Constants: add global events name
|
2022-06-17 14:54:17 +03:00 |
|
|
|
29d3bb3fee
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-17 13:18:03 +03:00 |
|
|
|
597db4684e
|
refactoring
|
2022-06-17 13:17:53 +03:00 |
|
|
|
3684775829
|
Files: security fix
|
2022-06-17 12:27:07 +03:00 |
|
|
|
ff6a403c3c
|
Files: refactor
|
2022-06-17 11:22:55 +03:00 |
|
|
|
fa9316807c
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-17 11:15:51 +03:00 |
|
|
|
06ce968e9f
|
Web: Files: fixed edit component styles
|
2022-06-17 11:15:32 +03:00 |
|
|
|
2b8b7c9898
|
Files: added permission check for link generation
|
2022-06-17 10:59:03 +03:00 |
|
|
|
1f65ea35a7
|
Files: removed unnecessary
|
2022-06-17 10:52:32 +03:00 |
|
