Commit Graph

20131 Commits

Author SHA1 Message Date
51315f68ba WEb: Components: HelpButton: Added tooltipMaxWidth prop. 2022-03-21 17:26:55 +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
010697ec97
Merge pull request #592 from ONLYOFFICE/bugfix/refactoring-fix
Bugfix/refactoring fix
2022-03-21 17:54:54 +04:00
3e4e1bf0b0
Merge pull request #588 from ONLYOFFICE/feature/license-refactor
Feature/license refactor
2022-03-21 17:51:42 +04:00
6e4761b8c2 Systemd package moved to shared ASC.Api.Core 2022-03-21 16:40:09 +03:00
d3d3d4d7ff fix 2022-03-21 16:16:55 +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
eff37db49c Web: Client: fixed maintenance timeout 2022-03-21 16:15:56 +05:00
Timofey Boyko
0d7371b8f7 Web:People: remove old filter 2022-03-21 13:57:18 +03:00
Timofey Boyko
8355fa388d Web:Common: remove old filter component, update import and change themes 2022-03-21 13:56:42 +03:00
6215091502 Web: Added red border when file is not selected and restore button clicked. 2022-03-21 13:53:59 +03:00
Timofey Boyko
c625b6c6ca Web:Files: remove old filter 2022-03-21 13:41:36 +03:00
Timofey Boyko
a73a6b8bc7 Web:Common: fix padding of section-wrapper-content for row/table view 2022-03-21 13:39:05 +03:00
Timofey Boyko
0fdf5dd328 Web:People: delete useless code 2022-03-21 13:20:46 +03:00
mushka
f659632108 fixed exception warning 2022-03-21 13:12:45 +03:00
Timofey Boyko
fadec284ed Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-21 12:56:14 +03:00
Timofey Boyko
d19406a592 Web:Components: fix padding-top for button in group menu item of table container 2022-03-21 12:48:05 +03:00
d3ce16c5e5 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-21 12:39:42 +03:00
c3860bbbf3 Web: Components: ComboBox: fix arrow color 2022-03-21 12:38:28 +03:00
46d238e520 Web: Components: TableContainer: fix group menu item icon color 2022-03-21 12:33:28 +03:00
Timofey Boyko
df3c3aa574 Web:People: delete useless code 2022-03-21 12:29:26 +03:00
Timofey Boyko
17f1bcc446 Web:Files: fix display sub-menu for mobile and tablet devices 2022-03-21 12:26:30 +03:00
26272fc2a5 Web: Separated BackupTypes constant. 2022-03-21 12:06:10 +03:00
Timofey Boyko
d3500f83e1 Web:Compoentns: fix display dropdown for low width devices 2022-03-21 12:04:09 +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
8a7641798b Web: Backup: Added organization name from settings. 2022-03-21 11:15:51 +03:00
mushka
c51d920092 vr-1.2 actualization 2022-03-21 11:13:56 +03:00
8aa98ef263 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-21 11:06:16 +03:00
33e6f6faaf Web: Client: NavMenu: fix logo padding 2022-03-21 11:05:42 +03:00
73033f996d Web: Files: Added missing translation. 2022-03-21 10:49:32 +03:00
f54b0d0f25 Web: files: Deleted useless code. 2022-03-21 10:45:55 +03:00
4e4bea4d02 Web: Components: Deleted useless classname. 2022-03-21 10:44:52 +03:00
5bcc792132 Merge branch 'feature/license-refactor' of github.com:ONLYOFFICE/AppServer into feature/license-refactor 2022-03-21 10:37:02 +03:00
da31770f18 added deleted license headers 2022-03-21 10:36:07 +03:00
mushka
3e951462d8 fixes with unexpcted info loading 2022-03-21 10:24:43 +03:00
3f957337b8 WEb: Common: Deleted useless code. 2022-03-21 10:14:26 +03:00
mushka
a80ada2c37 added current folder info visualization on room-info button click 2022-03-20 22:29:42 +03:00
eec0545987 fixed build. 2022-03-20 18:24:26 +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
07c618b23d update packages 2022-03-20 16:44:49 +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
61f4f33990 fixed DistributedTask 2022-03-19 18:48:51 +03:00
1c74b5702b Files:fix notify 2022-03-19 18:05:26 +03:00
bdc263796a Web: Client: Tests: update screenshots 2022-03-19 00:02:56 +03:00
b1f5d54cb1 Web: Client: Tests: fix create user page render 2022-03-18 23:50:28 +03:00