|
|
9c9f33cf12
|
Merge pull request #1746 from ONLYOFFICE/feature/split-invite
Feature/split invite
|
2023-09-20 19:46:48 +04:00 |
|
Viktor Fomin
|
33a7bce641
|
Merge branch 'develop' into feature/split-invite
|
2023-09-20 16:50:26 +03:00 |
|
gazizova-vlada
|
183b32c2aa
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 16:27:26 +03:00 |
|
|
|
17fbf76e92
|
fix urlShortener
|
2023-09-20 11:35:35 +03:00 |
|
Viktor Fomin
|
73118da8f2
|
Merge branch 'develop' into feature/split-invite
|
2023-09-20 10:52:17 +03:00 |
|
|
|
94bf145445
|
Merge branch 'develop' into feature/urlShortener
|
2023-09-19 19:45:18 +03:00 |
|
|
|
f6c1406cea
|
fix urlShortener
|
2023-09-19 19:42:01 +03:00 |
|
|
|
c20e935cec
|
Api: FormGalleryDto. Mapping
|
2023-09-19 16:38:44 +03:00 |
|
Viktor Fomin
|
19e1b51887
|
Merge branch 'develop' into feature/split-invite
|
2023-09-19 14:04:18 +03:00 |
|
|
|
f15953bbe4
|
Revert "oform" config + added "upload" section
|
2023-09-19 13:43:26 +04:00 |
|
|
|
4b368870ab
|
Added new FormGallery config (+ extended API settings)
|
2023-09-19 13:11:34 +04:00 |
|
|
|
ed8c4707a3
|
Merge branch 'feature/split-invite' of github.com:ONLYOFFICE/DocSpace into feature/split-invite
|
2023-09-14 17:38:05 +03:00 |
|
|
|
9bc66531ed
|
added room name and id to validation response
|
2023-09-14 17:37:52 +03:00 |
|
|
|
7aff59b652
|
update urlShortener
|
2023-09-13 16:49:29 +03:00 |
|
|
|
ad93ede662
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data
# Conflicts:
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
|
2023-09-13 15:44:16 +03:00 |
|
|
|
463c2d81a2
|
Api: sso. hideAuthPage
|
2023-09-13 12:21:09 +03:00 |
|
|
|
c3495ce668
|
Merge pull request #1737 from ONLYOFFICE/feature/short-links
Feature/short links
|
2023-09-13 09:21:59 +03:00 |
|
|
|
5be921b540
|
Merge branch 'develop' into feature/back-ar
|
2023-09-12 18:01:15 +04:00 |
|
|
|
675590854c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data
# Conflicts:
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
# products/ASC.People/Server/Api/UserController.cs
|
2023-09-12 15:18:27 +03:00 |
|
|
|
e419f8ab40
|
added default link shortening
|
2023-09-12 14:54:59 +03:00 |
|
|
|
6cf75e74f8
|
Api: sso. HideAuthPage for anonymous
|
2023-09-11 17:55:57 +03:00 |
|
|
|
166208565f
|
Merge pull request #1724 from ONLYOFFICE/feature/remove-ser-attr
removed Serializable attribute
|
2023-09-11 07:33:57 -07:00 |
|
|
|
c5ba70846c
|
added ar
|
2023-09-11 16:10:48 +03:00 |
|
|
|
7bd76d4782
|
added ar
|
2023-09-08 17:12:01 +03:00 |
|
|
|
2283184a61
|
removed Serializable attribute
|
2023-09-08 16:24:24 +03:00 |
|
|
|
07aa2dda5a
|
Merge branch 'develop' into feature/accounts-optimization
|
2023-09-08 10:47:32 +03:00 |
|
|
|
675755aedd
|
Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into develop
|
2023-09-08 09:46:59 +03:00 |
|
|
|
b5c2572dbc
|
Merge pull request #1712 from ONLYOFFICE/feature/adding_translations-back
Feature/adding translations back
|
2023-09-07 03:24:27 -07:00 |
|
|
|
1b42dc1449
|
added translations
|
2023-09-07 12:15:31 +03:00 |
|
|
|
a3ab99638c
|
added pt-PT
|
2023-09-07 09:49:49 +03:00 |
|
|
|
cc10a5c221
|
added pt-PT
|
2023-09-06 17:28:27 +03:00 |
|
gazizova-vlada
|
b224b1bb8f
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-06 13:00:15 +03:00 |
|
|
|
9a9dad8381
|
CSP: fixed room upload logo
|
2023-09-05 18:27:34 +03:00 |
|
|
|
2792df1a84
|
added pt-PT
|
2023-09-05 17:23:59 +03:00 |
|
|
|
98583fcbd1
|
added sk, ko
|
2023-09-05 15:36:38 +03:00 |
|
|
|
0369705ae3
|
Merge branch 'develop' into feature/accounts-optimization
# Conflicts:
# products/ASC.People/Server/Api/UserController.cs
|
2023-09-05 11:22:06 +03:00 |
|
|
|
96b916d81e
|
Merge branch 'hotfix/v1.1.3' into develop
|
2023-09-05 09:45:42 +04:00 |
|
|
|
d864448da5
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# products/ASC.Files/Core/Core/VirtualRooms/InvitationLinkService.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/PortalController.cs
|
2023-09-04 23:01:50 +03:00 |
|
|
|
2fd15b4108
|
Merge pull request #1699 from ONLYOFFICE/refacroting/csp-to-core
common: move cspsettings from web.api to core.common project
|
2023-09-04 10:44:38 -07:00 |
|
|
|
715c21f090
|
added ko, sk
|
2023-09-04 18:21:40 +03:00 |
|
|
|
d3198671ba
|
Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into feature/zoom-login
# Conflicts:
# packages/common/constants/index.js
|
2023-09-04 16:38:06 +03:00 |
|
|
|
ba2233ca7a
|
common: move cspsettings from web.api to core.common project
|
2023-09-04 15:13:18 +03:00 |
|
|
|
f6ca59874d
|
zoom: add keys and add in AuthProviders
|
2023-09-04 14:46:48 +03:00 |
|
gazizova-vlada
|
6de452efac
|
Merge branch 'develop' into feature/login-settings
|
2023-09-01 16:56:55 +03:00 |
|
|
|
4439425625
|
fix Bug 63942
|
2023-09-01 16:00:56 +03:00 |
|
|
|
3e6a417d19
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
# migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
# packages/client/src/components/panels/SelectFileDialog/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js
# packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
# packages/client/src/store/ProfileActionsStore.js
# packages/common/api/files/index.js
# packages/common/store/AuthStore.js
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# yarn.lock
|
2023-09-01 15:33:39 +03:00 |
|
|
|
a85a721a3b
|
ASC.Web.Core: BruteForceLoginManager: fixed recaptcha check
|
2023-08-31 18:41:06 +03:00 |
|
|
|
9694959958
|
Csp: allow all for baseDomain
|
2023-08-31 18:19:06 +03:00 |
|
|
|
b94486328f
|
Sso: settings.
|
2023-08-31 11:17:35 +03:00 |
|
gazizova-vlada
|
629b42161c
|
Merge branch 'develop' into feature/login-settings
|
2023-08-31 09:57:26 +03:00 |
|
