Commit Graph

16684 Commits

Author SHA1 Message Date
2a7616585e Web: Components: fixed table view 2022-02-22 12:10:27 +03:00
570fa10ca5 Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2022-02-22 11:44:34 +03:00
c0cd257700
Merge pull request #560 from ONLYOFFICE/bugfix/fix-table-display
Web: Components: fix display table after merge
2022-02-22 11:44:12 +03:00
88a2934409 Web: Components: fix display table after merge 2022-02-22 11:34:13 +03:00
6b1aed3042 Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2022-02-21 22:27:50 +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
dadf439c1f
Merge pull request #551 from ONLYOFFICE/hotfix/v1.1.1
Hotfix/v1.1.1
2022-02-21 10:22:09 +03:00
274518139f Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2022-02-18 14:12:32 +03:00
365d8b6a65 Update README.md 2022-02-18 14:01:28 +03:00
356e00ceed Web: Components: Calendar: fixed disabled months 2022-02-18 11:30:47 +03:00
6ed624844b Web: People: Re-write setIsEdit to arrow function 2022-02-18 11:17:58 +03:00
mushka
64afedc7f6 Merge branch 'develop' into feature/submenu 2022-02-18 02:01:00 +03:00
mushka
3bededc084 added auto offset 2022-02-18 01:59:46 +03:00
df278ba35b fix unsubscribe link 2022-02-17 18:55:10 +03:00
e0984202d0 fix 55612 2022-02-17 18:06:03 +03:00
6a666b40e9
Merge branch 'develop' into bugfix/fixed-dates-in-profile 2022-02-17 17:45:48 +03:00
mushka
5f565382f7 added drag-scrolling, working on auto-offset 2022-02-17 17:01:04 +03:00
ecb5c7fba2 Fixed Bug 55614 - Client.ExternalLink. ‘404 Not Found’ when opening an external link. 2022-02-17 15:12:54 +03:00
e3b894a21a ResManager: fix 2022-02-17 14:47:50 +03:00
eccb588362 Web: People: Profile: Added default width for language selector 2022-02-17 14:38:49 +03:00
ebd51f3f6b Web: Components: DropDown: Disable linter warnings 2022-02-17 14:38:07 +03:00
c8790b2cc6 Web: Components: ComboBox: Added manualWidth property for DropDown component 2022-02-17 14:37:32 +03:00
c2c802b732 Web: Common: PageLayout: Fixed default PageLayout header styles after merge 2022-02-17 13:06:42 +03:00
e848d5d979 Web: Files: Table/Filter: Restored sorting inside favorite folder 2022-02-17 12:45:55 +03:00
743d0566a3 edit de (common) 2022-02-17 12:34:35 +03:00
mushka
21253cbca2 Merge branch 'develop' into feature/submenu 2022-02-17 11:50:10 +03:00
7e011de3cf Web: People: fixed display of registration date/birthday in user profile 2022-02-17 11:46:50 +03:00
cdf18cbcf7 Web: Components: corrected the display of calendar months 2022-02-17 11:44:13 +03:00
4255cec9ad Notify: fix unsubscribe url 2022-02-17 11:30:37 +03:00
7419eb87dc Web: People: Added opportunity to unsubscribe from mailing list on My Profile page (/my?unsubscribe=tips) 2022-02-16 21:34:19 +03:00
d634d82050 Web: Components: Added enableToggle for <ToggleContent /> 2022-02-16 21:30:52 +03:00
e7dfa142d6 Subscription: fix 2022-02-16 20:34:21 +03:00
bef7c923db Settings: added method to get current subscription state 2022-02-16 19:32:42 +03:00
15830a9fe0 Fix bug 53339: open banner link in new tab 2022-02-16 18:03:21 +03:00
Vashchuk Nikita
0a384b2c28 refactoring async methods 2022-02-16 15:57:37 +03:00
80f97ef50d Web: Components: ContextMenu: Added left padding for arrow icon 2022-02-16 15:22:46 +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
Viktor Fomin
fb8e0748f6
Web: Campaigns: add ads examples 2022-02-16 14:11:49 +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
e6731ec23d Web: Components: TableHeader: Added property for hiding sort icon and disable sort actions 2022-02-16 13:57:59 +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
02a9c6f973 Web: Common: FilterInput: Fixed displaying sort icon if sort items hidden 2022-02-16 13:54:11 +03:00
5a876ff5ab Web: Common: FilterInput: Added property for hiding sort items inside SortComboBox 2022-02-16 13:53:09 +03:00
Tatiana Lopaeva
05cd52bb77
Merge pull request #539 from ONLYOFFICE/bugfix/fix-file-name-when-rename
Fixed Bug 55530 - Client.Files. Fixed the display of the file name wh…
2022-02-16 13:42:51 +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
697dd5dd39 fix 53348 2022-02-15 19:30:27 +03:00
73933162d5 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-15 19:16:20 +03:00
c1541d7901 Fixed Bug 55248 - Mobile.Client.Profile. Fixed closing the profile save window on the avatar editor page 2022-02-15 19:16:14 +03:00
5e12bf583c Fix Bug 54825 - Client.Clouds.‘Uncaught (in promise) undefined’ 2022-02-15 18:39:14 +03:00