|
|
a908363898
|
Web: Files: Public-room: fixed socket error, refactoring
|
2023-06-14 15:52:28 +03:00 |
|
|
|
18ed709ebb
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/client/src/store/index.js
|
2023-06-14 13:15:45 +03:00 |
|
Timofey Boyko
|
4cf3873d95
|
Web:Client: change route from 'view/@self' to 'profile'
|
2023-06-09 14:52:25 +03:00 |
|
|
|
20bf5fa8d5
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/store/index.js
|
2023-06-09 11:59:10 +03:00 |
|
|
|
b6ff642a39
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/HOCs/withLoader.js
# packages/client/src/helpers/utils.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/index.js
# packages/common/components/Navigation/Navigation.js
# packages/common/components/Navigation/sub-components/drop-box.js
|
2023-06-07 11:53:08 +03:00 |
|
Vladimir Khvan
|
cc22619fb6
|
Merge branch 'develop' into feature/webhooks-page
|
2023-06-07 12:15:37 +05:00 |
|
|
|
f4f5edec05
|
Merge branch 'develop' into feature/webhooks-page
# Conflicts:
# web/ASC.Web.Api/Api/Settings/WebhooksController.cs
|
2023-06-06 01:49:14 +03:00 |
|
Timofey Boyko
|
d207fd7c60
|
Merge branch 'develop' into branch feature/modify-navigation-system
|
2023-06-05 16:07:41 +03:00 |
|
Timofey Boyko
|
e6d6efda5b
|
Web:Client: modify loading system
|
2023-06-05 11:17:34 +03:00 |
|
|
|
b5b1d30aa3
|
Merge branch 'develop' into feature/public-room
|
2023-06-02 11:55:10 +03:00 |
|
Vladimir Khvan
|
7619fe03e8
|
Merge branch 'develop' into feature/webhooks-page
|
2023-05-31 16:05:47 +05:00 |
|
Vladimir Khvan
|
5b01b56a95
|
webhooks guide url was added
|
2023-05-31 16:00:16 +05: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 |
|
Mushka Nikita
|
5e201b4414
|
Merge branch 'develop' into feature/history-timeout
|
2023-05-30 11:29:48 +03: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 |
|
Mushka Nikita
|
92f94e38af
|
Merge branch 'hotfix/v1.0.1' into feature/history-timeout
|
2023-05-26 14:29:28 +03:00 |
|
Mushka Nikita
|
19d5f0db38
|
removed suspense, update file/folder flicking fix
|
2023-05-26 14:29:07 +03:00 |
|
Mushka Nikita
|
6b2943da07
|
moved history instance to infoPanelStore, moved parseHistory to HistoryHelper, implemented useTransition, fixed file/folder flicking bug, removed timers
|
2023-05-26 14:28:53 +03:00 |
|
Mushka Nikita
|
dfccf6526e
|
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-26 13:57:58 +03:00 |
|
|
|
a51e5d9a22
|
Web: Files: added filter to public-room
|
2023-05-25 16:50:48 +03:00 |
|
|
|
99e9aa852d
|
Web: Files: added socket support to public room
|
2023-05-24 15:08:02 +03:00 |
|
|
|
0df3278f96
|
Fix UselessModuleTranslationKeysTest issue (key: MessageEmailActivationInstuctionsSentOnEmail)
|
2023-05-16 12:56:57 +04:00 |
|
|
|
0604e6e732
|
Web: Added quota request according to user rights.
|
2023-05-04 18:13:27 +03:00 |
|
|
|
9f0207f27a
|
Web: Added tariff update, added hiding invalid date on the payment page, added date checks.
|
2023-05-04 18:02:08 +03:00 |
|
Viktor Fomin
|
5dcdcbc0a8
|
Fix Bug 62349: Error when adding an allowed IP address
|
2023-04-28 13:28:24 +03:00 |
|
Mushka Nikita
|
30379db3fd
|
fixed history (completed)
|
2023-04-25 12:58:51 +03:00 |
|
|
|
db976e019e
|
Web: Fix routing to login (logout issues)
|
2023-04-24 14:25:14 +04:00 |
|
|
|
48f9073302
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-20 12:31:46 +04:00 |
|
|
|
8c3dc99864
|
Web: Client: Added ref to wrongPortalNameUrl
|
2023-04-19 16:52:14 +04:00 |
|
Elyor Djalilov
|
52ca3beeed
|
Web: PortalSettings: Change links to helpcenter articles for docspace
|
2023-04-17 19:08:53 +05:00 |
|
|
|
22e1208f2b
|
Web: Fixed display of dates for the payment page.
|
2023-04-17 15:34:31 +03:00 |
|
Timofey Boyko
|
1300df6333
|
Merge branch 'develop' into feature/react-router-6
|
2023-04-17 10:42:19 +03:00 |
|
|
|
100bddeb4a
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-17 11:38:48 +04:00 |
|
|
|
d7a8a36245
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-04-14 11:55:53 +04:00 |
|
|
|
fa841f1ecd
|
Fix hardcoded domain in PortalRenamingMobile key
|
2023-04-14 11:55:13 +04:00 |
|
Timofey Boyko
|
474937a412
|
Merge branch 'develop' into branch feature/react-router-6
|
2023-04-14 10:54:27 +03:00 |
|
Viktor Fomin
|
2d300d15ee
|
Common: add documentationEmail
|
2023-04-14 10:36:38 +03:00 |
|
|
|
79347bb168
|
Merge pull request #1341 from ONLYOFFICE/feature/theme-switcher
Feature/theme switcher
|
2023-04-13 15:02:55 +04:00 |
|
|
|
6a059746ba
|
Web: Added sequential request for information about quota and tariff.
|
2023-04-13 10:36:42 +03:00 |
|
|
|
7dbb520c64
|
Web: Profile: Fix Avatar creation (applied server fixes)
|
2023-04-13 01:01:37 +04:00 |
|
Timofey Boyko
|
e6f1969879
|
Merge branch 'develop' into branch feature/react-router-6
|
2023-04-12 13:56:41 +03:00 |
|
|
|
41925aa4c3
|
Web: Payments: Added update of information about the payer when re-entering the payment page.
|
2023-04-12 10:25:40 +03:00 |
|
|
|
6aa5cf81bf
|
Web: Added usage of new api param /portal/payment/quota?refresh=true
|
2023-04-11 22:17:25 +04:00 |
|
|
|
e824841226
|
Web: Fix empty email api request
|
2023-04-11 22:13:37 +04:00 |
|
Akmal Isomadinov
|
e72bb1d9a9
|
Web:Common:store:UserStore Fixed mobx warning when changing the theme
|
2023-04-11 13:47:08 +05:00 |
|
Viktor Fomin
|
5a6c52a42c
|
FIx Bug 62017: Missing "Privacy policy" link on account deletion pages
|
2023-04-10 22:49:35 +03:00 |
|
|
|
40e7935d68
|
Merge pull request #1326 from ONLYOFFICE/feature/quota-via-websocket
Feature/quota via websocket
|
2023-04-07 21:51:32 +04:00 |
|
|
|
a9e02567a4
|
Web: PortalSettings: Payments: Added updating tariff dates.
|
2023-04-07 17:24:19 +03:00 |
|
|
|
52b7a8cc1e
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-04-07 15:16:26 +03:00 |
|
|
|
8d7875c183
|
Web: Added waiting for receiving quotas before displaying payment alert.
|
2023-04-07 15:16:05 +03:00 |
|
