|
|
24fba12ce3
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/public/locales/en/CreateEditRoomDialog.json
# packages/client/public/locales/en/InfoPanel.json
# packages/client/src/components/dialogs/CreateEditRoomDialog/data/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/LinkRow.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/PublicRoomBar.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/PublicRoomBlock.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/StyledPublicRoom.js
# packages/client/src/pages/Home/InfoPanel/Header/index.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/store/ContextOptionsStore.js
# packages/client/src/store/FilesStore.js
# packages/common/constants/index.js
# packages/components/date-picker/index.js
# packages/components/selected-item/index.js
|
2023-07-14 15:40:47 +03:00 |
|
|
|
2e14572fc0
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/components/panels/OperationsPanel/index.js
# packages/client/src/components/panels/SelectFolderDialog/index.js
# packages/client/src/components/panels/SelectionPanel/FilesListWrapper.js
# public/images/clock.react.svg
|
2023-07-07 10:35:33 +03:00 |
|
Vladimir Khvan
|
ae168c410a
|
clock svg was added
|
2023-07-05 14:16:13 +05:00 |
|
|
|
20bf5fa8d5
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/store/index.js
|
2023-06-09 11:59:10 +03:00 |
|
Vladimir Khvan
|
7619fe03e8
|
Merge branch 'develop' into feature/webhooks-page
|
2023-05-31 16:05:47 +05:00 |
|
Vladimir Khvan
|
0dde9188d3
|
existing svg was deleted
|
2023-05-31 16:00:51 +05:00 |
|
Vladimir Khvan
|
67a775cd00
|
empty filter dark image was added
|
2023-05-31 16:00:39 +05:00 |
|
|
|
9999389f44
|
Merge branch 'develop' into feature/public-room
|
2023-05-31 11:07:34 +03:00 |
|
|
|
4214470b2c
|
Merge branch 'develop' into feature/filling-status-line
|
2023-05-30 13:16:26 +04:00 |
|
|
|
797df5b076
|
Merge branch 'develop' into feature/public-room
|
2023-05-26 12:51:30 +03:00 |
|
Elyor Djalilov
|
b5f0b25515
|
Web: Components: filling-status-line
|
2023-05-25 14:44:37 +05:00 |
|
|
|
0f918f0c3f
|
Web: Files: added title icon to public room
|
2023-05-23 16:13:58 +03:00 |
|
|
|
0b4439d1cf
|
Web:Add example avatar.
|
2023-05-17 12:09:49 +03:00 |
|
|
|
8700a64afc
|
Web:Add everyone role button image.
|
2023-05-15 22:20:11 +03:00 |
|
|
|
9a3503b3ef
|
Web:Add AddRoleButton image.
|
2023-05-15 10:43:07 +03:00 |
|
|
|
ea45c5803b
|
Web: Files: added external link api
|
2023-05-11 11:37:32 +03:00 |
|
Elyor Djalilov
|
9d52d935b8
|
Web: Components: filling-status-line
|
2023-05-10 14:21:04 +05:00 |
|
|
|
12c790046b
|
Web: Files: added new options to LinkRow
|
2023-05-04 15:10:06 +03:00 |
|
Vladimir Khvan
|
b671b4f1fb
|
empty filter stub was added
|
2023-05-02 15:33:09 +05:00 |
|
|
|
2c70ba2627
|
Web: added new icon
|
2023-05-02 13:03:52 +03:00 |
|
|
|
b361ba992f
|
Web: added new icons
|
2023-04-27 17:08:26 +03:00 |
|
|
|
0f8d44800a
|
Web: Files: added public-room translation, icons
|
2023-04-26 16:34:22 +03:00 |
|
Vladimir Khvan
|
d9418d7fef
|
Merge branch 'develop' into feature/webhooks-page
|
2023-04-25 12:26:46 +05:00 |
|
NikitaVashchuk
|
9712466c98
|
png images for notifications
|
2023-04-22 16:21:35 +05:00 |
|
Viktor Fomin
|
d1956bc0ef
|
Fix Bug 62136: applied social buttons disabled style
|
2023-04-18 21:07:31 +03:00 |
|
Vladimir Khvan
|
a1e5e3b7ed
|
Merge branch 'develop' into feature/webhooks-page
|
2023-04-16 15:24:17 +05:00 |
|
|
|
a9355c4ea6
|
Web: Added new LiveChat and BookTraining menu to Profile
|
2023-04-03 14:43:01 +04:00 |
|
Vladimir Khvan
|
91d1826f63
|
Merge branch 'develop' into feature/webhooks-page
|
2023-03-27 14:12:15 +05:00 |
|
|
|
cab3582bcf
|
Merge pull request #1315 from ONLYOFFICE/bugfix/notification-image-format
Bugfix/notification image format
|
2023-03-24 12:39:32 +03:00 |
|
Vashchuk Nikita
|
a9284faf1d
|
added logo.png as embedded resource
|
2023-03-23 21:33:33 +05:00 |
|
Viktor Fomin
|
333437bd24
|
Web: change compact logo
|
2023-03-23 09:20:05 +03:00 |
|
Vashchuk Nikita
|
ca6e1d1553
|
returned old images
|
2023-03-23 02:26:07 +05:00 |
|
Vashchuk Nikita
|
2b94d5dfa5
|
changed notification image format to png,
images are sent in notifications as attacment,
fix images size,
fix attachment serialization,
fix work with cache
|
2023-03-23 00:25:15 +05:00 |
|
Vladimir Khvan
|
7d44a06e14
|
Merge branch 'develop' into feature/webhooks-page
|
2023-03-20 17:52:29 +02:00 |
|
Vladimir Khvan
|
b2546b1c96
|
Merge branch 'develop' into feature/webhooks-page
|
2023-03-07 00:41:32 +05:00 |
|
|
|
29abce027d
|
Merge branch 'develop' into feature/notifications
# Conflicts:
# packages/client/src/pages/Accounts.jsx
# packages/client/src/store/FilesActionsStore.js
# packages/common/constants/index.js
# products/ASC.People/Server/Api/UserController.cs
|
2023-03-06 15:37:45 +03:00 |
|
Vladimir Khvan
|
6b0c1d163c
|
Merge branch 'develop' into feature/webhooks-page
|
2023-02-23 23:01:14 +05:00 |
|
|
|
216a6480c8
|
Merge branch 'develop' into feature/notifications
# Conflicts:
# packages/common/constants/index.js
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# yarn.lock
|
2023-02-22 15:50:55 +03:00 |
|
|
|
449d0c64c5
|
Merge branch 'develop' into feature/browserlist
|
2023-02-21 13:55:50 +03:00 |
|
Vladimir Khvan
|
a1a6647fcf
|
settings icon was added
|
2023-02-21 13:31:51 +05:00 |
|
Viktor Fomin
|
84533d7ca0
|
Web: delete useless images
|
2023-02-21 10:52:24 +03:00 |
|
|
|
9d88b1caba
|
Web: Client: Images: Added browsers icons
|
2023-02-20 17:39:47 +03:00 |
|
Viktor Fomin
|
4710429524
|
Web: add images
|
2023-02-18 23:55:57 +03:00 |
|
|
|
68adfe1138
|
Web: Added enable/disable notifications to the context menu.
|
2023-02-06 16:55:19 +03:00 |
|
Elyor Djalilov
|
baf75b0c42
|
Web:PortalSettings: Changed portal settings navigation
|
2023-02-01 16:49:02 +05:00 |
|
Timofey Boyko
|
1b36167b44
|
Web: change path for favicon.ico
|
2023-01-23 13:21:51 +03:00 |
|
Timofey Boyko
|
ae94a3d016
|
Web:Components:InputPhone: fix flags import
|
2023-01-20 12:44:10 +03:00 |
|
Timofey Boyko
|
a42c916b81
|
Web: delete useless images
|
2023-01-19 12:15:26 +03:00 |
|
Timofey Boyko
|
f4cb8acf1d
|
Merge branch 'release/rc-v1.2.0' into branch feature/static-versioned
|
2023-01-18 18:06:22 +03:00 |
|
Timofey Boyko
|
270382a0a5
|
Web: restore default user photo
|
2023-01-16 17:58:05 +03:00 |
|
