Commit Graph

6378 Commits

Author SHA1 Message Date
Timofey Boyko
448d4eecd5 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-28 18:34:05 +03:00
Timofey Boyko
9d428ffa3d Web:Files: increase rect of 24px folder-icon 2022-03-28 18:32:11 +03:00
f55a6cb6b2 Merge branch 'feature/backend-refactor' into feature/remove-serviceprovider
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-03-28 17:45:42 +03:00
c2cfdfd2d1 Files: fix 2022-03-28 17:37:28 +03:00
004435936e Web: Files: Hotkeys: fixed keyboard input 2022-03-28 17:05:47 +03:00
mushka
5a4b36df74 translation tweaks 2022-03-28 16:53:27 +03:00
dfa851221f Web: moved load language path to utils, added clearInterval 2022-03-28 17:33:42 +05:00
e7e0f5327a Merge branch 'feature/backend-refactor' into feature/log-refactor
# Conflicts:
#	common/ASC.Api.Core/GlobalUsings.cs
2022-03-28 14:29:36 +03:00
bd6753df91 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-03-28 14:17:59 +03:00
e5229f12f5 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
#	common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	common/ASC.Data.Backup.Core/EF/BackupsContext.cs
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
#	common/ASC.Data.Storage/Configuration/StorageSettings.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	products/ASC.Files/Core/Core/ResponseStream.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
2022-03-28 12:53:15 +03:00
mushka
290e65288e tweaked getting selection, removed unused code 2022-03-28 12:44:35 +03:00
Timofey Boyko
d02b67e41f Web:Files:Settings: fix content-width for conntected clouds settings 2022-03-28 12:36:23 +03:00
Timofey Boyko
4161b16817 Web:Files:Settings: fix horizontal scroll of tabs when settings is mount 2022-03-28 12:21:25 +03:00
mushka
8df40dbca7 changed dateTime format to vary with language settings 2022-03-28 12:01:12 +03:00
Timofey Boyko
bdea1715a4 Web:Files:Settings: fix content-width 2022-03-28 11:58:57 +03:00
32186f21e7 ResponseStream: fix 2022-03-28 11:57:18 +03:00
Timofey Boyko
b13336a8be Web:Files:Settings: fix bug when forcesave show old value 2022-03-28 11:51:54 +03:00
Timofey Boyko
66bb0df3a5 Web:Files:Settings: fix bugs when storeForcesave show old value 2022-03-28 11:48:54 +03:00
9264302ec4 Thumbnail: async operations. Changed thumbnails format requested from editors to jpg. 1879 issue 2022-03-28 11:38:50 +03:00
Timofey Boyko
d2e192d048 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-28 11:15:47 +03:00
mushka
05fe1a8cb9 removed unused InfoPanelStore methods 2022-03-28 11:14:48 +03:00
Timofey Boyko
e2fa31d9a4 Web:Files:Settings: add tabs for page; move AdminSettings, CommonSettings to functional components; move StyledSettings to separate file 2022-03-28 11:14:31 +03:00
Timofey Boyko
a9c3d66f0d Web:Files:Article: disable mobile main button for settings page 2022-03-28 11:12:15 +03:00
Timofey Boyko
3418cb1ca7 Web:Files: add new keys 'Admin' and 'Common' for settings of eu and ru locales 2022-03-28 11:10:22 +03:00
7abe990d96 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-28 12:36:11 +05:00
81f3a1fb09 DistributedTaskQueue refactoring. set MaxThreadsCount to 1 2022-03-26 16:31:13 +03:00
31c37dfc46 Web: Files: Tile: fix checked style 2022-03-26 15:05:56 +03:00
bbd199bf6d Web: Files: DownloadAppList: use theme 2022-03-26 13:59:22 +03:00
067fb96060 DistributedTaskQueue: refactoring 2022-03-25 21:00:43 +03:00
abae61f2db IDE1006 2022-03-25 19:26:06 +03:00
cd1d3058ff DistributedTaskQueue refactoring 2022-03-25 19:15:28 +03:00
mushka
b0dd8d1077 fixed content gaps and deleted loaders 2022-03-25 18:58:07 +03:00
100e581f1c IDE1006 2022-03-25 17:54:34 +03:00
6fe2178e3e Notify: refactoring 2022-03-25 17:51:03 +03:00
mushka
cd22e7da41 fixed withFileActions bug 2022-03-25 17:09:24 +03:00
mushka
ae33a464e3 removed onFileClick action 2022-03-25 17:04:55 +03:00
mushka
fcff7d4354 Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel 2022-03-25 16:20:48 +03:00
mushka
9de69a3ff6 some tweaks 2022-03-25 12:10:23 +03:00
Timofey Boyko
fe3f9b59e8 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-25 10:11:00 +03:00
Timofey Boyko
7f6461e3b9 Web:Files:Panels: add selected options for group and people selector 2022-03-25 10:07:17 +03:00
1922da4ab9 merge 2022-03-24 20:56:51 +03:00
c7712fd7dc Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-24 18:01:09 +03:00
mushka
cd82919062 merge with feature/virtual-rooms-1.2 2022-03-24 18:00:31 +03:00
mushka
1d80eb1a9d refactored open/close behaviour + redesigned checkbox header 2022-03-24 17:57:36 +03:00
Timofey Boyko
6a9806117b Web:Common:AdvancedSelector: fix bugs with re-render list, add onSelectAll function, move to functional components renders option and group list, create group header component, change props isChecked and isIndeterminate for groups, fix default styles for advanced selector with aside view 2022-03-24 17:52:21 +03:00
1ee814a2ef Merge branch 'feature/backend-refactor' into feature/files-controller-refactoring
# Conflicts:
#	common/ASC.Api.Core/GlobalUsings.cs
#	products/ASC.Files/Server/GlobalUsings.cs
2022-03-24 17:11:33 +03:00
9fbb192fd3 Test: fix packages 2022-03-24 17:00:02 +03:00
9174a20871 Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
#	packages/asc-web-common/api/portal/index.js
#	packages/asc-web-common/components/Loaders/index.js
#	packages/asc-web-common/store/SettingsStore.js
#	packages/asc-web-components/file-input/index.js
#	packages/asc-web-components/modal-dialog/index.js
#	packages/asc-web-components/save-cancel-buttons/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListRow.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/src/store/ContextOptionsStore.js
#	public/locales/de/Common.json
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/NavMenu/index.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
#	web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-rights.js
#	web/ASC.Web.Client/webpack.config.js
#	web/ASC.Web.Editor/src/Editor.jsx
2022-03-24 14:39:52 +03:00
66ccce8eb5 Settings: refactoring 2022-03-24 12:35:00 +03:00
f464eb6e35 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-24 12:08:58 +05:00
cb4d39e427 refactor 2022-03-23 19:23:25 +03:00
a13d1ccf3b Merge branch 'develop' into feature/backup 2022-03-23 18:12:01 +03:00
ff54e42a27 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-03-23 17:59:05 +03:00
a857089ee6 renamed 2022-03-23 17:33:43 +03:00
079618e4e2 refactor 2022-03-23 16:08:27 +03:00
63e12f49ab merge from feature/backend-refactor 2022-03-23 14:56:18 +03:00
cee4ca3a4e Files: fix recent 2022-03-23 14:53:49 +03:00
643bf726b3 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-23 16:10:11 +05:00
5b793b1772 Web: Files: added section bar 2022-03-23 16:08:05 +05:00
0ff67e1f92 Web: Files: Article: fix crash on personal 2022-03-22 17:19:52 +03:00
64cd23a7bf Files: fix download as 2022-03-22 16:54:54 +03:00
244e345ac6 Merge 'feature/backend-refactor' into feature/builder-extensions 2022-03-22 15:57:46 +03:00
4e78af53f9 refactoring DistributedTaskQueue 2022-03-22 15:10:05 +03:00
mushka
bd20587a2b fixed context menu and added first-close-disable interaction 2022-03-22 14:59:34 +03:00
2be8ecfb22 Files: added license header 2022-03-22 13:34:46 +03:00
ee8b6eafc1 Web: Files: deleted useless folders after merge. 2022-03-22 13:22:51 +03:00
62fbab1185 Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
251f149eb6 Web: Revert withoutBodyScroll after merge. 2022-03-22 13:19:35 +03:00
e4eeb59138 Web: Files: UploadDataStore: fix folder update 2022-03-22 12:54:15 +03:00
476cec2607 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-22 14:50:23 +05:00
d13ef622f8 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-22 14:16:20 +05:00
82c96d160f Merge branch 'feature/backend-refactor' into feature/files-mapping 2022-03-22 12:09:41 +03:00
9bea7b362b Merge branch 'develop' into feature/backup 2022-03-22 09:59:55 +03:00
172eaa8985
Merge pull request #589 from ONLYOFFICE/feature/update-packages
Feature/update packages
2022-03-21 22:24:11 +04:00
b4c44d1b09 Merge branch 'feature/backend-refactor' into feature/files-controller-refactor 2022-03-21 19:03:57 +03:00
cf8c1ba3ff Merge branch 'feature/backend-refactor' into feature/files-mapping 2022-03-21 18:52:09 +03:00
mushka
c4b470f98a bugfixes 2022-03-21 18:42:23 +03:00
ae490c3290 System.Linq.Async package moved to share ASC.Core.Common 2022-03-21 18:32:04 +03:00
a6f111463b refactor 2022-03-21 18:11:26 +03:00
7f81a77556 Redis.Newtonsoft, Redis.AspNetCore moved to shared ASC.Api.Core 2022-03-21 17:53:23 +03:00
b50b2c3c6f Web: Files: SharingPanel: delete useless 2022-03-21 17:41:28 +03:00
e9671701cb Autofact.Extensions.DependencyInjection package moved to ASC.Api.Core 2022-03-21 17:39:01 +03:00
8381b3e9c6 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-21 17:15:55 +03:00
6e4761b8c2 Systemd package moved to shared ASC.Api.Core 2022-03-21 16:40:09 +03:00
a3f85f8e0b Merge branch 'feature/backend-refactor' into feature/update-packages 2022-03-21 14:44:30 +03:00
df76602dac Web: Files: fixed on close banner function 2022-03-21 16:37:03 +05:00
Timofey Boyko
8355fa388d Web:Common: remove old filter component, update import and change themes 2022-03-21 13:56:42 +03:00
Timofey Boyko
c625b6c6ca Web:Files: remove old filter 2022-03-21 13:41:36 +03:00
mushka
f659632108 fixed exception warning 2022-03-21 13:12:45 +03:00
Timofey Boyko
17f1bcc446 Web:Files: fix display sub-menu for mobile and tablet devices 2022-03-21 12:26:30 +03:00
a72106dfae Web: Files: Deleted useless file after merge. 2022-03-21 11:55:38 +03:00
5420ceff44 Web: Deleted useless files. 2022-03-21 11:52:26 +03:00
Timofey Boyko
685c49552a Merge branch 'feature/refactoring-pagelayout' into feature/virtual-rooms-1.2 2022-03-21 11:41:51 +03:00
Timofey Boyko
133dfa3426 Web: fix article main button view (now correct display mobile main button when view port is increased/decreased) 2022-03-21 11:40:40 +03:00
mushka
61aac91d07 fix arrow keys not working with showCurrentFolder === true 2022-03-21 11:28:40 +03:00
mushka
c51d920092 vr-1.2 actualization 2022-03-21 11:13:56 +03:00
73033f996d Web: Files: Added missing translation. 2022-03-21 10:49:32 +03:00
mushka
3e951462d8 fixes with unexpcted info loading 2022-03-21 10:24:43 +03:00
mushka
a80ada2c37 added current folder info visualization on room-info button click 2022-03-20 22:29:42 +03:00
679aecbc76 Merge branch 'feature/backend-refactor' into feature/license-refactor
# Conflicts:
#	common/services/ASC.Webhooks.Service/WebhookSender.cs
#	products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
2022-03-20 16:47:31 +03:00
868492b562 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Core.Common/Billing/BillingClient.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Notify/Context.cs
#	common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs
#	common/ASC.FederatedLogin/Helpers/RequestHelper.cs
#	common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/FacebookLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/GosUslugiLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/LinkedInLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/MailRuLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/VKLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/WordpressLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/YandexLoginProvider.cs
#	common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/WebhookSender.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
#	products/ASC.Files/Core/Helpers/DocuSignHelper.cs
#	products/ASC.Files/Core/Helpers/EasyBibHelper.cs
#	products/ASC.Files/Core/Helpers/WordpressHelper.cs
#	products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/Token.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
2022-03-19 22:16:03 +03:00
1c74b5702b Files:fix notify 2022-03-19 18:05:26 +03:00
21a8c0e0fc removed httpclient ctor 2022-03-18 22:34:01 +03:00
ef600712b8
Merge pull request #591 from ONLYOFFICE/feature/refactoring-pagelayout
Feature/refactoring pagelayout
2022-03-18 19:09:26 +03:00
37e0a4715c fix tests 2022-03-18 18:44:00 +03:00
Timofey Boyko
b2924c2914 Web:Files: delete useless code 2022-03-18 18:29:41 +03:00
Timofey Boyko
77709f3399 Web:Files: synchronized first display first loader 2022-03-18 18:25:33 +03:00
f8dadfa3e5 Web: Files: Fix isPrivacyFolder 2022-03-18 18:01:46 +03:00
72cef1b6aa Web: Files: Fix re-render ArticleMainButtonContent on history changes (removed useless goToHomePage() method) 2022-03-18 18:00:59 +03:00
Timofey Boyko
f4c591cf78 Web:Files: fix navigation item click 2022-03-18 16:36:12 +03:00
Timofey Boyko
7c33680d73 Web:Files: add title for icon button in third party list 2022-03-18 16:29:10 +03:00
Timofey Boyko
9bbcbb8e54 Web:Files: restore code 2022-03-18 15:50:18 +03:00
8163d018cd Web: Files: added timeout for banner display 2022-03-18 16:11:11 +05:00
Timofey Boyko
4e3ab4a8a8 Web:Files:Settings: fix render connected clouds list 2022-03-18 13:56:26 +03:00
9d8906f61a Web: Files: deleted check maintenance prop for section header 2022-03-18 15:50:18 +05:00
Timofey Boyko
75a8ee5641 Web:Files:Settings: fix render connected clouds list 2022-03-18 13:43:39 +03:00
Timofey Boyko
2c51acc636 Web:Files:Settings: change button size and position in connected clouds 2022-03-18 13:26:25 +03:00
ff79769307 Files: improvements for automapping 2022-03-18 11:51:33 +03:00
Timofey Boyko
27fab6de23 Merge branch 'feature/virtual-rooms-1.2' into feature/refactoring-pagelayout 2022-03-18 11:05:58 +03:00
645607aae5 default IOptionsMonitor<ILog> => ILog 2022-03-18 11:04:29 +03:00
568f427957 IDE1006 2022-03-17 19:57:02 +03:00
Timofey Boyko
4023359af3 Web:Files: fix warning 'each Each child in a list should have a unique 'key' prop' for main button 2022-03-17 18:45:50 +03:00
6b3f9a71ad IDE0065 2022-03-17 18:23:19 +03:00
11004ab61c IDE0161 2022-03-17 18:13:38 +03:00
6a09cf47e9 IDE0044 2022-03-17 18:07:17 +03:00
80eb1c8257 IDE0011 2022-03-17 18:01:39 +03:00
69950c9d8c IDE0007 2022-03-17 17:55:19 +03:00
72cee6362f CA1841 2022-03-17 17:53:05 +03:00
717456d71d CA1805 2022-03-17 17:33:16 +03:00
mushka
2d452e18da fixed after-merge room-info button deletion and configured new showCurrentFolderInfo feature 2022-03-17 17:16:21 +03:00
ac2d679e71
Merge pull request #517 from ONLYOFFICE/feature/login-redesign
Feature/login redesign
2022-03-17 16:29:22 +03:00
ea502301de Web: Files: Deleted horizontal scroll from Sharing panel. 2022-03-17 16:03:23 +03:00
89beecde71 replaced IOptionsMonitor<ILog> => ILog 2022-03-17 13:13:52 +03:00
679d0d51aa Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-03-17 12:42:26 +03:00
38d685c4ce
Merge branch 'develop' into feature/backup 2022-03-17 11:03:09 +03:00
fb675dd307 updated packages 2022-03-16 16:37:56 +03:00
e407031ec0 Web: Files: Tile: fix background 2022-03-16 16:07:55 +03:00
Timofey Boyko
7a22ead503 Web:Files: change page layout to section in file pages 2022-03-16 15:26:52 +03:00
Timofey Boyko
15c5844349 Web:Files:Components: delete useless code from article main button 2022-03-16 15:25:18 +03:00
2d42d75a6a Files: fix 2022-03-16 13:45:03 +03:00
c001de8f74 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-03-16 13:03:29 +03:00
bada6b7dd0 Web: Files: Hotkeys: added new translations 2022-03-16 11:32:19 +03:00
Timofey Boyko
dde7fb6694 Web:Files:Store: add isArticleLoaded and setIsArticleLoaded for remove article loaders 2022-03-16 11:29:04 +03:00
Timofey Boyko
429925248f Web:Files: move routes and article to functional components 2022-03-16 11:28:24 +03:00
Timofey Boyko
85180f2fc1 Web:Files: refactoring new article and remove re-renders 2022-03-16 11:27:46 +03:00
0cd4cb49ed Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
#	packages/asc-web-components/modal-dialog/index.js
#	packages/asc-web-components/themes/dark.js
#	public/locales/de/Common.json
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
#	web/ASC.Web.Login/src/Login.jsx
2022-03-16 11:03:07 +03:00
65db98f65c added new license headers 2022-03-15 21:00:53 +03:00
3d50d7977b removed past license headers 2022-03-15 19:59:24 +03:00
d2855e47a4 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-03-15 19:17:44 +03:00
Timofey Boyko
c85f40078a Web:Files: rename 'catalog' to 'article' and update exports/imports 2022-03-15 17:18:46 +03:00
7bb1f0c755 Files: added DownloadModelBinder 2022-03-15 16:47:37 +03:00
e0df6dfa12 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-03-15 15:23:59 +03:00
cc293f60c2 Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel 2022-03-15 14:11:00 +03:00
Timofey Boyko
6d6d3432e6 Web:Files: update imports after move tree folders from old article 2022-03-15 13:46:28 +03:00
Timofey Boyko
db50dfe801 Web:Files: remove old article components 2022-03-15 13:45:23 +03:00
Timofey Boyko
0917fd8684 Web:Files:Components: move TreeFolders from article to folder tree body 2022-03-15 12:33:46 +03:00
209d7bd750 Web: Files: Deleted unused code. 2022-03-15 12:29:09 +03:00
5c820fdcd5 Index: create index only in service 2022-03-14 21:47:34 +03:00
mushka
338c66720b resolved missed merge conflicts 2022-03-14 19:10:10 +03:00
mushka
57f75cd8a5 merge with feature/virtual-rooms-1.2 2022-03-14 18:53:15 +03:00
5fa55cd5ad Web: Files: fixed onClose Bar function 2022-03-14 19:39:41 +05:00
Timofey Boyko
7567a66119 Web:Files: remove catalog from pages and refactoring 2022-03-14 16:54:03 +03:00
882507496d added new routing mechanism 2022-03-14 13:57:59 +03:00
0547ed5b73 Merge branch 'hotfix/campaigns-banner' of github.com:ONLYOFFICE/AppServer into hotfix/campaigns-banner 2022-03-14 15:55:15 +05:00
115aa461c6 Merge branch 'develop' into hotfix/campaigns-banner 2022-03-14 15:51:38 +05:00
8cd7050f7c Web: Files: added banner url check 2022-03-14 15:45:32 +05:00
1e89c8dd57 Web: Files: Hotkeys: fixed HotkeysPanel scroll 2022-03-14 13:19:51 +03:00
5ec18f6e86 Web: Files: fixed open media files 2022-03-14 12:19:48 +03:00
af772531ad added extension method for services 2022-03-14 12:07:37 +03:00
4b62ba5560 Web: Files: fixed HotkeysPanel translations 2022-03-14 11:43:40 +03:00
58eb82acff
Merge pull request #515 from ONLYOFFICE/feature/hotkeys
Feature/hotkeys
2022-03-11 19:09:21 +03:00
bbd659f142 Web: Files: Hotkeys: removed ZoomIn/ZoomOut 2022-03-11 18:45:02 +03:00
63a0522ce5 Web: Files: Hotkeys: fixed onKeyDown, fixed clearActiveOperations 2022-03-11 18:24:13 +03:00
36f32478af Web: Files: removed hotkey "Go to the top of the list" 2022-03-11 18:14:39 +03:00
31dac3853f Web: Files: fixed clearActiveOperations 2022-03-11 18:13:58 +03:00
8d74491b6a Merge branch 'feature/hotkeys' of github.com:ONLYOFFICE/AppServer into feature/hotkeys 2022-03-11 16:57:47 +03:00
07e32b405f Web: Files: fixed scrolling of hotkeys, fixed hotkeys when some dialog is open 2022-03-11 16:57:35 +03:00
86288df521 Web: Files: Added command+Backspace for delete on Macbook Air 2020 2022-03-11 15:04:07 +03:00
mushka
25ad35ab6a added Normal Touchscreen/Desktop differentiation 2022-03-11 13:41:48 +03:00
ac052a979d Web: Files: fixed hotkey border 2022-03-11 13:23:33 +03:00
c9871f4b1b Web: Files: removed actions hotkeys 2022-03-11 11:22:52 +03:00
b6c810daa2 Web: Files: fixed hotkeys selection 2022-03-11 10:49:15 +03:00
5e2f575483 added builders extensions 2022-03-10 20:30:29 +03:00
3dfe77a96e Web: Files: fixed setHotkeyPanelVisible 2022-03-10 18:42:12 +03:00
80e7064dcf Web: Files: fixed AltKey for macOS 2022-03-10 18:31:14 +03:00
8a8451bf7b Web: Files: fixed hotkeys scroll 2022-03-10 18:07:28 +03:00
dc273d4a21 Web: Files: Changed translations keys. 2022-03-10 17:52:26 +03:00
d793b099ff WEb: Files: Changed translation keys. 2022-03-10 17:45:13 +03:00
afb0510fd6 Web: Moved translations to Common file (az). 2022-03-10 17:30:30 +03:00
1cb0345483 Web: Moved translations to Common file (bg). 2022-03-10 17:26:47 +03:00
ca45ca77d7 Web: Moved translations to Common file (cs). 2022-03-10 17:25:20 +03:00
31e5c4bb36 Web: Files: fixed backToParentFolder for root folder 2022-03-10 17:21:27 +03:00
685e7e0193 Web: Moved translations to Common file (de). 2022-03-10 17:18:26 +03:00
9a4715fad7 Web: Moved translations to Common file (el). 2022-03-10 17:10:09 +03:00
8dff5425b7 Web: Files: removed HotkeysCreateForm, HotkeysCreateFormFromFile translation keys 2022-03-10 17:03:28 +03:00
5d4a54e1ce Web: Moved translations to Common file (en). 2022-03-10 16:57:56 +03:00
a403bdbf03 Web: Moved translations to Common file (es). 2022-03-10 16:56:15 +03:00
7b5f653ead Web: Moved translations to Common file (fi). 2022-03-10 16:54:21 +03:00
a94be67b16 Web: Moved translations to Common file (fr). 2022-03-10 16:52:35 +03:00
84f1a05ba3 Web: Moved translations to Common file (it). 2022-03-10 16:50:04 +03:00
9467226e09 Web: Moved translations to Common file (ja). 2022-03-10 16:48:45 +03:00
05da08892d Web: Moved translations to Common file (ko). 2022-03-10 16:47:13 +03:00
e15108a62c Web: Moved translations to Common file (lo). 2022-03-10 16:45:08 +03:00
0efd8d1126 Web: Moved translations to Common file (lv). 2022-03-10 16:43:34 +03:00
d2e1f04d8a Web: Moved translations to Common file (nl). 2022-03-10 16:41:37 +03:00
56b4eece3d Web: Moved translations to Common file (pl). 2022-03-10 16:39:54 +03:00
4eae2cdb3c Web: Moved translations to Common file (pt). 2022-03-10 16:38:25 +03:00
34e1f835fe Web: Moved translations to Common file (pt-BR). 2022-03-10 16:36:25 +03:00
8ba131d52d Web: Moved translations to Common file (ro). 2022-03-10 16:33:31 +03:00
0c9713c65b Web: Moved translations to Common file (sk). 2022-03-10 16:31:02 +03:00
bff2518bf9 Web: Moved translations to Common file (sl). 2022-03-10 16:28:38 +03:00
500945a6da Web: Moved translations to Common file (tr). 2022-03-10 16:26:11 +03:00
e663d59aeb Web: Moved translations to Common file (vi). 2022-03-10 16:25:27 +03:00
297394f359 Web: Moved translations to Common file (uk). 2022-03-10 16:24:18 +03:00
8080e416df Web: Moved translations to Common file (zh-CN). 2022-03-10 16:23:06 +03:00
7bca87c34d Web: Moved translations to the Common (ru). 2022-03-10 16:21:24 +03:00
mushka
c3c59ceaff changed size names in app buttons 2022-03-10 15:59:04 +03:00
d45373619d update StackExchange.Redis.*.dll 2022-03-10 15:56:30 +03:00
3a0d6a49fd Merge branch 'feature/virtual-rooms-1.2' into feature/add-units 2022-03-10 15:12:08 +03:00
ad68b7dc60 Merge branch 'feature/backend-refactor' into feature/files-mapping 2022-03-10 14:15:49 +03:00
Timofey Boyko
c45baeb3c9 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-10 14:01:29 +03:00
c9f8064224 Merge branch 'feature/backend-refactor' into feature/files-refactor 2022-03-10 12:31:05 +03:00
26066ccb7f Merge branch 'feature/backend-refactor' into feature/files-mapping 2022-03-10 12:19:18 +03:00
64dfd61858 Merge branch 'develop' into feature/backup 2022-03-10 12:15:26 +03:00
d1c7fa2df6 add new file (VersionBadge), edit bg, pl, pt-BR, tr (UploadPanel) 2022-03-10 11:01:32 +03:00
7abd6c9812 Web: Files: fixed showHotkeyBorder prop 2022-03-10 10:24:08 +03:00
a00ed16990 Merge branch 'feature/virtual-rooms-1.2' into feature/hotkeys
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
2022-03-10 10:16:01 +03:00
2a045fc1ef Web: Files: removed contextMenuData, moved getContextModel to withFileActions HOC 2022-03-10 10:09:10 +03:00
b9719755be Added ThrowIfNull 2022-03-09 20:15:51 +03:00
3bbf82d918 add new lines 2022-03-09 19:07:24 +03:00
061a2f7365 Files: added mapping 2022-03-09 18:12:23 +03:00
7cb193ef07 Merge branch 'feature/virtual-rooms-1.2' into feature/hotkeys
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
2022-03-09 16:03:08 +03:00
a1c2380007 Web: Files: moved contextMenuData to withFileActions HOC 2022-03-09 15:51:20 +03:00
13ff29413d FIles: added mapping 2022-03-09 15:07:57 +03:00
884b141c35 Web: Files: Table: fixed hotkey styles 2022-03-09 14:50:52 +03:00
3447a59628 Web: Files: Row: fixed hotkey styles 2022-03-09 13:53:25 +03:00
639a68edfd Merge branch 'feature/virtual-rooms-1.2' into feature/hotkeys
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
2022-03-09 13:26:11 +03:00
6dc335f10b Files: added file mapping 2022-03-09 12:18:33 +03:00
2585c22b3b merge from feature/backend-refactor 2022-03-09 12:10:30 +03:00
f401926098 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-03-09 11:56:03 +03:00
28423d6eb3 Merge branch 'develop' into feature/hotkeys
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
#	products/ASC.Files/Client/src/store/index.js
2022-03-09 10:32:00 +03:00
Timofey Boyko
b572b84410 Web:Files: change import context menu for tile view 2022-03-09 10:29:01 +03:00
Timofey Boyko
c3b901c64a Web:Files:Components: fixed catalog drag and drop 2022-03-09 10:17:38 +03:00
b1664fd2e5 Files: renamed helper 2022-03-08 20:43:47 +03:00
358ea18086 Files: divided files controller helper 2022-03-08 20:37:23 +03:00
Timofey Boyko
f144c3ab64 Web:Files:Catalog: add translate 'Upload' for main button mobile 2022-03-05 19:27:46 +03:00
Timofey Boyko
1e82028465 Web:Files: add new key 'Upload' for ru and en locales 2022-03-05 19:25:16 +03:00
Timofey Boyko
32a7a41f87 Web:Files: add support i18next for 'view' 2022-03-05 19:04:53 +03:00
Timofey Boyko
98ac515760 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-05 18:51:07 +03:00
Timofey Boyko
e273391c00 Web:Files:Section: add theme support for desktop sort button in tile view 2022-03-05 18:51:00 +03:00
78fafb08ab Microsoft.NET.Sdk.Worker 2022-03-05 18:38:42 +03:00
84810de125 Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
#	packages/asc-web-components/context-menu/index.js
#	packages/asc-web-components/row/index.js
#	packages/asc-web-components/table-container/TableRow.js
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
2022-03-05 17:52:01 +03:00
Timofey Boyko
d85ae13b7a Web:Files: fix table view in dark-theme 2022-03-05 17:47:56 +03:00
e58d3324f2 Files: renamed api parameters 2022-03-05 17:41:47 +03:00
1a9ced4901 Web: Files: fixed context menu opening 2022-03-05 17:36:04 +03:00
Timofey Boyko
cc19cb38c2 Web:Files:Components: fix click item for catalog body for mobile devices 2022-03-05 16:57:30 +03:00
9b035a6519 Web: Files: updated HotkeysPanel, fixed styles 2022-03-05 16:19:24 +03:00
fd5ca3efbe Web: Files: added hotkey for upload folders 2022-03-05 14:23:35 +03:00
mushka
7f7acd14ef header button to toast 2022-03-05 13:32:27 +03:00
mushka
0ac0f8f508 fixed opening on context menu click 2022-03-05 13:11:14 +03:00
22517301d5 Web: Files: added new hotkeys 2022-03-05 12:20:26 +03:00
d035deba31 Merge branch 'feature/backend-refactor' into feature/files-refactor
# Conflicts:
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Server/GlobalUsings.cs
2022-03-05 11:50:42 +03:00
475269ee84 Merge branch 'feature/backend-refactor' into feature/people-refactor
# Conflicts:
#	products/ASC.Files/Core/Model/FileEntryWrapper.cs
#	products/ASC.Files/Core/Model/FileShareWrapper.cs
#	products/ASC.Files/Core/Model/FileWrapper.cs
#	products/ASC.Files/Core/Model/FolderWrapper.cs
#	products/ASC.People/Server/GlobalUsings.cs
2022-03-05 11:27:58 +03:00
99378a027e Csproj: ImplicitUsings 2022-03-05 11:20:05 +03:00
77144d6f3c added mapping 2022-03-05 10:28:50 +03:00
Timofey Boyko
a2e9518d3d Web:Common: add 1.2.1 view styles and scroll for context menu 2022-03-04 20:55:28 +03:00
da73ff523c Files: resolve names for mapping, add mapping 2022-03-04 16:40:28 +03:00
1d398d47f6 Merge branch 'feature/backend-refactor' into feature/files-refactor 2022-03-04 13:25:12 +03:00
mushka
384a92c30f finished merging 2022-03-04 12:52:34 +03:00
Timofey Boyko
8f5ba33849 Web:Files: add theme as props in sharing panel 2022-03-04 11:12:53 +03:00
Timofey Boyko
680c050e11 Web:Files:Section: add sort button in folder header for tile view 2022-03-04 10:19:11 +03:00
a4891f136a
Merge pull request #570 from ONLYOFFICE/feature/asc-files-core-refactor
Feature/asc files core refactor
2022-03-03 23:12:19 +03:00
3d2d6b12e6 Files: removed unnecessary usings 2022-03-03 21:19:52 +03:00
f82d9ffaf8 Files: used WebApplicationBuilder, implicit usings 2022-03-03 21:15:48 +03:00
99f0f702f8 Files: refactor 2022-03-03 21:01:34 +03:00
ee027f8508 Files: rremoved unnecessary 2022-03-03 20:55:16 +03:00
c827c628c5 Files: separated controllers 2022-03-03 20:33:11 +03:00
Timofey Boyko
a0d2131d1e Web:Files: fix width table group menu for desktop 2022-03-03 16:46:24 +03:00
Timofey Boyko
61a1a7fbd3 Web:Files:Filter: disable sort in recent and favorites folder 2022-03-03 16:25:34 +03:00
mushka
a0aa53d57a fix Home config import duplication 2 2022-03-03 16:17:55 +03:00
Timofey Boyko
0743c5bf83 Web:Files:Filter: disable sort in recent and favorites folder 2022-03-03 16:10:03 +03:00
mushka
55d9a76f4d fix Home config import duplication 2022-03-03 15:45:16 +03:00
mushka
a11a40e61b fix import mixins 2022-03-03 14:38:28 +03:00
b909b5c031 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-03 14:37:14 +03:00
7105484604 Web: Files: fixed context menu opening 2022-03-03 14:37:08 +03:00
418ca246c8 Merge branch 'feature/backend-refactor' into feature/people-refactor
# Conflicts:
#	products/ASC.People/Server/Startup.cs
2022-03-03 14:35:22 +03:00
mushka
807fe75b72 change code formatting 3 2022-03-03 14:25:10 +03:00
4e08a6f2cf Files: fix 2022-03-03 14:25:09 +03:00
1b352c76f6 Added using AddControllers method 2022-03-03 14:04:17 +03:00
mushka
6b88a2dd43 change code formatting 2 2022-03-03 13:59:20 +03:00
mushka
424a7a7e3c change code formatting 2022-03-03 13:43:43 +03:00
74345b1c3c Web: Files: ContextOptionsStore fixed onClickLinkEdit, fixed imports 2022-03-03 12:37:54 +03:00
Timofey Boyko
c4993b9d34 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-03 12:37:43 +03:00
Timofey Boyko
c83c09c1f1 Web:Files:Pages: fix double header when table group is active 2022-03-03 12:37:10 +03:00
ba2fc9fe88 Merge branch 'develop' into refactoring/refactoring-context-menu 2022-03-03 12:33:42 +03:00
54cecbd5b3 Web: Files: fixed ContextOptionsStore errors 2022-03-03 12:29:48 +03:00
5026e8d916 Web: Files: fixed re-rendering when checkbox is clicked 2022-03-03 12:19:47 +03:00
b38c8f1103 Web: Files: fix unnecessary request 2022-03-03 11:08:25 +03:00
Timofey Boyko
ac17eca7a1 Web:Files:Pages: fix styles for section header 2022-03-03 10:05:25 +03:00
cb22e644cc
Merge branch 'develop' into feature/hotkeys 2022-03-03 10:02:16 +03:00
2978adcdf3 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-03-02 18:18:05 +03:00
1abe5f4122 Merge branch 'develop' into feature/login-redesign 2022-03-02 18:15:03 +03:00
mushka
e77a97e105 added checkbox menu interaction and new opening mechanics 2022-03-02 17:19:19 +03:00
2cc05247db Web: Files: removed withContextOptions HOC, added ContextOptionsStore, moved getting context model to open function 2022-03-02 15:15:03 +03:00
mushka
fd46496544 some tweaks 2022-03-02 13:06:02 +03:00
f57cff1dcc Merge branch 'develop' into feature/backup 2022-03-02 11:21:57 +03:00
a73606f1f9 Files: used implicit usings 2022-03-01 17:26:30 +03:00
0cf7b005d1 Merge branch 'feature/backend-refactor' into feature/asc-files-core-refactor 2022-03-01 17:06:27 +03:00
Timofey
19937f50dd Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-01 22:05:41 +08:00
7a669f9293 Files: refactor 2022-03-01 16:10:58 +03:00
609427bf20 merge from feature/backend-refactor 2022-03-01 15:57:49 +03:00
b48bd37ea6 Merge branch 'feature/backend-refactor' into feature/people-refactor 2022-03-01 15:27:07 +03:00
Timofey
37ccc2b542 Web:Files:Tests: update model screenshots 2022-03-01 19:46:21 +08:00
Timofey
c3db45f2b3 Web:Files:Tests: update mock method 2022-03-01 19:46:03 +08:00
Timofey
9d871fd7c0 Web:Files:Tests: add new tests for catalog, context menu and filter 2022-03-01 19:45:39 +08:00
Timofey
581405c0dc Web:Files:Tests: add new endpoints 2022-03-01 19:43:35 +08:00
Timofey
3278dcb059 Web:Files:Tests: update mock data and add new 2022-03-01 19:42:32 +08:00
f3afd79a3f Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
#	packages/asc-web-common/components/AdvancedSelector/AdvancedSelector.js
#	packages/asc-web-common/components/AdvancedSelector/sub-components/Selector.js
#	packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
#	packages/asc-web-common/components/PageLayout/index.js
#	packages/asc-web-common/store/SettingsStore.js
#	packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/context-menu/styled-context-menu.js
#	packages/asc-web-components/drop-down/index.js
#	packages/asc-web-components/link-with-dropdown/index.js
#	packages/asc-web-components/row/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	packages/asc-web-components/themes/dark.js
#	products/ASC.Files/Client/public/images/files.menu.svg
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Badges.js
#	products/ASC.Files/Client/src/components/QuickButtons.js
#	products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/ModalView.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	products/ASC.People/Client/public/images/people.menu.svg
#	products/ASC.People/Client/src/components/GroupSelector/index.js
#	products/ASC.People/Client/src/components/PeopleSelector/index.js
#	products/ASC.People/Client/src/pages/Home/Section/Body/RowView/userContent.js
#	products/ASC.People/Client/src/pages/Home/index.js
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header-nav.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/nav-item.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/profile-menu.js
#	web/ASC.Web.Client/src/components/pages/Home/index.js
2022-03-01 13:50:26 +03:00
fe77e0a331 fix build 2022-03-01 13:36:34 +03:00
mushka
c5e5ad0908 several items update 2022-03-01 12:24:56 +03:00
8474cb8d37 refactor 2022-02-28 23:25:25 +03:00
c887362ea3 People: separated people controller 2022-02-28 22:23:39 +03:00
1665fe7bf6 People: refactor 2022-02-28 21:54:08 +03:00
bbe35750f5 Merge branch 'develop' into hotfix/campaigns-banner 2022-02-28 19:08:13 +05:00
mushka
d4c4a6ba82 exclude buffer selection 2022-02-28 16:48:04 +03:00
6531d2448e Web: Files: changed maintenance checkout 2022-02-28 18:22:36 +05:00
9aff975cd4 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-02-28 16:17:48 +03:00
mushka
518abb7a2f added sever files, fixed closeOnclick interaction, added alternative thumbnail and implemented destructorization 2022-02-28 15:53:46 +03:00
e5ba722f7c Web: Files: fixed withBadges, withContent HOCs re-render 2022-02-28 15:46:06 +03:00
d5c55fc384 FilesCore: reorganize dto 2022-02-28 14:26:29 +03:00
b56260bc38 FilesCore: Models to ApiModels 2022-02-28 14:15:31 +03:00
49a4c9e570 FilesCore: modet to dto 2022-02-28 14:06:30 +03:00
2092430bcf Web: Files: fixed getting filesList 2022-02-28 11:03:42 +03:00
4659e25661 Merge branch 'develop' into feature/hotkeys
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/FilesPanels/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2022-02-28 10:46:26 +03:00
e6f111f651 Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor 2022-02-25 20:16:00 +03:00
5a19f21902
Merge pull request #559 from ONLYOFFICE/feautre/asc-messaging-system-refactor
Feautre/asc messaging system refactor
2022-02-25 17:53:44 +03:00
cae358636e
Merge branch 'develop' into bugfix/fixed-dates-in-profile 2022-02-25 17:51:06 +03:00
04737a6c6d Web: Client: Files: Added fixedDirection property for AccessComboBox 2022-02-25 17:45:20 +03:00
71bfac088f added usings 2022-02-25 17:31:21 +03:00
66021c7885 Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor 2022-02-25 17:30:59 +03:00
6495da0d0b Merge branch 'feature/backend-refactor' into feature/asc-messaging-system-refactor 2022-02-25 16:34:15 +03:00
ebf90d8aa9
Merge pull request #564 from ONLYOFFICE/feature/asc-files-service-refactor
Feature/asc files service refactor
2022-02-25 16:27:20 +03:00
65216705a5 FilesService: added missing configure logging 2022-02-25 16:20:05 +03:00
b1e5a6e28b Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor 2022-02-25 16:16:56 +03:00
f07aa0a183 Merge branch 'develop' into feature/backup
# Conflicts:
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
#	config/nginx/onlyoffice.conf
#	packages/asc-web-common/constants/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/webpack.config.js
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
2022-02-25 16:05:43 +03:00
9c3274b5bd FilesCore: refactor 2022-02-25 13:38:21 +03:00
85b03b508a FilesCore: added IServiceScopeFactory, refactor 2022-02-25 13:04:37 +03:00
63d10f291f Web: Files: RowView: Fixed editing input style for screens less than small tablet 2022-02-25 12:18:27 +03:00
6c0f8c18e1 Web: Files: EditingWrapperComponent: Fixed padding for table view 2022-02-25 12:16:12 +03:00
e319a5e31f Web: Files: EditingWrapperComponent: Fixed padding for cancel button 2022-02-25 11:07:08 +03:00
178671ea56 FilesService: add implicit 2022-02-24 23:55:29 +03:00
ad30ce26ce FilesService: refactor 2022-02-24 23:28:07 +03:00
6d4f615350 FilesCore: used files-scoped namespaces 2022-02-24 22:34:26 +03:00
b6b8c4c7b5 FilesCore: privated properties replaced by private fields, added braces 2022-02-24 21:36:57 +03:00
8da91b7f8f Web: Files: VersionHistory fixed Ipad styles 2022-02-24 19:29:01 +03:00
159dfe0028 Web: Files: fixed VersionHistory page styles 2022-02-24 19:13:40 +03:00
4be97f77e7 Merge branch 'bugfix/refactoring-table-view' of github.com:ONLYOFFICE/AppServer into bugfix/refactoring-table-view 2022-02-24 18:55:09 +03:00
9f5bae12ad Web: Files: fixed EditingWrapperComponent styles 2022-02-24 18:54:55 +03:00
7377507481 Web: Files: RowView: Fixed right margin for last badge item 2022-02-24 18:03:27 +03:00
7bc4e141fa Web: Files: RowView: Fixed displaying for quick buttons for small tablet width 2022-02-24 17:43:37 +03:00
7e67e9a41c merge from develop 2022-02-24 17:33:02 +03:00
7995f38ef9 Web: Files: Badges/QuickButtons: Restored show logic after merge 2022-02-24 16:36:06 +03:00
d7566d0743 Merge branch 'develop' into feature/backend-refactor 2022-02-24 14:55:31 +03:00
0814ce13cc Merge branch 'develop' into bugfix/refactoring-table-view 2022-02-24 14:53:43 +03:00
6fb3547652 Files: fix sql 2022-02-24 14:45:58 +03:00
51f79fa0e9 Files: fix track 2022-02-24 14:35:14 +03:00
9d0f1500e6 Files: fix routing 2022-02-24 13:24:39 +03:00
0f44d7fb4b FilesService: refactor 2022-02-24 13:03:21 +03:00
04b0ac97d2 FilesService: used BackgroundService 2022-02-24 12:51:12 +03:00
f59fbe71ba Merge branch 'develop' into bugfix/refactoring-table-view 2022-02-24 12:04:15 +03:00
b974d15ddd FilesService: used file-scoped namespaces 2022-02-24 12:00:51 +03:00
b3317f35fc FilesService: used WebApplicationBuilder 2022-02-24 11:58:41 +03:00
fab67e575c Web: Files: fixed files loader styles 2022-02-24 11:44:40 +03:00
34f6570027 Web: Files: fixed files loader 2022-02-24 11:42:33 +03:00
89f72e80ad FilesService: private properties replaced by private fields, added braces 2022-02-24 11:40:21 +03:00
d7f16aa96d Web: Table: fixed table styles 2022-02-24 11:20:32 +03:00
6925a83060 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Common/Caching/ICacheNotify.cs
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Common/Caching/MemoryCacheNotify.cs
#	common/ASC.Common/Threading/DistributedTaskProgress.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
#	common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
#	common/ASC.Data.Backup.Core/Tasks/RestorePortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/BaseStorage.cs
#	common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSessionHolder.cs
#	common/ASC.Data.Storage/CrossModuleTransferUtility.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
#	common/ASC.Data.Storage/Extensions.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/IDataStore.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Data.Storage/S3/S3UploadGuard.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/ASC.Data.Storage/StorageHandler.cs
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/ASC.Data.Storage/WebPath.cs
#	common/services/ASC.ApiSystem/Controllers/PortalController.cs
#	common/services/ASC.AuditTrail/AuditEventsRepository.cs
#	common/services/ASC.AuditTrail/AuditReportCreator.cs
#	common/services/ASC.AuditTrail/LoginEventsRepository.cs
#	products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/ILinkDao.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IProviderInfo.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/ITagDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/LinkDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/Entries/ChunkedUploadSession.cs
#	products/ASC.Files/Core/Core/Entries/EncryptionKeyPair.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/FilesIntegration.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Security/IFileSecurity.cs
#	products/ASC.Files/Core/Core/Security/ISecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoBase.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/Box/BoxProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoBase.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/Dropbox/DropboxProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoBase.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/GoogleDrive/GoogleDriveProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoBase.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/OneDrive/OneDriveProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.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.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/RegexDaoSelectorBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.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/Core/Thirdparty/Sharpbox/SharpBoxProviderInfo.cs
#	products/ASC.Files/Core/Helpers/DocuSignHelper.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/Helpers/PathProvider.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/SearchHandler.cs
#	products/ASC.Files/Core/Model/FileEntryWrapper.cs
#	products/ASC.Files/Core/Model/FileOperationWraper.cs
#	products/ASC.Files/Core/Model/FileWrapper.cs
#	products/ASC.Files/Core/Model/FolderContentWrapper.cs
#	products/ASC.Files/Core/Model/FolderWrapper.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/NotifyService/NotifyClient.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/Utils/ChunkedUploadSessionHolder.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileShareLink.cs
#	products/ASC.Files/Core/Utils/FileSharing.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Core/Utils/MailMergeTask.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Api/Controllers/AuthenticationController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/BuildVersion.cs
#	web/ASC.Web.Core/Files/DocumentService.cs
#	web/ASC.Web.Core/Files/DocumentServiceLicense.cs
#	web/ASC.Web.Core/Helpers/ApiSystemHelper.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
#	web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
#	web/ASC.Web.Core/Recaptcha.cs
#	web/ASC.Web.Core/Sms/SmsManager.cs
#	web/ASC.Web.Core/Sms/SmsProvider.cs
#	web/ASC.Web.Core/Sms/SmsSender.cs
#	web/ASC.Web.Core/SpaceUsageStatManager.cs
#	web/ASC.Web.Core/Utility/UrlShortener.cs
2022-02-23 22:42:34 +03:00
8563fbc373 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Api.Core/Middleware/CommonApiResponse.cs
#	common/ASC.Api.Core/Middleware/ResponseWrapper.cs
#	common/ASC.Core.Common/Context/Impl/SubscriptionManager.cs
#	products/ASC.Files/Core/Configuration/FilesSettings.cs
#	products/ASC.Files/Core/Core/FileStorageService.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/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
2022-02-23 17:37:34 +03:00
d65d30ec24 Test: disable socketio 2022-02-23 17:10:04 +03:00
81b33e673a Files: fix warnings 2022-02-23 17:09:32 +03:00
3d4e000778 Merge branch 'develop' into feature/async
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.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/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
2022-02-23 16:01:55 +03:00
1379800971 Files: fix async 2022-02-23 13:42:14 +03:00
deeff80f26 Web: TabLe: refactoring table view 2022-02-22 16:00:26 +03:00
32868de412 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	public/locales/de/Common.json
2022-02-22 13:53:00 +03:00
a797b3490e Files: async fixes 2022-02-22 12:22:15 +03:00
Timofey
dfde24aff5 Web:Files: refactroing filter 2022-02-22 17:11:21 +08:00
2a7616585e Web: Components: fixed table view 2022-02-22 12:10:27 +03:00
3aeac42444 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
#	common/services/ASC.ElasticSearch/Service/Settings.cs
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
#	common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	packages/asc-web-components/table-container/TableRow.js
#	products/ASC.Files/Client/public/locales/az/Home.json
#	products/ASC.Files/Client/public/locales/bg/Home.json
#	products/ASC.Files/Client/public/locales/bg/Translations.json
#	products/ASC.Files/Client/public/locales/cs/Home.json
#	products/ASC.Files/Client/public/locales/de/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/de/Home.json
#	products/ASC.Files/Client/public/locales/de/Translations.json
#	products/ASC.Files/Client/public/locales/de/UploadPanel.json
#	products/ASC.Files/Client/public/locales/el/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/el/Home.json
#	products/ASC.Files/Client/public/locales/en/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/en/Home.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/en/UploadPanel.json
#	products/ASC.Files/Client/public/locales/es/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/es/Home.json
#	products/ASC.Files/Client/public/locales/es/UploadPanel.json
#	products/ASC.Files/Client/public/locales/fi/Home.json
#	products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/fr/Home.json
#	products/ASC.Files/Client/public/locales/fr/Translations.json
#	products/ASC.Files/Client/public/locales/it/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/it/Home.json
#	products/ASC.Files/Client/public/locales/it/Translations.json
#	products/ASC.Files/Client/public/locales/it/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ja/Home.json
#	products/ASC.Files/Client/public/locales/ja/UploadPanel.json
#	products/ASC.Files/Client/public/locales/lv/Home.json
#	products/ASC.Files/Client/public/locales/nl/Home.json
#	products/ASC.Files/Client/public/locales/nl/Translations.json
#	products/ASC.Files/Client/public/locales/pl/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/pt-BR/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/Translations.json
#	products/ASC.Files/Client/public/locales/ro/Home.json
#	products/ASC.Files/Client/public/locales/ro/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/ru/Home.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/public/locales/ru/UploadPanel.json
#	products/ASC.Files/Client/public/locales/sk/Home.json
#	products/ASC.Files/Client/public/locales/tr/Home.json
#	products/ASC.Files/Client/public/locales/uk/Home.json
#	products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/vi/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
#	products/ASC.Files/Client/src/HOCs/withBadges.js
#	products/ASC.Files/Client/src/HOCs/withContent.js
#	products/ASC.Files/Client/src/components/Badges.js
#	products/ASC.Files/Client/src/components/EditingWrapperComponent.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	public/locales/de/Common.json
2022-02-21 22:22:38 +03:00
9fe4971055 add mapping, project reorganization 2022-02-21 18:35:57 +03:00
mushka
80603b2343 added panel close on background click in tablet- view 2022-02-21 15:45:47 +03:00
mushka
524ac82b9e added Show Info option to file context menu 2022-02-21 14:39:47 +03:00
7ad1462b81 Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor 2022-02-21 12:51:45 +03:00
5b5ed4a4e3 Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor 2022-02-18 18:55:59 +03:00
9c08a5c52e Feed: moved feed migrations to ASC.Feed, resolved usings 2022-02-18 18:30:53 +03:00
Timofey
e796f7fcc6 Web:Files:Filter: add sort on tablet and mobile view 2022-02-18 22:10:20 +08:00
Timofey
8c73f93eed Web:Files:Catalog: fix section rerender when catalog opening on mobile 2022-02-18 20:46:49 +08:00
91133d243e
Merge pull request #537 from ONLYOFFICE/feature/asc-feed-aggreagator-refactor
Feature/asc feed aggreagator refactor
2022-02-18 13:50:46 +03:00
955de9efa5 FilesService: add services 2022-02-18 12:48:19 +03:00
bd9d2e0bb1 FilesService: removed unnecessary 2022-02-17 18:03:09 +03:00
604019eead FilesService: add services 2022-02-17 17:58:30 +03:00
7db322fc8b
Merge branch 'develop' into feature/login-redesign 2022-02-17 14:09:22 +03:00
e848d5d979 Web: Files: Table/Filter: Restored sorting inside favorite folder 2022-02-17 12:45:55 +03:00
mushka
4039499a1f added loader and shared-to users 2022-02-17 11:46:20 +03:00
Vashchuk Nikita
0a384b2c28 refactoring async methods 2022-02-16 15:57:37 +03:00
638390de68
Merge pull request #540 from ONLYOFFICE/feature/hide-filter-sort
Feature/hide filter sort
2022-02-16 15:14:10 +03:00
924d9bda34 Web: Files: Table: Added hiding sort actions inside TableHeader at recent and favorites folder 2022-02-16 13:58:57 +03:00
ee40f9ba7f Web: Files: Filter: Added hiding sort items inside filter at recent and favorites folder 2022-02-16 13:55:42 +03:00
62b4b55dca Web: Files: moved isEdit, titleWithoutExt to inject 2022-02-16 13:18:14 +03:00
5322ed2cec Fixed Bug 55530 - Client.Files. Fixed the display of the file name when renaming. 2022-02-16 12:03:22 +03:00
Timofey
2f7b4e1453 Web:Files:Panels: change group selector view in add groups panel 2022-02-16 16:53:22 +08:00
5e12bf583c Fix Bug 54825 - Client.Clouds.‘Uncaught (in promise) undefined’ 2022-02-15 18:39:14 +03:00
76c422d3c0 FilesService: fixed starting service 2022-02-15 18:25:25 +03:00
4ac03079ca Merge branch 'feature/backend-refactor' into feature/asc-feed-aggreagator-refactor 2022-02-15 18:21:53 +03:00
7f4d29da03 Web: Editor: fixed canConvert 2022-02-15 16:57:32 +03:00
ead3820e66 Merge branch 'feature/refactoring-files-formats' of github.com:ONLYOFFICE/AppServer into feature/refactoring-files-formats 2022-02-15 16:33:00 +03:00
51a9e48a1b Web: Files: fixed encryptionUploadDialog 2022-02-15 16:32:21 +03:00
1aa99f3802 Web: Files: removed TODO 2022-02-15 16:31:57 +03:00
Vashchuk Nikita
b17119b711 refactoring async methods 2022-02-15 16:20:06 +03:00
b04b6d897d Merge branch 'hotfix/v1.1.1' into feature/refactoring-files-formats 2022-02-15 16:13:52 +03:00
ccc0838269 Web: Files: removed FormatsStore, added getting file formats from SettingsStore 2022-02-15 15:58:31 +03:00
fb5edcf627 Fixed Bug 51725 - Client.Clouds.Changed title of third party folder. 2022-02-15 15:57:11 +03:00
mushka
125796a112 body content 2022-02-15 14:57:36 +03:00
Timofey
2bd0760168 Web:Files:Section: add new id for tile folder header 2022-02-15 19:04:31 +08:00
Timofey
d18fbd6950 Web:Files:Filter: change sort data 2022-02-15 19:02:01 +08:00
ca7140186d Core: resolve properties for mapping, add mapping/projection 2022-02-15 13:30:05 +03:00
d64fe81e5e Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-15 13:29:36 +03:00
2ba6962e8c Fix Bug 55527 - Client.Files. Badge ‘New’ on Save as/Create a copy/Upload. 2022-02-15 13:01:37 +03:00
Vashchuk Nikita
41d994ca32 fix 2022-02-15 12:42:47 +03:00
175e07b1d2 Web: Files: fix ads timeout 2022-02-15 11:34:40 +03:00
aae5f2c3b0 Web: Files: move new banner from hotfix/campaigns banner 2022-02-15 11:33:43 +03:00
12243c7cc8 fix 55063 2022-02-15 11:01:27 +03:00
Timofey
7ac52c29c3 Web:Files:Panels: change view and add new props for people selector for change owner and add user panel 2022-02-15 15:20:05 +08:00
0ef8f00fb3 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-15 10:14:19 +03:00
a1eb764f2b Web:Files:Fix display images in media viewer. 2022-02-15 10:13:54 +03:00
51d1fb09cf
Merge pull request #527 from ONLYOFFICE/bugfix/fixed-files-file-status
Web: Files: fixed files fileStatus
2022-02-14 22:17:58 +03:00
d973e0ee54 Web: Files: Added displaying New badge on socket s:modify-folder->create 2022-02-14 22:17:19 +03:00
b67d3cc11c Merge branch 'feature/backend-refactor' into feature/asc-elasticsearch-refactor 2022-02-14 19:03:56 +03:00
Timofey
434e9cba40 Web:Files:Section: add new class name for folder tile header 2022-02-14 23:00:27 +08:00
bb06f8aeef Web: Client: fix ads timeout 2022-02-14 17:51:40 +03:00
6ba390ea62 Web: Files: AutoBackup: optimization, refactoring. 2022-02-14 17:06:26 +03:00
65de0c4e97
Merge branch 'develop' into feature/hotkeys 2022-02-14 16:41:05 +03:00
a62f0ca3e3 Web: Client: fix update banner 2022-02-14 16:05:10 +03:00
b7d6454dbe Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner 2022-02-14 14:39:31 +03:00
9ef0e03143 Fixed Bug 55330 - Client. Fixed header title. 2022-02-14 14:31:31 +03:00
Timofey
154fdb4a81 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-02-14 18:54:34 +08:00
Timofey
2059be9a95 Web:Files:Section: connect new filter input with backend API 2022-02-14 18:52:38 +08:00
8288f3c4ca Common: return IEventBust to ICacheNotify 2022-02-14 12:05:05 +03:00
70b3231756 Merge branch 'develop' into feature/backup 2022-02-14 10:51:38 +03:00
Vashchuk Nikita
631dcdc2e8 Merge branch 'develop' into feature/async
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
#	common/ASC.Data.Storage/CrossModuleTransferUtility.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/Extensions.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Data.Storage/StorageHandler.cs
#	common/services/ASC.ApiSystem/Controllers/PortalController.cs
#	products/ASC.CRM/Server/Api/VoipController.cs
#	products/ASC.CRM/Server/Core/Dao/RelationshipEventDao.cs
#	products/ASC.CRM/Server/Utils/PdfCreator.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/TagDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.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/CrossDao.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/GoogleDrive/GoogleDriveStorage.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/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.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.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/SearchHandler.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.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/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/MailMergeTask.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	web/ASC.Web.Core/Files/DocumentService.cs
#	web/ASC.Web.Core/Files/DocumentServiceLicense.cs
#	web/ASC.Web.Core/Helpers/ApiSystemHelper.cs
#	web/ASC.Web.Core/Recaptcha.cs
#	web/ASC.Web.Core/Utility/UrlShortener.cs
2022-02-12 00:51:48 +03:00
Vashchuk Nikita
4fb0bf2e46 fix 2022-02-11 21:18:12 +03:00