|
|
f0f75c7c60
|
Merge branch 'develop' into feature/web-plugins
|
2023-08-03 13:37:40 +03:00 |
|
|
|
3567521ceb
|
Web:Client:Plugins: add slot at GlobalEvent, add context for wrapped component
|
2023-07-28 15:21:01 +03:00 |
|
|
|
1ed0eb5b45
|
Web: update plugins for new API
|
2023-07-19 19:08:01 +03:00 |
|
|
|
12fb1ca335
|
web:Client: add plugin page to settings, modify logic for plugin system
|
2023-07-10 09:38:15 +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 |
|
|
|
9ec36f8633
|
Web:Client:FilesSelector: fix with new filter
|
2023-06-27 17:41:12 +03:00 |
|
|
|
d857c15639
|
Web:Common: add new FilterType
|
2023-06-26 13:06:02 +03:00 |
|
|
|
7e601fa5e2
|
Merge branch 'develop' into feature/public-room
|
2023-06-05 12:38:12 +03:00 |
|
Timofey Boyko
|
6cb8a714b2
|
Merge branch 'develop' into branch feature/image-thumbnail
|
2023-06-01 14:30:06 +03:00 |
|
|
|
3b74cf457a
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/components/FilesPanels/index.js
# packages/client/src/components/dialogs/index.js
# packages/client/src/pages/Home/InfoPanel/Header/index.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/common/api/files/index.js
# packages/common/store/AuthStore.js
|
2023-05-30 12:43:31 +03:00 |
|
|
|
fdcac6f4da
|
Merge branch 'develop' into feature/trash-filter-by-room
|
2023-05-30 11:56:18 +04:00 |
|
|
|
19e8b2210a
|
Merge branch 'master' into develop
# Conflicts:
# packages/client/src/helpers/constants.js
# packages/client/src/pages/AccountsHome/Section/Filter/index.js
# packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
# packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/pages/Home/index.js
# packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/common/components/Article/sub-components/article-payment-alert.js
# packages/common/components/Section/index.js
# packages/components/floating-button/styled-floating-button.js
# packages/login/src/client/App.tsx
# packages/login/src/client/components/Invalid/index.tsx
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# yarn.lock
|
2023-05-29 14:36:12 +03:00 |
|
|
|
e3457ecb33
|
Web: Files: fixed public-room tag
|
2023-05-24 11:17:21 +03:00 |
|
Mushka Nikita
|
191de3e991
|
added filter by room to trash
|
2023-05-22 12:27:09 +03:00 |
|
Akmal Isomadinov
|
a5669a14eb
|
Web: Fixed upload indicator
|
2023-05-18 16:45:36 +05:00 |
|
Viktor Fomin
|
de4456f124
|
Common: Constants: add AccountLoginType
|
2023-05-17 13:07:59 +03:00 |
|
Mushka Nikita
|
39fa59b485
|
added new filter block
|
2023-05-05 11:46:07 +03:00 |
|
|
|
4cc76b2013
|
Merge branch 'develop' into feature/image-thumbnail
|
2023-04-28 13:28:10 +04:00 |
|
|
|
1706f4549b
|
Merge branch 'develop' into feature/public-room
|
2023-04-27 17:20:06 +03:00 |
|
Timofey Boyko
|
2f4c61b778
|
Merge branch 'develop' into branch feature/image-thumbnail
|
2023-04-27 10:06:07 +03:00 |
|
|
|
0f8d44800a
|
Web: Files: added public-room translation, icons
|
2023-04-26 16:34:22 +03:00 |
|
Mushka Nikita
|
b417ae0365
|
Merge branch 'develop' into feature/thirdparty
|
2023-04-26 15:02:13 +03:00 |
|
Akmal Isomadinov
|
194e49efde
|
Web:Client Fixed bug 62171
|
2023-04-25 14:08:01 +05:00 |
|
Timofey Boyko
|
2df4d0f8c0
|
Web: remove dep from global package.json and move to common
|
2023-04-20 17:38:05 +03:00 |
|
|
|
a8816c43fe
|
Merge branch 'develop' into feature/image-thumbnail
|
2023-04-20 14:34:57 +04:00 |
|
Mushka Nikita
|
d210a968ae
|
unlock thirdparty
|
2023-04-20 11:47:39 +03:00 |
|
|
|
48f9073302
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-20 12:31:46 +04:00 |
|
Akmal Isomadinov
|
f72dd886ee
|
Web:Client:Store Fixed bug 62140
|
2023-04-18 16:41:17 +05:00 |
|
Timofey Boyko
|
d2f4748d79
|
Merge branch 'develop' into branch feature/image-thumbnail
|
2023-04-17 12:31:05 +03:00 |
|
|
|
df62b3862f
|
Merge branch 'release/v1.0.0' into develop
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/payments/PriceCalculation.js
# packages/common/components/Article/sub-components/article-payment-alert.js
# packages/components/scrollbar/custom-scrollbars-virtual-list.js
# products/ASC.Files/Core/Core/CountRoomFeature.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Helpers/Global.cs
|
2023-04-10 17:24:09 +03:00 |
|
|
|
e752574c57
|
Web: Added Zendesk live chat + refactoring
|
2023-04-04 00:46:59 +04:00 |
|
Timofey Boyko
|
f3f150b6f0
|
Web: remove react-resize-detector
|
2023-03-30 16:54:20 +03:00 |
|
Viktor Fomin
|
fe28a6a3df
|
Common: add redirect for deactivated portal
|
2023-03-30 11:34:25 +03:00 |
|
Timofey Boyko
|
e48fe72577
|
Merge branch 'release/v1.0.0' into branch feature/image-thumbnail
|
2023-03-22 15:51:16 +03:00 |
|
Timofey Boyko
|
bde6197071
|
Revert "Merge branch 'release/1.0.0' into branch feature/image-thumbnail"
This reverts commit ae890b8595.
|
2023-03-22 15:37:41 +03:00 |
|
Timofey Boyko
|
ae890b8595
|
Merge branch 'release/1.0.0' into branch feature/image-thumbnail
|
2023-03-22 15:10:35 +03:00 |
|
|
|
a4567c99dc
|
Web: Hide room types FillingFormsRoom, ReviewRoom, ReadOnlyRoom
|
2023-03-16 11:57:28 +04:00 |
|
|
|
9a45dea8bd
|
Web: Added opportunity to change wrongPortalNameUrl in config.json
|
2023-03-14 22:31:43 +04:00 |
|
Timofey Boyko
|
a807a6954d
|
Web:Common:Constants: add constants for indexeddb
|
2023-03-06 18:16:19 +03: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 |
|
Timofey Boyko
|
f4f7a1b3ad
|
Web:Client: move FilterGroups and FilterKeys constants to common
|
2023-03-03 11:05:26 +03: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 |
|
Timofey Boyko
|
769abeb9e9
|
Web:Common:Constants: add new role and type 'Collaborator'
|
2023-02-22 10:39:55 +03:00 |
|
Timofey Boyko
|
2bbcf5a03a
|
Web: move wrongPortalNameUrl to common/constants
|
2023-02-08 10:58:35 +03:00 |
|
Vashchuk Nikita
|
ab7f24a68b
|
Merge branch 'release/rc-v1.2.0' into feature/notifications
|
2023-02-02 18:48:48 +05:00 |
|
|
|
dd3ef94eaa
|
Merge branch 'release/rc-v1.2.0' into feature/new-user-type-change
|
2023-01-30 15:06:33 +03:00 |
|
Timofey Boyko
|
baa30e0305
|
Web:Common/Client/Components: add PUBLIC_DIR alias
|
2023-01-27 17:08:30 +03:00 |
|
|
|
864e3c9c33
|
Web: Notifications: Added api methods.
|
2023-01-27 16:22:21 +03:00 |
|
|
|
c79a874d03
|
Merge branch 'release/rc-v1.2.0' into feature/new-user-type-change
|
2023-01-25 11:49:50 +03:00 |
|
Timofey Boyko
|
6b8afcaa33
|
Web: add import svg with url
|
2023-01-11 18:08:01 +03:00 |
|
