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
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
ee71dbb2cd
Web: updated icons of modules
2022-01-12 15:51:36 +03:00
49f3955e07
edit translations
2021-12-14 13:17:23 +03:00
65a7ae3df4
add translations el
2021-12-13 12:26:37 +03:00
fce12af277
add translations
2021-12-10 13:34:21 +03:00
878df989d9
Web: Renamed folder zh_CN to zh-CN
2021-12-09 21:51:05 +03:00
372ba52d94
add translations
2021-12-09 14:07:51 +03:00
489ecb1b26
add translations
2021-12-08 15:18:22 +03:00
de3dbc78e9
add translations
2021-12-08 12:24:19 +03:00
b6a963c712
add ko
2021-12-07 16:24:37 +03:00
06a478a499
add translations
2021-12-07 16:07:55 +03:00
dcdd1a5dc8
add sl
2021-12-07 15:27:11 +03:00
40692b3052
add zh_CN
2021-12-07 11:06:36 +03:00
1b0b978c97
add ja
2021-12-07 11:04:28 +03:00
db273f3b0e
update translation (ro)
2021-11-30 12:04:41 +03:00
d3071bcfb0
update translations
2021-11-29 12:53:44 +03:00
55cb1e875e
Web: fixed header height
2021-10-06 12:22:28 +03:00
4531d38e6f
Web: Removed duplicates
2021-09-24 21:18:50 +03:00
f06e3c076b
Fix Bug 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries
2021-09-13 12:54:59 +03:00
a31dc583c1
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Settings/index.js
2021-07-02 16:26:45 +03:00
2a44887b22
Web: hid temp loaders
2021-07-02 14:28:11 +03:00
65378cc089
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.CRM/Client/public/index.html
# products/ASC.Calendar/Client/public/index.html
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Mail/Client/public/index.html
# products/ASC.People/Client/public/index.html
# products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/public/index.html
2021-06-15 11:49:39 +03:00
Artem Tarasov
acd4a3893c
Web: added rule to webpack.config for woff, woff2
2021-06-06 23:39:52 +03:00
d01ef10cc5
Web: NavMenu/PageLayout: Was done:
...
- fixed loaders: two rectangle loader combined into one
- fixed loaders at index.html: two rectangle loader combined into one
- hide NavItem component
- hide click on Headline component
- fixed article padding style for desktop
- added new logo.
2021-06-04 14:42:21 +03:00
23e1083be7
Web: Removed empty translations keys
2021-06-01 13:49:37 +03:00
de98856728
Web: Tests: Added new 'sk' translations;
2021-06-01 11:21:39 +03:00
8e532bc8b9
Web: Tests: Added new 'ro' translations;
2021-06-01 11:20:14 +03:00
3d62da4422
Web: Tests: Added new 'pt-BR' translations;
2021-06-01 11:19:13 +03:00
c5a5072aa7
Web: Tests: Added new 'lo' translations;
2021-06-01 11:17:19 +03:00
8eb62d8079
Web: Tests: Added new 'it' translations;
2021-06-01 11:15:24 +03:00
a0fc465678
Web: Tests: Added new 'fr' translations;
2021-06-01 11:13:50 +03:00
061b4e46e7
Web: Added not found 'de' language translation files (fix NotAllLanguageTranslatedTest issue)
2021-05-31 19:11:58 +03:00
e2b9561d7b
Web: Rewritten all json translation files with sorting of properties alphabetically
2021-05-31 18:34:15 +03:00
df1ebc8d77
Web: Moved translationKeys "OpenApp" and "ViewWeb" to "/static/locales/{lng}/Common.json"
2021-05-18 15:23:12 +03:00
f6ecc35ae7
Web: Moved translationKeys "LearnMore" and "ComingSoon" to "/static/locales/{lng}/Common.json"
2021-05-18 15:10:20 +03:00
Ilya Oleshko
64fae284ee
Web: Projects: Fixed style for mobile and tablet devices, fixed description, disabled learn more button
2021-04-16 22:12:41 +03:00
d568693154
Big Fix commit:
...
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00