|
|
7c23b3347f
|
Web: Changed request cancellation with signal.
|
2023-05-10 12:34:34 +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
|
cdc1cea1a3
|
Fix Bug 62203: Buttons on the page confirming the change of portal owner do not work
|
2023-04-20 17:33:15 +03:00 |
|
|
|
9ab229aafc
|
Web: Removed .json from all api urls (docker issue)
|
2023-04-17 13:47:34 +04:00 |
|
|
|
6aa5cf81bf
|
Web: Added usage of new api param /portal/payment/quota?refresh=true
|
2023-04-11 22:17:25 +04:00 |
|
|
|
bc68d350bf
|
Merge branch 'release/v1.0.0' into bugfix/payments-page
|
2023-03-10 19:41:04 +04:00 |
|
|
|
122f9065dc
|
Web: Added errors handler, getting link was moved to init function.
|
2023-03-10 18:25:24 +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 |
|
Viktor Fomin
|
6ca3170843
|
Fix Bug 61218: get keepNewFileName from server
|
2023-03-02 01:22:25 +03:00 |
|
|
|
25bc273d7f
|
Web: Editor: Added list of users and sending mentions.
|
2023-03-01 14:23:58 +03:00 |
|
Timofey Boyko
|
cd67d8fef1
|
Web:Common:API: fix invitation links
|
2023-02-28 10:18:57 +03:00 |
|
Timofey Boyko
|
f5c8b9d051
|
Web:Client: add new type and role at invite panel
|
2023-02-22 15:57:27 +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 |
|
Viktor Fomin
|
0755ebc597
|
Common: add query for get settings with password
|
2023-02-15 11:52:19 +03:00 |
|
|
|
244612da1a
|
Web: PortalSettings: Payments: Added back url after payment.
|
2023-02-13 13:32:49 +03:00 |
|
|
|
ca2906ebee
|
Merge branch 'develop' into feature/notifications
# Conflicts:
# packages/client/src/store/FilesStore.js
|
2023-02-08 12:44:15 +03:00 |
|
|
|
c89b8ca427
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
# common/ASC.Data.Backup.Core/Storage/BackupStorageFactory.cs
# common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
|
2023-02-07 14:31:22 +03:00 |
|
|
|
68adfe1138
|
Web: Added enable/disable notifications to the context menu.
|
2023-02-06 16:55:19 +03:00 |
|
Vashchuk Nikita
|
ab7f24a68b
|
Merge branch 'release/rc-v1.2.0' into feature/notifications
|
2023-02-02 18:48:48 +05:00 |
|
|
|
864e3c9c33
|
Web: Notifications: Added api methods.
|
2023-01-27 16:22:21 +03:00 |
|
|
|
bd5ed45566
|
Fix Bug 60624 - Accounts. Alert Work in progress для Invite again, Time zone, Reset authentication
|
2023-01-24 12:18:56 +03:00 |
|
|
|
014262ac75
|
Web: Removed useless api @trash call on first load
|
2023-01-13 17:24:13 +03:00 |
|
|
|
ec84d70835
|
Web: Added count=1 to @root filter (fix speed issue)
|
2022-12-29 13:49:38 +03:00 |
|
|
|
113dfebaf8
|
Web: Added a check for the ability to move/copy to a folder.
|
2022-12-28 10:52:16 +03:00 |
|
|
|
294e139c49
|
Web: Files: fixed merge
|
2022-12-26 17:24:04 +03:00 |
|
|
|
ed5952894e
|
Merge branch 'release/rc-v1.2.0' into feature/added-request-cancel
# Conflicts:
# packages/common/api/files/index.js
|
2022-12-26 17:15:23 +03:00 |
|
|
|
b27045eb18
|
Web: Replaced pure axios to request function
|
2022-12-26 17:08:28 +03:00 |
|
|
|
0a034ef3c6
|
Web: Files: added cancel request
|
2022-12-26 16:58:45 +03:00 |
|
|
|
b3ef2c5baa
|
Fix Bug 60332 - Payments. Warning Request failed with status code 405
|
2022-12-26 14:01:34 +03:00 |
|
|
|
c28f6943dc
|
Web: Editor: Added onRequestReferenceData.
|
2022-12-16 19:34:01 +03:00 |
|
Timofey Boyko
|
30692753bf
|
Web: remove logoHandlers
|
2022-12-15 18:41:19 +03:00 |
|
Akmal Isomadinov
|
ae8040e7c0
|
Web:Common:Api:People:Filter Added getFilterWithOutDisabledUser static method
|
2022-12-14 18:17:15 +05:00 |
|
Timofey Boyko
|
3f588be767
|
Web:Common:API: refactoring getLogoIcon
|
2022-12-13 10:40:03 +03:00 |
|
|
|
be698591d2
|
Merge branch 'develop' into bugfix/room-logo
|
2022-12-12 18:07:59 +03:00 |
|
|
|
965867e3f5
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-12-12 17:22:03 +03:00 |
|
Timofey Boyko
|
8dd0b37250
|
Web:Common:API: fix for archive rooms getFolderInfo and getRoomInfo
|
2022-12-11 23:44:33 +03:00 |
|
Timofey Boyko
|
965b394789
|
Web:Common:API: update getFolder and getFolderInfo with getLogoIcon
|
2022-12-11 22:55:21 +03:00 |
|
Timofey Boyko
|
9b96920d7f
|
Web:Common:API: add getLogoIcon method, update getRooms and getRoomInfo methods with getLogoIcon
|
2022-12-11 22:54:31 +03:00 |
|
Viktor Fomin
|
f3c2c3830e
|
Common: API: add login method
|
2022-12-09 10:40:38 +03:00 |
|
Viktor Fomin
|
b8b0fe9139
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-12-02 14:55:23 +03:00 |
|
Timofey Boyko
|
d661c36791
|
Web:Common:API: add new parametr for rooms filter 'subjectFilter'
|
2022-12-01 11:25:55 +03:00 |
|
Timofey Boyko
|
266fdabda9
|
Web:Common:API: add payments parametr
|
2022-11-30 15:47:34 +03:00 |
|
Timofey Boyko
|
b2b137336c
|
Web:Common:API: add employeetype for accounts filter
|
2022-11-30 15:24:03 +03:00 |
|
Viktor Fomin
|
1fb1228dbd
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-24 02:33:13 +05:00 |
|
Viktor Fomin
|
248b2017ad
|
Common: API: delete useless
|
2022-11-22 12:34:57 +05:00 |
|
Vlada Gazizova
|
5884fa7acd
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-21 11:15:55 +03:00 |
|
TimofeyBoyko
|
1eaa81b43b
|
Web:Common:Api: fix request body for unarchive
|
2022-11-18 14:53:09 +03:00 |
|
|
|
7803b0e33c
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-08 16:54:02 +03:00 |
|
mushka
|
7ea5907259
|
fixed resend invitations api call and implemented it in members view
|
2022-11-03 17:06:13 +03:00 |
|
mushka
|
bb16de4ed9
|
Merge branch 'develop' into feature/info-panel-update and solved merge conflict
|
2022-11-03 14:52:11 +03:00 |
|
