|
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 |
|
|
f26eb17fe1
|
Web: Common: move shell changes from hotfix/campaigns banner
|
2022-02-15 11:37:31 +03:00 |
|
|
74d6b4bfd6
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
|
2022-02-08 16:06:34 +03:00 |
|
|
8d6818c6cd
|
Web: Client: fixed header-logo-wrapper styles
|
2022-02-08 16:06:25 +03:00 |
|
|
33c0e49705
|
add new file (Home) (de, es, fr, it, zh-CN, ro), update ja UploadPanel
|
2022-02-07 16:44:59 +03:00 |
|
|
32c398c044
|
Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS
|
2022-01-21 12:53:29 +03:00 |
|
|
21f3c390bb
|
Web: Studio: fixed file name
|
2022-01-18 14:45:45 +03:00 |
|
|
77937390ef
|
Web: Fix crash of Wizard with default en-US language
|
2022-01-14 19:12:58 +03:00 |
|
|
aba8cb9174
|
Web: Studio: fixed logo styles
|
2022-01-12 16:11:14 +03:00 |
|
|
2ffa9eb180
|
Web: Studio: added icons to header for desktop view
|
2022-01-12 15:53:52 +03:00 |
|
|
60c45e8c5e
|
Web: Client: Wizard: Fixed issue with default portal language inside selector
|
2022-01-12 11:08:51 +03:00 |
|
Dmitry Kulak
|
de8fdb748d
|
Web: Studio: Header: Fixed spacing between burger menu button and logo
|
2022-01-11 14:37:11 +03:00 |
|
Dmitry Kulak
|
38e09fe63a
|
Web: Studio: Header: Fixed margin for logo on Personal
|
2022-01-10 19:17:23 +03:00 |
|
Dmitry Kulak
|
84b1a18137
|
Web: Studio: Fixed header not closing on item click
|
2021-12-29 10:41:10 +03:00 |
|
|
febf172875
|
Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/avatar-editor/index.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/main-button/index.js
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Login/package.json
|
2021-12-28 13:35:02 +03:00 |
|
|
440811e931
|
Web: Added convertLanguage for compatibility
|
2021-12-23 14:01:08 +03:00 |
|
|
3bf412166d
|
Web: Settings: Commented old redux actions
|
2021-12-23 13:09:38 +03:00 |
|
|
86e965d779
|
Web: Fix translations
|
2021-12-22 18:12:04 +03:00 |
|
|
1d49c9dc51
|
Web: Client: Fixed spelling errors
|
2021-12-21 20:25:59 +03:00 |
|
|
ff7b6fc432
|
Web: init e2e tests
|
2021-12-21 15:59:11 +08:00 |
|
|
156fbada6d
|
edit translations bg
|
2021-12-16 17:13:44 +03:00 |
|
|
93cbab055c
|
edit lo
|
2021-12-16 15:59:02 +03:00 |
|
gectokot
|
f2548e27ba
|
Web: Studio: Moved settings menu link from hamburger menu to profile menu
|
2021-12-14 14:47:23 +03:00 |
|
gectokot
|
e9449b5a72
|
Web: Studio: Homepage: Fixed vertical scroll appearing on mobile in landscape mode
|
2021-12-14 14:45:40 +03:00 |
|
gectokot
|
a1f0c01558
|
Web: Studio: Homepage: Fixed layout jump on load
|
2021-12-14 14:42:40 +03:00 |
|
|
b5eeac9a47
|
edit translations
|
2021-12-14 12:43:10 +03:00 |
|
gectokot
|
1ea64c8701
|
Web: Studio: Homepage: Now displayName is used in greeting message
|
2021-12-14 11:14:08 +03:00 |
|
gectokot
|
8ee3ef5bd5
|
Web: Studio: Homepage: Changed logic for greeting message
|
2021-12-13 16:12:52 +03:00 |
|
gectokot
|
6f49b68f8e
|
Web: Studio: Homepage: Fixes
|
2021-12-13 15:31:23 +03:00 |
|
gectokot
|
0a53e3bd7d
|
Web: Studio: Homepage: Refactoring
|
2021-12-13 14:50:33 +03:00 |
|
gectokot
|
464a5cd456
|
Web: Studio: Fixed links
|
2021-12-10 20:06:03 +03:00 |
|
gectokot
|
cf5723cd53
|
Web: Studio: Renamed function isModuleOld to checkIfModuleOld
|
2021-12-10 17:31:46 +03:00 |
|
gectokot
|
d32dc40034
|
Web: Studio: Fixes, refactoring
|
2021-12-10 17:22:03 +03:00 |
|
gectokot
|
729e695dbc
|
Web: Studio: Moved external link icon from utils to components
|
2021-12-10 16:16:10 +03:00 |
|
gectokot
|
4e38480b73
|
Web: Studio: Homepage: Removed hamburger menu
|
2021-12-10 13:10:36 +03:00 |
|
gectokot
|
85c55cd1ea
|
Web: Studio: Homepage: Redesign
|
2021-12-10 12:24:35 +03:00 |
|
gectokot
|
49061c8e84
|
Web: Studio: Homepage: Changed title to new greeting message, swapped tiles and illustration
|
2021-12-10 10:26:13 +03:00 |
|
|
878df989d9
|
Web: Renamed folder zh_CN to zh-CN
|
2021-12-09 21:51:05 +03:00 |
|
gectokot
|
eecdc3e0b1
|
Web: Studio: Refactoring
|
2021-12-09 18:59:52 +03:00 |
|
|
e8af856c26
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-09 13:55:55 +03:00 |
|
|
41681d0c94
|
Server: Files: Configuration: Fixed logo type for filling form mode
|
2021-12-09 12:45:52 +03:00 |
|
gectokot
|
ed3a4c85e0
|
Web: Studio: Moved onItemClick function to utils
|
2021-12-08 15:25:19 +03:00 |
|
gectokot
|
d0a505b844
|
Web: Studio: HomePage: ModuleTile: Added ability to open unavailable modules in a new tab
|
2021-12-08 15:17:00 +03:00 |
|
gectokot
|
2e1584f080
|
Web: Studio: HomePage: Header: Added ability to open unavailable modules in a new tab
|
2021-12-08 15:16:38 +03:00 |
|
gectokot
|
72666795aa
|
Web: Studio: Homepage: Redesign, added illustration, refactoring
|
2021-12-08 15:13:29 +03:00 |
|
gectokot
|
b35c06f56e
|
Web: Studio: Homepage: Added styles for external link icon
|
2021-12-08 15:09:57 +03:00 |
|
gectokot
|
9b604dbd57
|
Web: Studio: Homepage: Added helper functions for links
|
2021-12-08 15:09:19 +03:00 |
|
gectokot
|
0ab444b34e
|
Web: Studio: Homepage: Moved sub components to sub-components folder
|
2021-12-08 15:06:32 +03:00 |
|
gectokot
|
dc621dac89
|
Web: Studio: Homepage: Added SVG illustration
|
2021-12-08 15:04:14 +03:00 |
|
|
20a17fca96
|
rename pt
|
2021-12-07 16:50:09 +03:00 |
|