|
|
6d78f37729
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-11 16:05:49 +03:00 |
|
|
|
8b52d93fd3
|
Init backend and environment build and run in docker
|
2022-10-11 16:01:03 +03:00 |
|
|
|
0a1ab5c77d
|
ApiSystem: fix
|
2022-10-11 15:52:45 +03:00 |
|
|
|
ded6b08e0e
|
fix GetTmpFilePath
|
2022-10-11 15:29:23 +03:00 |
|
|
|
c56a99dc8b
|
Merge branch 'feature/invite-panel' of github.com:ONLYOFFICE/DocSpace into feature/invite-panel
|
2022-10-11 14:26:53 +03:00 |
|
|
|
c677d98627
|
Web: Client: InvitePanel: Fixed property name
|
2022-10-11 14:26:46 +03:00 |
|
|
|
32cca0377d
|
Web: Client: InvitePanel: Added checking errors after change items
|
2022-10-11 14:26:09 +03:00 |
|
TimofeyBoyko
|
916730b0c4
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-11 16:12:45 +05:00 |
|
TimofeyBoyko
|
0540e6fce7
|
Web:Client: add manager user type for DocSpace
|
2022-10-11 16:11:37 +05:00 |
|
TimofeyBoyko
|
e3b4979daa
|
Web:Common:Api: update user roles
|
2022-10-11 16:07:36 +05:00 |
|
|
|
dc2cfbc614
|
Merge branch 'develop' into feature/apisystem
# Conflicts:
# web/ASC.Web.Core/PublicResources/Resource.resx
|
2022-10-11 13:53:31 +03:00 |
|
TimofeyBoyko
|
d557354690
|
Web:Components:Avatar: add new role 'manager'
|
2022-10-11 15:22:11 +05:00 |
|
|
|
9d050b0c6a
|
fix
|
2022-10-11 13:14:50 +03:00 |
|
|
|
1515c95af4
|
Web: Fixed styles.
|
2022-10-11 13:03:55 +03:00 |
|
|
|
2f64da592e
|
Merge branch 'develop' into bugfix/backup
|
2022-10-11 12:52:13 +03:00 |
|
Sergey Kirichenko
|
8d528450dc
|
Modify root path (#904)
|
2022-10-11 12:44:22 +03:00 |
|
Viktor Fomin
|
cd2acf9602
|
Login: fix button size
|
2022-10-11 14:38:05 +05:00 |
|
TimofeyBoyko
|
7a1ddd3c20
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-11 14:04:42 +05:00 |
|
|
|
a47ce3d8c0
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-11 11:58:25 +03:00 |
|
|
|
538300d205
|
Merge pull request #886 from ONLYOFFICE/feature/stripe
Feature/stripe
|
2022-10-11 11:56:09 +03:00 |
|
|
|
fcabf8b73c
|
fix
|
2022-10-11 11:13:22 +03:00 |
|
|
|
b160c16fc2
|
creating rooms and users feature available only for paid portals
|
2022-10-11 11:02:43 +03:00 |
|
|
|
f013c74475
|
Web: Added additional units for measuring the amount of information, added verification.
|
2022-10-11 10:58:10 +03:00 |
|
TimofeyBoyko
|
f91604d316
|
Merge branch 'develop' into feature/bar-quotas
|
2022-10-11 12:55:55 +05:00 |
|
|
|
cf2547e030
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/common/constants/index.js
|
2022-10-11 10:20:42 +03:00 |
|
|
|
0d7f77a18a
|
Merge pull request #897 from ONLYOFFICE/bugfix/accounts-filter
Bugfix/accounts filter
|
2022-10-11 10:12:57 +03:00 |
|
TimofeyBoyko
|
fe8b7ec257
|
Web:Client: add 'DocSpaceAdmin' translation key
|
2022-10-11 12:12:38 +05:00 |
|
TimofeyBoyko
|
4f03d67b58
|
Web:Client:InfoPanel: fix user role
|
2022-10-11 12:05:58 +05:00 |
|
|
|
6bf3720ace
|
Merge pull request #903 from ONLYOFFICE/feature/doc-space-info-panel
Feature/info panel udpate
|
2022-10-11 09:53:29 +03:00 |
|
TimofeyBoyko
|
da14ffd656
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-11 11:52:34 +05:00 |
|
mushka
|
09ece8865d
|
removed old unused methods
|
2022-10-11 09:51:21 +03:00 |
|
|
|
4dd439e408
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-10 21:21:08 +03:00 |
|
|
|
8e3826bd71
|
Merge pull request #699 from ONLYOFFICE/feature/doc-space-info-panel
InfoPanel for DocSpace
|
2022-10-10 21:18:11 +03:00 |
|
|
|
190ee44952
|
fix
|
2022-10-10 19:52:12 +03:00 |
|
mushka
|
0da82b28eb
|
added mechanism of searcing an account on its link click
|
2022-10-10 19:41:09 +03:00 |
|
|
|
7b3bd37f2c
|
Web:Client:Add method onClickReconnectStorage, add object "reconnect-storage" in optionsModel in getFilesContextOptions in ContextOptionsStore. Add props isConnectDialogReconnect, setIsConnectDialogReconnect, saveAfterReconnectOAuth, setSaveAfterReconnectOAuth in ConnectDialog. Add changeable header, add toastr in saveThirdParty in ConnectDialog.
|
2022-10-10 19:24:23 +03:00 |
|
|
|
c5bba6a596
|
Web:Client:Add setIsConnectDialogReconnect, setSaveAfterReconnectOAuth, saveAfterReconnectOAuth, isConnectDialogReconnect.
|
2022-10-10 19:16:40 +03:00 |
|
|
|
4dbf1e70b7
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.ActiveDirectory/GlobalUsings.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
|
2022-10-10 19:16:03 +03:00 |
|
|
|
ec45c0b4c7
|
Web:Client:Add "reconnect-storage" in roomOptions.
|
2022-10-10 19:15:16 +03:00 |
|
|
|
16dc28d6b2
|
Web:Client:Moved getting connectItems to ThirdPartyStore.
|
2022-10-10 19:14:33 +03:00 |
|
|
|
60b9ed3dd1
|
Web:Add translation "ReconnectStorage".
|
2022-10-10 19:13:01 +03:00 |
|
|
|
49d6884502
|
Web:Client:Add translation "SuccessfulConnectionOfAThirdParty".
|
2022-10-10 19:12:26 +03:00 |
|
|
|
b018be53f9
|
Web:Client:Add reconnect image.
|
2022-10-10 19:11:37 +03:00 |
|
mushka
|
0608694746
|
fixed account email text truncation
|
2022-10-10 18:47:33 +03:00 |
|
mushka
|
edb3f894f6
|
fixed selected folder path parts error
|
2022-10-10 18:38:52 +03:00 |
|
mushka
|
415c620574
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-10 17:27:16 +03:00 |
|
mushka
|
946c4a8408
|
selectionParentRoom setting mechanism fix
|
2022-10-10 17:21:43 +03:00 |
|
mushka
|
be3bb23144
|
fixed loader error in accounts
|
2022-10-10 17:19:19 +03:00 |
|
TimofeyBoyko
|
998c06d0ea
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-10 19:04:53 +05:00 |
|
|
|
b12f7a5696
|
Merge pull request #901 from ONLYOFFICE/bugfix/block-move-to-button
Bugfix/block move to button
|
2022-10-10 17:04:48 +03:00 |
|
