|
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 |
|
|
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 |
|
TimofeyBoyko
|
3700193ddb
|
Web:Client:Accounts: fix managaer role at filter
|
2022-11-03 12:39:25 +05:00 |
|
|
0ba888ef5b
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-02 20:40:59 +03:00 |
|
|
31c6e0a7aa
|
Web:Common:Add delete method.
|
2022-11-01 18:26:05 +03:00 |
|
mushka
|
c7603626f5
|
created new updateRoomMemberRole api callout
|
2022-10-31 18:27:03 +03:00 |
|
Elyor Djalilov
|
c4ff1d057c
|
Merge branch 'develop' into feature/active-sessions
|
2022-10-31 11:24:05 +05:00 |
|
|
8375711b5c
|
Web: Client: InvitePanel: Fixed invitation links usage for rooms
|
2022-10-28 11:24:25 +03:00 |
|
|
c5ed1fd0da
|
Web: Client: Store: Added invite users action and api methods
|
2022-10-27 17:00:45 +03:00 |
|
Elyor Djalilov
|
42471135ba
|
Merge branch 'develop' into feature/active-sessions
# Conflicts:
# packages/client/src/components/dialogs/index.js
# packages/components/themes/base.js
# packages/components/themes/dark.js
|
2022-10-25 13:41:42 +05:00 |
|
Viktor Fomin
|
bc5458bd21
|
Merge branch 'develop' into feature/portal-deactivation
|
2022-10-24 18:38:02 +05:00 |
|
Elyor Djalilov
|
cabc463451
|
Web:Client:ActiveSessions: added mobile view
|
2022-10-24 17:14:49 +05:00 |
|
TimofeyBoyko
|
30799fa082
|
Merge branch 'develop' into bugfix/files-context-menu
|
2022-10-24 14:09:25 +05:00 |
|
TimofeyBoyko
|
561cc3b550
|
Web:Common:API: fix archiveRoom method
|
2022-10-20 21:34:21 +05:00 |
|
|
9e0bc49c6f
|
Merge branch 'develop' into feature/portal-deactivation
|
2022-10-20 15:04:54 +03:00 |
|
|
0d680dd005
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-20 11:36:22 +03:00 |
|
|
9c99f3a53f
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-19 19:41:39 +03:00 |
|
Elyor Djalilov
|
d819128bdb
|
Web:Client:ActiveSessions: added translations
|
2022-10-19 18:30:22 +05:00 |
|
|
1fac4168fe
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-17 11:02:59 +03:00 |
|
TimofeyBoyko
|
b3395efe50
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-17 11:45:25 +05:00 |
|
Viktor Fomin
|
4544621c41
|
fix after merge
|
2022-10-15 14:00:55 +05:00 |
|