Commit Graph

2128 Commits

Author SHA1 Message Date
ae8ee2a057 Merge branch 'develop' into feature/selectiona-area-dashboard 2023-09-07 15:14:30 +04:00
bca06df106
Merge pull request #1621 from ONLYOFFICE/feature/content-width-dividers
Feature/content width dividers
2023-09-07 13:03:50 +04:00
gazizova-vlada
1e8529209a Web:Change isFullLength to scale. 2023-09-07 11:18:24 +03:00
3a0b0623b4 Merge branch 'develop' into bugfix/modal-height 2023-09-07 10:46:08 +04:00
gazizova-vlada
e3d777f543 Web:Components:Fix width. 2023-09-06 17:25:00 +03:00
gazizova-vlada
bc0b143ff8 Web:Components:Fix BottomLine. 2023-09-06 16:56:10 +03:00
gazizova-vlada
cf94bc5c6f Web:Change smallBottomLine to isFullLength. 2023-09-06 14:29:38 +03:00
gazizova-vlada
ca4201061b Merge branch 'develop' into feature/content-width-dividers 2023-09-06 13:06:16 +03:00
96b916d81e Merge branch 'hotfix/v1.1.3' into develop 2023-09-05 09:45:42 +04:00
83bc2edd02 Web: bump version to v1.1.3 2023-09-04 17:43:24 +04:00
Viktor Fomin
68101de683 Components: ModalDialog: fix height 2023-09-04 12:05:39 +03:00
0d870f8e77
Merge pull request #1641 from ONLYOFFICE/bugfix/calendar-ui
bugfix/calendar-ui
2023-09-02 00:08:24 +04:00
f8ddf23e16
Merge pull request #1660 from ONLYOFFICE/bugfix/dropdown-edits
Bugfix/dropdown edits
2023-09-01 23:58:27 +04:00
1561f12249 Merge branch 'develop' into bugfix/fixed-tile-view 2023-09-01 22:59:09 +04:00
4681517910 Merge branch 'develop' into bugfix/mobile-button-blinking 2023-09-01 22:49:29 +04:00
d77e8a1771 Merge branch 'develop' into feature/rtl-interface-client
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
#	packages/common/store/SettingsStore.js
2023-09-01 16:42:08 +02:00
116290cc0d Merge branch 'develop' into feature/selectiona-area-dashboard 2023-09-01 16:48:31 +03:00
c4d2048e3a Web: Login: Added error handler. 2023-09-01 10:28:52 +03:00
DmitrySychugov
ea048ebce2 Web: Components: MainButtonMobile - fixed blinking when opening 2023-08-31 16:51:01 +05:00
48852756bf Web: Files: removed useless 2023-08-29 17:44:50 +03:00
d2deafb62b Web: Files: fixed tile view 2023-08-29 17:43:21 +03:00
6560116b71 Web: Components: SelectionArea: fixed RTL 2023-08-29 14:57:09 +03:00
50084f80df Web: Components: SelectionArea: refactoring 2023-08-29 14:54:14 +03:00
Subhonbek
087711acc8 Merge branch 'develop' into feature/rtl-interface-client 2023-08-29 12:41:12 +03:00
bc6b0d9e0d Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/Billing/ITariffService.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Notify/EmailSenderSink.cs
#	common/ASC.Core.Common/Notify/JabberSenderSink.cs
#	common/ASC.Core.Common/Notify/PushSenderSink.cs
#	common/ASC.Core.Common/Notify/Telegram/TelegramSenderSink.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/Tools/ASC.Migration.Creator/ASC.Migration.Creator.csproj
#	migrations/mysql/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
#	migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs
#	migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
#	migrations/mysql/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
#	migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
#	migrations/postgre/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/Files.jsx
#	packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/backup-list/index.js
#	packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/client/src/pages/PortalSettings/categories/security/index.js
#	packages/client/src/pages/Profile/Section/Header/index.js
#	packages/common/store/SettingsStore.js
#	packages/components/drop-down/index.js
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/SecurityController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	products/ASC.Files/Server/Api/TagsController.cs
#	products/ASC.People/Server/Api/ThirdpartyController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/FeedController.cs
#	web/ASC.Web.Api/Api/PaymentsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Core/DnsSettings.cs
#	web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs
#	web/ASC.Web.Api/GlobalUsings.cs
#	web/ASC.Web.Core/CookiesManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
#	yarn.lock
2023-08-28 18:53:10 +03:00
gazizova-vlada
9989a09df5 Web:Components:Add props withoutBackground. 2023-08-28 12:45:46 +03:00
69b8d9b878 Web: Components: SelectionArea: added dashboard support 2023-08-25 17:06:24 +03:00
DmitrySychugov
d3b0dddf0e Web: Components: DropDown - fixed width calculation in dark theme 2023-08-25 16:53:58 +05:00
gazizova-vlada
aafa0059be Web:Components:Fix click outside. 2023-08-25 11:19:50 +03:00
DmitrySychugov
27d80856a4 Web: Components: DropDown - fixed width calculation in dark theme 2023-08-24 19:35:55 +05:00
gazizova-vlada
b875ee7481 Merge branch 'develop' into bugfix/fix-invite-panel-access-height 2023-08-23 09:36:58 +03:00
gazizova-vlada
047ea7fd44 Web:Components:Fixed AccessRightSelect list not closing on the invitation panel on mobile and tablets when clicking outside the area. 2023-08-23 09:35:35 +03:00
7ddbd91f2f Web: Components: fix contextmenu-header rtl styles 2023-08-22 14:09:15 +02:00
70fde7ecfb Fix bug 63732 - Accounts: User is not selected by clicking on his name. 2023-08-22 13:49:56 +03:00
Subhonbek
9801778db8 Merge remote-tracking branch 'origin/develop' into feature/rtl-interface-client 2023-08-22 10:58:49 +03:00
Subhonbek
92b6ddbb0a Merge branch 'develop' into feature/rtl-interface-client 2023-08-21 15:28:57 +03:00
ae3f3ce903 Merge branch 'develop' into feature/new-selector-socket 2023-08-18 15:10:41 +03:00
42c009d160 Web: Common: fixed navigation icon 2023-08-18 14:03:30 +03:00
Vladimir Khvan
eedb372885 ui of desktop/tablet views was downscaled 2023-08-18 15:52:13 +05:00
9be980fdb9 Web: Files: fixed badge theme 2023-08-17 17:02:21 +03:00
52bf38ba84 Web: Files: fixed infoBlock theme 2023-08-17 16:14:37 +03:00
e5a4e57774 Web:Client:FilesSelector: add socket for create, update or delete file or folder inside tab 2023-08-17 15:42:08 +03:00
c0d8f711f8 Web: Components: Fix RTL padding 2023-08-15 17:33:08 +02:00
c435658bcf Merge branch 'develop' into feature/rtl-interface-client
# Conflicts:
#	packages/common/components/Loaders/DialogAsideLoader/StyledDialogAsideLoader.js
2023-08-15 17:07:51 +02:00
c3cf343a45 Web: Files: fixed group-menu 2023-08-15 17:42:35 +03:00
00ba3ad6e6 Merge branch 'develop' into bugfix/public-room 2023-08-15 13:56:57 +03:00
5496ae0722 Web: Components: fixed main-button-mobile styles 2023-08-15 11:07:56 +03:00
e04e97e8e8 Web: Files: Selector: fixed selectAll 2023-08-14 17:45:02 +03:00
e19f2f4c12 Merge branch 'develop' into feature/rtl-interface-client
# Conflicts:
#	packages/login/src/client/components/ClientApp.tsx
2023-08-14 15:34:02 +02:00
734d42c55a Web: Login: Add RTL to Login 2023-08-14 15:24:49 +02:00