|
|
48c35f981b
|
Web:Studio:Added locales en for CustomTitlesTooltip tooltip.
|
2022-03-10 16:18:46 +03:00 |
|
|
|
5655f57acd
|
Web:Studio:Changed CustomTitlesSettingsDescription and LanguageAndTimeZoneSettingsDescription for locales en, pt-BR, ru, de, fr, it. Added CustomTitlesWelcome for locales en, pt-BR, de, fr, it.
|
2022-03-09 12:16:04 +03:00 |
|
|
|
fe1c01e4c1
|
Web:Studio:Styling the Customization Component.
|
2022-03-05 10:18:06 +03:00 |
|
|
|
264637510d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-05 09:15:15 +03:00 |
|
|
|
cde35d334f
|
Web:Studio:Styling the Customization Component.
|
2022-03-05 09:14:55 +03:00 |
|
|
|
9be309da10
|
Web:Studio:Added encoding of uploaded logo to base64.
|
2022-03-04 18:30:42 +03:00 |
|
|
|
4965f9ffb6
|
Web:Studio:Added a CustomizationDescription in the Customization component. Added ru locales for CustomizationDescription.
|
2022-03-04 09:29:12 +03:00 |
|
|
|
80194bb222
|
Web:Studio:Changed setMailDomainSettings, setLifetimeAuditSettings. Added setDNSSettings, getAuditTrailReport to SettingsSetupStore.
|
2022-03-03 16:05:52 +03:00 |
|
|
|
03d8f803cd
|
Web:Studio:Encoding images in base64 format. Checking the save White label method when loading an image.
|
2022-03-03 10:22:19 +03:00 |
|
|
|
2978adcdf3
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-03-02 18:18:05 +03:00 |
|
|
|
1ce9b25093
|
Web: Campaigns: Added more locales
|
2022-03-02 17:43:10 +03:00 |
|
Timofey Boyko
|
48ad201583
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-02 11:57:20 +03:00 |
|
Timofey Boyko
|
fdd1975a3a
|
Web:Client: fix double settings item in user actions
|
2022-03-02 11:56:17 +03:00 |
|
Timofey Boyko
|
02b225b78b
|
Web:Client: fix double navigation icon
|
2022-03-02 11:54:39 +03:00 |
|
|
|
ea9a0c5703
|
Web:Studio:Added theme for links in WhiteLabel component.
|
2022-03-02 11:43:59 +03:00 |
|
|
|
2309bc060f
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-02 11:25:08 +03:00 |
|
|
|
f2505f7575
|
Web:Studio:Added layout to the PortalRenaming component.
|
2022-03-02 11:21:40 +03:00 |
|
|
|
6aa9a4a926
|
Added the WhiteLabe component to the Customization component.
|
2022-03-02 11:17:08 +03:00 |
|
|
|
efcfd69ef3
|
Web:Studio:Added setWhiteLabelSettings, restoreWhiteLabelSettings to the WhiteLabe component. Added the onSave method to the WhiteLabe component.
|
2022-03-02 11:16:19 +03:00 |
|
|
|
97b3b8daf7
|
Web:Common:Added setWhiteLabelSettings, restoreWhiteLabelSettings, setPortalRename, setMailDomainSettings, setIpRestrictions, setIpRestrictionsEnable, setMessageSettings, setCookieSettings, setLifetimeAuditSettings to SettingsSetupStore.
|
2022-03-02 11:13:02 +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 |
|
|
|
9e8b80c6dd
|
Api: added form method support
|
2022-03-01 14:10:41 +03: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 |
|
Timofey
|
7bd66a04ab
|
Web:Client:NavMenu: add special name for catalog burger for mobile view
|
2022-03-01 17:53:48 +08:00 |
|
Timofey
|
062cb1e6cd
|
Web:Studio: disable settings icon in header
|
2022-03-01 01:39:24 +08:00 |
|
Dmitry Kulak
|
92d3a3275f
|
Web: Studio: Homepage: Fixed greeting message styles
|
2022-02-25 18:57:24 +03:00 |
|
|
|
2eeed99efa
|
Web: Client: Main: Removed --vh parameter from global styles for non IOS devices
|
2022-02-25 11:28:23 +03:00 |
|
|
|
d40d73a3a5
|
GoogleAuth: fix 94 issue
|
2022-02-24 17:36:44 +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 |
|
|
|
a797b3490e
|
Files: async fixes
|
2022-02-22 12:22:15 +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 |
|
|
|
89cc5bfbec
|
Api: added cookiesettings
|
2022-02-18 18:28:03 +03:00 |
|
Timofey
|
f30cb432f7
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-18 22:31:28 +08:00 |
|
Timofey
|
8c73f93eed
|
Web:Files:Catalog: fix section rerender when catalog opening on mobile
|
2022-02-18 20:46:49 +08:00 |
|
|
|
2e424a106a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-18 11:00:40 +03:00 |
|
|
|
f068f60a95
|
Web:Studio:Added languageDefaultFromSessionStorage and timezoneDefaultFromSessionStorage keys to sessionStorage. Fixed showReminder output.
|
2022-02-18 10:59:38 +03:00 |
|
|
|
c998797aed
|
Settings: update password settings
|
2022-02-17 18:25:07 +03:00 |
|
|
|
91c3fa878b
|
Portal: portalrename method
|
2022-02-17 16:39:47 +03:00 |
|
|
|
1ef4b32939
|
Settings: added update dns settings method
|
2022-02-17 15:55:42 +03:00 |
|
|
|
ecb5c7fba2
|
Fixed Bug 55614 - Client.ExternalLink. ‘404 Not Found’ when opening an external link.
|
2022-02-17 15:12:54 +03:00 |
|
|
|
4255cec9ad
|
Notify: fix unsubscribe url
|
2022-02-17 11:30:37 +03:00 |
|
|
|
bef7c923db
|
Settings: added method to get current subscription state
|
2022-02-16 19:32:42 +03:00 |
|
Vashchuk Nikita
|
0a384b2c28
|
refactoring async methods
|
2022-02-16 15:57:37 +03:00 |
|
Viktor Fomin
|
fb8e0748f6
|
Web: Campaigns: add ads examples
|
2022-02-16 14:11:49 +03:00 |
|
|
|
7f4d29da03
|
Web: Editor: fixed canConvert
|
2022-02-15 16:57:32 +03:00 |
|
Vashchuk Nikita
|
b17119b711
|
refactoring async methods
|
2022-02-15 16:20:06 +03:00 |
|
|
|
af51658493
|
Web: Campaigns: init example
|
2022-02-15 13:09:44 +03:00 |
|
|
|
f26eb17fe1
|
Web: Common: move shell changes from hotfix/campaigns banner
|
2022-02-15 11:37:31 +03:00 |
|
Timofey
|
8ac30689a3
|
Web:Studio:Settings: change props for people selector in owner page
|
2022-02-15 15:01:21 +08:00 |
|
Timofey
|
f9162966b4
|
Web:Studio:Settings: change props for people selector in admin page
|
2022-02-15 15:01:06 +08:00 |
|
