e663d59aeb
Web: Moved translations to Common file (vi).
2022-03-10 16:25:27 +03:00
297394f359
Web: Moved translations to Common file (uk).
2022-03-10 16:24:18 +03:00
8080e416df
Web: Moved translations to Common file (zh-CN).
2022-03-10 16:23:06 +03:00
7bca87c34d
Web: Moved translations to the Common (ru).
2022-03-10 16:21:24 +03:00
3bbf82d918
add new lines
2022-03-09 19:07:24 +03:00
b71c2eabc5
Web:Added translation for "Title" for locales en, pt-BR, ru, de, fr, it.
2022-03-09 12:03:01 +03:00
ee446c8e67
Web: moved translates to Common
2022-03-09 11:04:12 +03:00
7ffaee6efc
Web: moved translates to Common
2022-03-05 14:27:59 +03:00
mushka
384a92c30f
finished merging
2022-03-04 12:52:34 +03:00
Timofey Boyko
65ccfb896f
Web:Files: add new key 'sorting'
2022-03-04 10:20:10 +03:00
mushka
424a7a7e3c
change code formatting
2022-03-03 13:43:43 +03:00
mushka
e77a97e105
added checkbox menu interaction and new opening mechanics
2022-03-02 17:19:19 +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
mushka
518abb7a2f
added sever files, fixed closeOnclick interaction, added alternative thumbnail and implemented destructorization
2022-02-28 15:53:46 +03:00
7907016bde
Web: fix after merge
2022-02-22 13:55:49 +03:00
32868de412
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
...
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# public/locales/de/Common.json
2022-02-22 13:53:00 +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
743d0566a3
edit de (common)
2022-02-17 12:34:35 +03:00
3229019aad
Web: move LoginButton key to Common
2022-02-10 18:01:40 +03:00
ef87651b3a
Fixed Bug 55254 - Client.Files. Fixed the change of the cursor to the "palm"
2022-02-10 11:25:00 +03:00
Timofey
092d870f69
Merge branch 'feature/virtual-rooms-1.2' into feature/new-filter-input
2022-02-09 19:54:45 +08:00
Timofey
f6e4cc4d71
Merge branch 'develop' into feature/new-filter-input
2022-02-09 19:54:11 +08:00
817a155642
Web: move ShowMore to Common translate
2022-02-08 22:34:21 +03:00
b866e5cccc
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
2022-02-08 18:17:41 +03:00
16f3adcb64
Web:Studio:Added the "Automatic time zone" method to the LanguageAndTimeZone component. Added HelpButton for StudioTimeLanguageSettings header.Added an image for the HelpButton component.
2022-02-08 17:43:56 +03:00
Timofey
97a23c8524
Web: change color to nav.logo.opened.react.svg for all themes
2022-02-03 23:47:44 +08:00
57ae1bdf00
Web: add danger alert icon
2022-02-03 16:05:54 +03:00
9068af695d
Web: add sso translate
2022-02-03 01:09:51 +03:00
c8f1fc9f03
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
2022-02-01 16:53:56 +03:00
2cd5e501f7
Web: add sso icon
2022-01-31 12:32:23 +03:00
Timofey
4b45eaa243
Merge branch 'develop' into feature/dark-theme
2022-01-27 18:10:13 +08:00
Dmitry Kulak
926f0c6a2e
Web: Files: Changed "shared" icon
2022-01-26 14:09:43 +03:00
Timofey
021f205c38
Web: update catalog.share.react.svg
2022-01-24 17:41:29 +08: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
34441d6335
Web: Moved some translations from Files to COMMON for asc-web-components
2022-01-21 11:49:16 +03:00
Timofey
48daf70cd5
Web: add new icons for new search
2022-01-20 20:04:28 +08:00
6c72436a03
Merge branch 'develop' into feature/mobile-main-button
2022-01-20 14:25:05 +03:00
Artem Tarasov
3b75038803
Merge branch 'develop' into feature/redesign-badges
...
# Conflicts:
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/Icons.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# public/images/access.edit.react.svg
2021-12-29 15:45:33 +03:00
bedfad1ec5
Merge branch 'master' into develop
...
# Conflicts:
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
2021-12-28 18:21:44 +03:00
ab931e40ef
edit bg, az
2021-12-23 11:23:25 +03:00
93cbab055c
edit lo
2021-12-16 15:59:02 +03:00
30860f041a
add new keys ro, lo, edit keys az
2021-12-15 13:56:30 +03:00
878df989d9
Web: Renamed folder zh_CN to zh-CN
2021-12-09 21:51:05 +03:00
8538b55dfc
Web: Turned on all languages
2021-12-09 21:45:10 +03:00
8eb1ea7c3b
Web:Files:Badges: Added edit icons to appserver /public /images. Changed the display of edit icons.
2021-12-07 20:13:57 +03:00
20a17fca96
rename pt
2021-12-07 16:50:09 +03:00
f0e1ba5716
edit pl
2021-12-07 16:36:09 +03:00
25472623c5
edit ja Common
2021-12-07 11:48:32 +03:00
e6fe4cd1c0
edit az
2021-12-07 11:15:37 +03:00
4565d32979
add vi
2021-12-07 10:38:31 +03:00
98fa906954
Web:Files:Badges: Added favorite icons to appserver /public /images. Сhanged the onClickFavorite method in HOC withBadges. Changed the display of favorite icons.
2021-12-06 22:00:50 +03:00
58bdddd486
add pt_PT
2021-12-06 18:23:10 +03:00
8378850d92
add uk
2021-12-06 17:30:16 +03:00
1d659a6841
add az
2021-12-06 17:09:53 +03:00
4ac6064578
add 'Save as oform'
2021-12-06 11:03:52 +03:00
d9afc8ff4f
Web:Files:Badges: Changed icons of the favorite, edit, lock. Changed the display of lock icons.
2021-12-05 16:37:33 +03:00
9ea13156cb
Web:Files:Badges:SharedButton icon change, resize
2021-12-03 12:20:45 +03:00
01b46993e3
Merge branch 'feature/translate-1.1.0' of github.com:ONLYOFFICE/AppServer into feature/translate-1.1.0
2021-12-02 18:52:10 +03:00
857c8f91d3
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
2021-12-02 18:51:52 +03:00
3f114a58d7
Web: Locales: Changed translation "Make form" to "Save as oform"
2021-12-02 18:51:04 +03:00
ed4aca1773
add pl
2021-12-02 15:56:04 +03:00
9ec247e59c
update pt-BR
2021-12-01 18:18:05 +03:00
571400092c
add el, bg
2021-12-01 17:41:40 +03:00
db20e966e2
update translations
2021-11-30 11:58:46 +03:00
b2c123d6f4
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
2021-11-30 11:46:22 +03:00
850eb13b0d
Merge branch 'release/v1.1.0' into feature/make-form
2021-11-29 14:20:02 +03:00
4dac8e9ce6
Web: Components: changed expander-down.react.svg, fixed styles
2021-11-29 13:11:01 +03:00
50f985a374
update translations
2021-11-29 12:12:38 +03:00
aed178f0b1
Web: updated icons
2021-11-29 11:58:27 +03:00
22efc180de
Web: Added translation for make form action
2021-11-26 17:36:55 +03:00
45c5562262
Web: Added make form icon
2021-11-26 17:36:22 +03:00
2f21f2246a
Merge branch 'develop' into feature/mobile-main-button
2021-11-22 16:39:22 +03:00
3bee202d41
Web: Files: Replaced translation on common.
2021-11-22 14:23:45 +03:00
f675415228
Merge branch 'master' into release/v1.1.0
...
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# 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/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/en/SelectFolder.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/public/locales/en/Translations.json
# products/ASC.People/Client/public/locales/ru/Translations.json
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
2021-11-21 14:26:20 +03:00
d31ea87211
Merge branch 'master' into develop
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
2021-11-21 13:57:55 +03:00
180ca914ad
Web: Files: HOC: Fixed form icon inside context menu
2021-11-19 18:08:11 +03:00
839d81f356
Web: Files: Added "Fill in the form" context menu action from ".ofrom" files
2021-11-19 13:25:09 +03:00
8a0b29c12b
Web: Files: Added '.oform' files edit icon + update access.edit.react.svg
2021-11-19 12:57:56 +03:00
adbb316dd2
Web: moved "Owner" translation to Common
2021-11-15 18:33:32 +03:00
d6836cc3d3
Merge pull request #457 from ONLYOFFICE/feature/translate-1.0.1
...
Feature/translate 1.0.1
2021-11-13 20:04:11 +03:00
c7c7267a9a
Test: Added new WrongTranslationVariablesTest and fix it's issues
2021-11-13 19:03:10 +03:00
1c8f091dce
Web: Fix DublicatesByContentTest translation issues
2021-11-12 20:12:33 +03:00
1b6c02352b
Web: Fixed icons for docxf and oform file formats
2021-11-12 19:20:14 +03:00
1e1df5b5c9
Web: Fixed icons for docxf and oform file formats
2021-11-12 17:17:28 +03:00
eb1db9eea6
Merge branch 'hotfix/v1.0.1' into feature/desktop-login
2021-11-02 18:15:53 +03:00
20e59a7cbe
Web: Common: changed media-viewer icons, fixed media styles
2021-11-02 17:51:44 +03:00
aa79ef2c9d
Merge branch 'hotfix/v1.0.1' into feature/desktop-login
2021-11-02 14:03:26 +03:00
3f532f6765
Merge branch 'develop' into feature/mobile-main-button
2021-11-02 13:36:34 +05:00
d6544c073c
Web: Public: added icons
2021-11-02 13:31:54 +05:00
8cc08045b7
Merge branch 'master' into develop
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-header.js
# 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
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
2021-11-01 13:54:40 +03:00
fe65632277
Web: Common: changed media-viewer icons, fixed media styles
2021-10-28 14:20:06 +03:00
93ab1e46ce
Web: Fixed docxf icon container width
2021-10-26 19:54:19 +03:00
743325984b
Web: Fixed docxf icon container width
2021-10-26 19:48:41 +03:00
f5d31dcff2
Web: Files: Fixed icons blur, added new icons
2021-10-26 16:55:52 +03:00
9128a3d0ff
Web: Files: Added docxf and oform format icons
2021-10-26 16:55:09 +03:00
5bd9c06c1a
Merge branch 'develop' into table-group-menu
...
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
2021-10-22 12:20:20 +03:00
26183d14bf
Web: add new pencil icon
2021-10-20 00:41:05 +03:00
f04a1a5403
Web: People: fixed table group menu, added new icons
2021-10-19 17:36:47 +03:00
4bd4954ad4
Merge branch 'release/1.0.0' into feature/desktop-login
2021-10-19 13:10:47 +03:00
9dd28a144d
Web: Fixed callback pages, added login callback for desktop client
2021-10-19 10:31:34 +03:00
0c63c41ef7
Web: Files: changed folder icons, added new icons
2021-10-18 12:24:01 +03:00
fb7922f579
Thirdparty: login. Desktop
2021-10-15 11:34:34 +03:00
ff97e3134f
Web: Components: added new icons, created GroupMenuItem component
2021-10-14 18:18:08 +03:00
678fa4c119
Web: Added desktop parameter from url for oAuth login
2021-10-14 15:24:13 +03:00
e3718c3697
Merge branch 'release/1.0.0' into table-group-menu
...
# Conflicts:
# packages/asc-web-components/table-container/StyledTableContainer.js
2021-10-14 13:46:11 +03:00
5005e0a6c0
Web: Icons: Fixed old checkbox icons, change header plus icon
2021-10-14 13:09:54 +03:00
2ecf75434e
Web: Components: fixed TableGroupMenu styles
2021-10-13 17:44:40 +03:00
af31f2fb9b
Client: thirdparty. Fixed getObjectByLocation
2021-10-13 10:29:07 +03:00
bb2cac21d7
Fix bug 51706: missing icons
2021-10-12 15:38:05 +03:00
ebcb6c93ea
Web: Client: Files: Added kDrive, WebDav and Yandex clouds icons for tree menu
2021-09-30 12:13:52 +03:00
4531d38e6f
Web: Removed duplicates
2021-09-24 21:18:50 +03:00
551c623541
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns
...
# Conflicts:
# packages/asc-web-components/campaigns-banner/index.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
2021-09-08 14:36:10 +03:00
350f24cf56
Web: Client: Common: Fixed PasswordLimitLength translation key for SK locale
2021-09-08 11:12:22 +03:00
a10ad2939a
Fix bug 52276: fuzzy icons
2021-09-08 10:43:57 +03:00
24e13fb79d
Web: deleted campaigns locales
2021-09-07 12:47:53 +03:00
bd0388ea62
Web: fixed icons size
2021-08-31 19:31:59 +03:00
4c8449b48e
Web: Files: fixed folders icons
2021-08-28 16:07:36 +03:00
2e46034ab0
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
2021-08-27 20:45:31 +03:00
28393c90f6
Web: moved file icons
2021-08-27 20:44:50 +03:00
ccd7532161
Merge branch 'develop' into release/1.0.0
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
2021-08-27 17:45:52 +03:00
4f30eb9a2a
Web: removed duplicate translations from Common.json
2021-08-27 11:09:19 +03:00
ff7f3926ce
Merge branch 'develop' into feature/table-view
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# public/locales/de/Common.json
# public/locales/it/Common.json
# public/locales/lo/Common.json
# public/locales/pt-BR/Common.json
# public/locales/ro/Common.json
2021-08-26 16:05:15 +03:00
c66268a9c2
Merge branch 'develop' into release/1.0.0
...
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/helpers/utils.js
2021-08-26 13:49:25 +03:00
38983cf306
Web: added tiff script
2021-08-19 13:27:44 +03:00
8e0320460c
Web: Fixed after merge.
2021-08-19 10:40:40 +03:00
3b8cf0a275
Merge branch 'develop' into feature/file-folder-selectors
...
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/helpers/utils.js
# web/ASC.Web.Editor/src/Editor.jsx
2021-08-19 10:08:14 +03:00
f5e9e17e11
Merge branch 'develop' into feature/table-view
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
2021-08-16 10:53:48 +03:00
e6efbb45b1
Web: People: added new translations, moved translations to Common.json
2021-07-29 16:09:56 +03:00
75e7ca893f
Merge branch 'develop' into feature/file-folder-selectors
...
# Conflicts:
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
2021-07-28 17:19:05 +03:00
2abbd580c2
Merge branch 'develop' into feature/table-view
...
# Conflicts:
# public/locales/en/Common.json
# public/locales/ru/Common.json
2021-07-28 16:53:23 +03:00
93d1cb0f38
Fix Bug 51344 "downloadable font: kern: Too large subtable..." on FF
2021-07-27 15:56:19 +03:00
ea6219c787
Web: added icons
2021-07-27 13:58:05 +03:00
445c7ae43f
Web: Files: added cell type
2021-07-27 13:51:56 +03:00
9b47aa8d4a
Merge branch 'develop' into feature/table-view
2021-07-22 16:56:48 +03:00
2c8756dee3
Web: fixed translations
2021-07-22 15:09:29 +03:00
e703927239
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0
2021-07-21 18:30:33 +03:00
13f8f5ef7d
Fix sw.js creation
2021-07-21 18:28:56 +03:00
f7ce0e210b
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
...
# Conflicts:
# packages/asc-web-common/utils/sw-helper.js
2021-07-21 07:20:51 +03:00
d84229886f
Web: Components: Table: added header filtering, refactoring
2021-07-20 13:29:39 +03:00
eab97bbfed
Web: init new single sw.js creation
2021-07-20 12:32:27 +03:00
075d9232ec
Web: People: moved translation "Name" to Common.json
2021-07-16 13:23:52 +03:00
1203ee314d
Web: added translations
2021-07-14 15:44:01 +03:00
cb8d225707
Merge branch 'develop' into feature/file-folder-selectors
...
# Conflicts:
# products/ASC.Files/Client/src/store/index.js
2021-07-12 13:08:40 +03:00
9906380a96
Web: Files: Return folder icon to the files module.
2021-07-08 16:22:32 +03:00
57bba777dc
Web: Files: Removed icons (32, 64, 96 sizes) to the root folder.
2021-07-08 14:08:44 +03:00
4829db5490
Web: Files: Return translations.
2021-07-07 17:05:00 +03:00
ffb1e32c23
Web: Files: SelectFileDialog: Added empty container to the files list.
2021-07-02 20:53:41 +03:00
577a720691
WEb:Files: Removed translations for empty header container from files to root.
2021-07-02 20:52:48 +03:00
b3fd47a216
Merge branch 'feature/CampaignsBanner' of github.com:ONLYOFFICE/AppServer into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
2021-07-02 16:42:05 +03:00
77606f11c1
Web: Files: Removed icons 24 size to the root folder.
2021-07-02 15:36:58 +03:00
0d4159a907
Web: Files: Removed icon to common folder.
2021-07-01 19:18:24 +03:00
15a268f83b
Web: Settings: Removed icons to common folder.
2021-07-01 13:38:24 +03:00
a7d56b56f2
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner
2021-07-01 13:12:18 +03:00
83884f1a60
Web: added link in locales
2021-07-01 11:03:42 +03:00
29446f1c36
Web: moved locales
2021-07-01 10:40:07 +03:00
44e4eceaa3
Web: moved banners images
2021-07-01 00:52:24 +03:00
3369cc2c7d
Web: added campaigns locales
2021-07-01 00:30:08 +03:00
29fbee557c
Web: added campaigns images
2021-07-01 00:29:34 +03:00
1083fd8416
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
2021-06-30 16:09:53 +03:00
Artem Tarasov
2ae591f839
Web: added svg for view
2021-06-29 15:28:44 +03:00
b1662e7ac6
Web: Init maintenance displaying
2021-06-22 13:41: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
5db2e8a868
Merge branch 'develop' into feature/restore-files-convertation
2021-06-11 17:50:28 +03:00
e0d076a7bc
Merge branch 'develop' into feature/restore-files-convertation
2021-06-11 15:17:35 +03:00
Artem Tarasov
f181a491fb
Merge branch 'develop' into bugfix/fixed-styles
2021-06-11 14:56:52 +03:00
bac090e180
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-11 13:11:08 +03:00
b7ce4a35e7
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins
...
# Conflicts:
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
2021-06-09 00:23:12 +03:00
Artem Tarasov
3db9b30e5e
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-08 17:58:29 +03:00
d9b4611517
added ResetApplication translations in Common
2021-06-08 15:30:11 +03:00
Artem Tarasov
c25fa589a9
Web: People: deleted fonts with ext .woff, added hash to font name
2021-06-08 15:26:56 +03:00
5f16720aba
Web: NavMenu: Was Done for tablet and mobile:
...
- hide module name
- added logo
- added short logo fro mobile
- changed width of logo
2021-06-08 13:40:59 +03:00
Artem Tarasov
7db667108b
Web: added font-family Opne-Sans to /public, added import fonts to custom.scss
2021-06-06 23:35:56 +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
5e8751d9f1
Web: Files: added convert file icon, refactoring convert dialog
2021-06-02 16:03:46 +03:00
908310041f
Web: Added new translation for toasts ("EncryptingFile", "EncryptionKeysReload", "EncryptionFilePreparing")
2021-06-02 10:59:07 +03:00
46c198f89d
Web: Added new 'ru' translations;
2021-06-01 19:04:45 +03:00
3ca36c9dd2
Web: Tests: Added new Common translations;
2021-06-01 17:00:55 +03:00
23e1083be7
Web: Removed empty translations keys
2021-06-01 13:49:37 +03:00
7ae9b19412
Web: Turn on new languages >= 78%
...
1. Language 'de' translated by '90%'
2. Language 'fr' translated by '54%'
3. Language 'it' translated by '78%'
4. Language 'lo' translated by '78%'
5. Language 'pt-BR' translated by '78%'
6. Language 'ro' translated by '78%'
7. Language 'ru' translated by '99%'
8. Language 'sk' translated by '19%'
9. Language 'en' translated by '100%'
2021-06-01 13:25:41 +03:00
7e82567331
Web: Added new Common translations;
2021-06-01 11:45:15 +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
e2b9561d7b
Web: Rewritten all json translation files with sorting of properties alphabetically
2021-05-31 18:34:15 +03:00
Artem Tarasov
215c933d9e
Web: added new translation keys "ProviderNotConnected", "Mail" to "static/locale/de/Common.json"
2021-05-28 13:28:40 +03:00
Artem Tarasov
102f26ed3c
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
2021-05-27 11:58:53 +03:00
Artem Tarasov
46d80f7b34
Web: moved translation keys "ByFirstNameSorting", "ByLastNameSorting" to "static/locales/{lng}/Common.json"
2021-05-27 11:57:20 +03:00
3536be88c2
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-27 11:51:39 +03:00
00957a65ad
Web: moved translation keys "LblSelect", "EditUserDialogTitle", "Version"
2021-05-27 11:51:32 +03:00
b57da432bf
Web: Fixed FullDublicatesTest for "CopyEmailAndPassword" translation key, key moved to Common.
2021-05-27 11:50:11 +03:00
7d1af40f6a
Web: Fix translation tests issues
2021-05-27 11:27:27 +03:00
Artem Tarasov
a12ab6c970
Web: moved translationKeys "Error520Text", "ErrorInitWizardHeader" to "static/locales/{lng}/Common.json"
2021-05-26 18:30:57 +03:00
Artem Tarasov
6ec9db8870
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
2021-05-26 18:02:11 +03:00
Artem Tarasov
8d9655fa0b
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
2021-05-26 17:59:52 +03:00
Artem Tarasov
d5ddeb4c42
Web: moved translation keys "AboutCompanyVersion", "Version" to "static/locales/{lng}/Common.json"
2021-05-26 17:58:05 +03:00
fe18e7e55c
Web: moved translation key "LblSelect"
2021-05-26 17:53:36 +03:00
151ffc7b26
Web: moved translation key "Active"
2021-05-26 17:46:09 +03:00