TimofeyBoyko
|
8bda52c489
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-31 11:38:34 +03:00 |
|
|
66412730de
|
Merge branch 'develop' into feature/invite-panel
|
2022-08-31 09:03:17 +03:00 |
|
mushka
|
a1db010869
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-30 14:06:55 +03:00 |
|
|
d0da69a74b
|
Merge branch 'develop' into feature/settings-menu
|
2022-08-30 12:11:59 +03:00 |
|
|
38b217d65e
|
Web: Client: InvitePanel: Added user search, added email validation, added editing for manual added items, fixed invite panel state
|
2022-08-30 08:55:19 +03:00 |
|
TimofeyBoyko
|
18466251e8
|
Web: add img for change owner option
|
2022-08-29 12:24:18 +03:00 |
|
|
17e2d0f063
|
Web:Client: Added new icons for settings menu sections.
|
2022-08-26 16:39:24 +03:00 |
|
TimofeyBoyko
|
18cad0911c
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-26 06:56:29 +03:00 |
|
mushka
|
50eb4cf072
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-25 21:38:52 +03:00 |
|
|
4ff9b9c74f
|
Web:Added a menu category picture with a notification on the tablet.
|
2022-08-24 17:32:08 +03:00 |
|
|
152efe40b9
|
Web:Added a picture of the main button on mobile for previewю
|
2022-08-24 17:31:25 +03:00 |
|
|
719c213041
|
Web:Added a triangle for the main button.
|
2022-08-23 13:41:34 +03:00 |
|
TimofeyBoyko
|
124a955ef2
|
Web:Client:Accounts: add info-panel for user
|
2022-08-22 10:05:44 +03:00 |
|
|
36c30428fc
|
Merge branch 'develop' into feature/settings-common
|
2022-08-19 15:05:33 +03:00 |
|
TimofeyBoyko
|
74c2180584
|
Web:Client:Accounts: update empty screen
|
2022-08-15 18:07:50 +03:00 |
|
TimofeyBoyko
|
13c36ac4f3
|
Web:Client:MainButton: add invite actions to main button for accounts page
|
2022-08-15 15:56:52 +03:00 |
|
|
b82a4206e0
|
Merge branch 'develop' into feature/settings-common
|
2022-08-12 18:04:11 +03:00 |
|
|
2aed8eb3a0
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign
# Conflicts:
# packages/asc-web-components/index.js
# packages/client/src/DocspaceLogo/index.js
# packages/client/src/pages/Confirm/ConfirmWrapper.js
# packages/components/form-wrapper/index.js
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header-unauth.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/StyledConfirm.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePhone.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaActivation.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaAuth.js
# web/ASC.Web.Login/src/Login.jsx
# web/ASC.Web.Login/src/StyledLogin.js
|
2022-08-10 16:16:43 +03:00 |
|
|
8c234ee0aa
|
SSO: fix forbidden image
|
2022-08-05 18:04:30 +03:00 |
|
mushka
|
5cd4263b38
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-04 15:21:06 +03:00 |
|
|
721e442374
|
Web:Studio:Add BreakpointWarning component.
|
2022-07-26 18:08:00 +03:00 |
|
|
8e888b5191
|
Web: add background pattern image
|
2022-07-25 18:07:04 +03:00 |
|
|
44c65ee52c
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
# public/locales/az/Common.json
# public/locales/bg/Common.json
# public/locales/cs/Common.json
# public/locales/de/Common.json
# public/locales/el/Common.json
# public/locales/en/Common.json
# public/locales/es/Common.json
# public/locales/fi/Common.json
# public/locales/fr/Common.json
# public/locales/it/Common.json
# public/locales/ja/Common.json
# public/locales/ko/Common.json
# public/locales/lo/Common.json
# public/locales/lv/Common.json
# public/locales/nl/Common.json
# public/locales/pl/Common.json
# public/locales/pt-BR/Common.json
# public/locales/pt/Common.json
# public/locales/ro/Common.json
# public/locales/ru/Common.json
# public/locales/sk/Common.json
# public/locales/sl/Common.json
# public/locales/tr/Common.json
# public/locales/uk/Common.json
# public/locales/vi/Common.json
# public/locales/zh-CN/Common.json
# web/ASC.Web.Client/src/store/index.js
|
2022-07-22 19:04:35 +03:00 |
|
|
0275052613
|
Web: change icon
|
2022-07-22 18:12:58 +03:00 |
|
|
aa6b674721
|
Web: change icon
|
2022-07-22 13:42:49 +03:00 |
|
|
12e7d4edbf
|
Merge branch 'develop' into feature/settings-common
|
2022-07-22 13:22:59 +03:00 |
|
|
5e9a76a0fa
|
Web: add logo
|
2022-07-21 17:08:41 +03:00 |
|
|
831bdc578f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# packages/asc-web-common/components/Article/styled-article.js
# products/ASC.Files/Client/src/Files.jsx
|
2022-07-21 14:22:28 +03:00 |
|
|
6cfeb9299d
|
Web: add new logo
|
2022-07-20 14:58:20 +03:00 |
|
TimofeyBoyko
|
757856ee9b
|
Web: update icons for catalog items
|
2022-07-19 15:47:52 +03:00 |
|
|
57c6389d07
|
Web: add icons
|
2022-07-19 14:04:04 +03:00 |
|
mushka
|
f77d424526
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-07-18 14:58:18 +03:00 |
|
|
a65a557525
|
Web:Adding a plus image to add a theme.
|
2022-07-13 12:33:21 +03:00 |
|
|
ee761e6811
|
Web: add icons
|
2022-07-11 23:10:20 +03:00 |
|
TimofeyBoyko
|
c8feb7899b
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-08 12:32:26 +03:00 |
|
|
9cf4dc70b7
|
Web: add arrow icon
|
2022-07-04 06:17:31 +03:00 |
|
TimofeyBoyko
|
ed8b06f88c
|
Web: fix conflicts after merge
|
2022-07-01 11:10:33 +03:00 |
|
TimofeyBoyko
|
3e07ef1efc
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-01 10:09:47 +03:00 |
|
|
f56a40435e
|
Web: add missed icons
|
2022-06-30 11:34:54 +03:00 |
|
|
6b2f643441
|
Fix Bug 57852: add flags for languages combo
|
2022-06-30 11:25:20 +03:00 |
|
|
08090ea3b4
|
Web: Icons: Fixed icon bundle for items menu and folders menu
|
2022-06-28 15:39:31 +03:00 |
|
TimofeyBoyko
|
247d64e0da
|
Web: add images for person, pin and info context menu items
|
2022-06-27 17:18:26 +03:00 |
|
TimofeyBoyko
|
54b3ce8c37
|
Web: fix catalog accounts icon name
|
2022-06-22 16:24:37 +03:00 |
|
TimofeyBoyko
|
97dca619a2
|
Web: update icons for article
|
2022-06-22 12:31:47 +03:00 |
|
TimofeyBoyko
|
36835eea13
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-06-22 11:17:05 +03:00 |
|
|
d5c86203d2
|
Web:Added a checkmark image to select a theme.
|
2022-06-21 13:20:34 +03:00 |
|
|
47f2138571
|
Web:Added pin and plus icons for theme preview.
|
2022-06-17 16:10:55 +03:00 |
|
mushka
|
164b44da70
|
finished History tab, changed structure for Details
|
2022-06-16 15:59:58 +03:00 |
|
TimofeyBoyko
|
24a204b076
|
Web: add new tag and rooms images
|
2022-06-14 16:30:17 +03:00 |
|
mushka
|
d2f3fd0846
|
Merge branch 'release/v1.2' into feature/doc-space-info-panel
|
2022-06-09 12:48:35 +03:00 |
|
mushka
|
2463e3cfc3
|
updated Avatar component for it to also display provided SVGs and filled its Storybook
|
2022-06-08 17:37:58 +03:00 |
|
TimofeyBoyko
|
c0084cb7dc
|
Web:Files/Components: add new images for virtual rooms page
|
2022-06-08 16:17:46 +03:00 |
|
mushka
|
0b6f5deac2
|
added new icons: person+ and email+
|
2022-06-08 15:12:24 +03:00 |
|
|
0b4488d4b4
|
Web: change trash catalog icon
|
2022-05-19 19:00:56 +03:00 |
|
|
41a0f07bfa
|
Web: Files: added alert badge to main-button, upload logic changed
|
2022-05-16 18:03:21 +03:00 |
|
|
e9e2e4e27f
|
Web: added new empty screen icons
|
2022-05-06 19:42:49 +05:00 |
|
|
d843c3ee68
|
Web: Added new icons for filter empty screen
|
2022-05-05 20:26:47 +05:00 |
|
|
2e33c99230
|
Web: Client: Files: Badges: Added medium (16px) icon for form badge. Fixed displaying for form badge
|
2022-04-29 14:52:56 +03:00 |
|
|
563fd3c778
|
Web: Files: fix context menu icons
|
2022-04-22 13:45:57 +03:00 |
|
|
ee931b3098
|
Web: Files: fix share icon
|
2022-04-20 14:55:23 +03:00 |
|
|
e82a44d493
|
Merge pull request #617 from ONLYOFFICE/feature/redesign-sharing-panel
Feature/redesign sharing panel
|
2022-04-19 10:36:41 -04:00 |
|
|
ebff3a8f80
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-19 13:41:21 +03:00 |
|
|
d448691ae3
|
Web: fix view selector icons
|
2022-04-19 12:42:10 +03:00 |
|
Timofey Boyko
|
79a9b4175b
|
Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel
|
2022-04-19 09:56:59 +03:00 |
|
|
1bfd6a959c
|
Web: Files: fixed ConnectedClouds settings
|
2022-04-18 17:05:36 +03:00 |
|
Timofey Boyko
|
1abd712f67
|
Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel
|
2022-04-18 15:21:48 +03:00 |
|
Timofey Boyko
|
3194f8810e
|
Web:update image for access operation
|
2022-04-14 11:34:18 +03:00 |
|
|
7086c7ebb5
|
Web: Files: Changed empty files page.
|
2022-04-13 10:08:20 +03:00 |
|
Timofey Boyko
|
d2c5cbb0eb
|
Web: update copy.react.svg
|
2022-04-11 18:56:59 +03:00 |
|
Timofey Boyko
|
397ff0d90d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-07 12:10:11 +03:00 |
|
Timofey Boyko
|
9aa24924ad
|
Web: add code.react.svg
|
2022-04-06 15:05:32 +03:00 |
|
|
99cdaa0440
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
|
2022-04-01 15:46:42 +03:00 |
|
|
8e777afb09
|
Web: change info icon
|
2022-03-30 19:39:09 +03:00 |
|
|
f41c65623b
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
# Conflicts:
# config/kafka.json
|
2022-03-30 11:14:47 +03:00 |
|
|
080079c944
|
Web: add avatar images
|
2022-03-29 11:19:35 +03:00 |
|
|
1922da4ab9
|
merge
|
2022-03-24 20:56:51 +03:00 |
|
mushka
|
cd82919062
|
merge with feature/virtual-rooms-1.2
|
2022-03-24 18:00:31 +03:00 |
|
|
9174a20871
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-common/api/portal/index.js
# packages/asc-web-common/components/Loaders/index.js
# packages/asc-web-common/store/SettingsStore.js
# packages/asc-web-components/file-input/index.js
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/save-cancel-buttons/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListRow.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/store/ContextOptionsStore.js
# public/locales/de/Common.json
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/NavMenu/index.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-rights.js
# web/ASC.Web.Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2022-03-24 14:39:52 +03:00 |
|
mushka
|
c51d920092
|
vr-1.2 actualization
|
2022-03-21 11:13:56 +03:00 |
|
|
b0e22fdac9
|
Web: change password input icons
|
2022-03-16 12:47:44 +03:00 |
|
|
0cd4cb49ed
|
Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/themes/dark.js
# public/locales/de/Common.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Login/src/Login.jsx
|
2022-03-16 11:03:07 +03:00 |
|
|
cc293f60c2
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
|
2022-03-15 14:11:00 +03:00 |
|
|
de81329df2
|
WEb: Backup: Added help button component.
|
2022-03-15 12:43:02 +03:00 |
|
mushka
|
384a92c30f
|
finished merging
|
2022-03-04 12:52:34 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
aed178f0b1
|
Web: updated icons
|
2021-11-29 11:58:27 +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 |
|
|
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 |
|
|
8a0b29c12b
|
Web: Files: Added '.oform' files edit icon + update access.edit.react.svg
|
2021-11-19 12:57:56 +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 |
|
|
20e59a7cbe
|
Web: Common: changed media-viewer icons, fixed media styles
|
2021-11-02 17:51:44 +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 |
|
|
0c63c41ef7
|
Web: Files: changed folder icons, added new icons
|
2021-10-18 12:24:01 +03:00 |
|
|
ff97e3134f
|
Web: Components: added new icons, created GroupMenuItem component
|
2021-10-14 18:18:08 +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 |
|
|
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 |
|
|
a10ad2939a
|
Fix bug 52276: fuzzy icons
|
2021-09-08 10:43:57 +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 |
|
|
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 |
|
|
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 |
|
|
ea6219c787
|
Web: added icons
|
2021-07-27 13:58:05 +03:00 |
|
|
d84229886f
|
Web: Components: Table: added header filtering, refactoring
|
2021-07-20 13:29:39 +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 |
|