|
c1c9b7de02
|
Merge branch 'develop' into feature/oauth2-client
|
2023-11-10 12:01:49 +03:00 |
|
Akmal Isomadinov
|
4bad9df7eb
|
Web:FilesSelector Added restore action
|
2023-11-03 15:30:26 +05:00 |
|
|
b593aa13f3
|
Client:PortalSettings:OAuth: fix fetch clients
|
2023-11-01 12:34:24 +03:00 |
|
Vladimir Khvan
|
8abea90a92
|
fix Bug 63907 | first name and last name validation was added
|
2023-10-27 18:12:01 +05:00 |
|
|
b5c55da859
|
Merge branch 'develop' into feature/oauth2-client
|
2023-10-27 11:34:56 +03:00 |
|
|
16fca0a7c8
|
Locales: add transltation keys for oauth scopes
|
2023-10-27 09:23:54 +03:00 |
|
Akmal Isomadinov
|
ac13bb8303
|
Client: moved into common translation
|
2023-10-11 16:49:13 +05:00 |
|
|
ad047bc372
|
Merge branch 'develop' into feature/oauth2-client
|
2023-10-02 10:05:58 +03:00 |
|
|
84afb50b66
|
merge from develop
|
2023-09-29 14:28:10 +03:00 |
|
|
f778106bc4
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 10:36:07 +03:00 |
|
|
807215a0cb
|
Web:Client:OAuth: fix mobx warning, add infinity list for table view
|
2023-09-27 18:13:07 +03:00 |
|
Viktor Fomin
|
8d606c78e7
|
Web: delete useless
|
2023-09-27 14:15:47 +03:00 |
|
|
b14d6c8ef0
|
Merge branch 'hotfix/v1.1.3' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
# config/appsettings.json
# config/nlog.config
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
# packages/client/src/pages/Confirm/sub-components/createUser.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/common/components/MoreLoginModal/index.tsx
# packages/login/src/client/components/sub-components/LoginForm.tsx
# products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Core/CspSettingsHelper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-09-25 10:53:06 +03:00 |
|
|
fd383577a0
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-25 08:53:04 +03:00 |
|
|
4048d8dc82
|
Web: removed useless translation key ResetButton
|
2023-09-22 17:21:24 +04:00 |
|
|
8371330d3c
|
Web: Applied new design
|
2023-09-22 16:39:08 +04:00 |
|
|
70b5c6e111
|
MErge branch 'develop' into feature/web-plugins
|
2023-09-21 14:30:04 +03:00 |
|
|
44dbeb48cd
|
Merge branch 'develop' into feature/document-service-location
|
2023-09-21 13:38:25 +04:00 |
|
|
9c9f33cf12
|
Merge pull request #1746 from ONLYOFFICE/feature/split-invite
Feature/split invite
|
2023-09-20 19:46:48 +04:00 |
|
Viktor Fomin
|
c0d87940f0
|
Web: move ExpiredLink translate to Common
|
2023-09-20 17:35:38 +03:00 |
|
gazizova-vlada
|
69961e6900
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 17:19:12 +03:00 |
|
gazizova-vlada
|
183b32c2aa
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 16:27:26 +03:00 |
|
|
bdabb35e55
|
Merge branch 'feature/leave-room' of github.com:ONLYOFFICE/AppServer into feature/leave-room
# Conflicts:
# public/locales/en/Common.json
|
2023-09-20 15:03:02 +03:00 |
|
|
940338fd9d
|
Web: Files: Leave-room: bugs fixed
|
2023-09-20 15:02:34 +03:00 |
|
|
b25b39da14
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-20 14:55:39 +03:00 |
|
|
3d20697ac0
|
Web: Translation: Fix UTC key duplication + sorting
|
2023-09-20 15:36:34 +04:00 |
|
gazizova-vlada
|
cc31a46cb9
|
Web:Fix common.
|
2023-09-20 12:53:29 +03:00 |
|
|
3a1bf92291
|
Merge branch 'develop' into feature/leave-room
|
2023-09-20 13:20:56 +04:00 |
|
|
e356f361f3
|
Merge pull request #1757 from ONLYOFFICE/feature/rtl-cron
Feature/rtl cron
|
2023-09-20 13:10:36 +04:00 |
|
Akmal Isomadinov
|
c1983fcfa6
|
Web:Cron Added translation
|
2023-09-20 13:34:26 +05:00 |
|
|
bf48ce5393
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 14:02:42 +03:00 |
|
|
ca76336fc3
|
Merge branch 'develop' into feature/leave-room
|
2023-09-19 10:44:07 +03:00 |
|
Vlada Gazizova
|
3471bbf09f
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-19 09:54:45 +03:00 |
|
|
d364748d84
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 09:23:13 +03:00 |
|
|
91ae0883e9
|
Web:Client:Plugins: fix plugin dialog
|
2023-09-19 08:58:48 +03:00 |
|
mushka-n
|
d98680b350
|
moved translations and updated selector
|
2023-09-18 17:10:16 +03:00 |
|
|
74f9ea784b
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-18 16:31:27 +04:00 |
|
|
33091f9304
|
Web: Client: fix long text in copy button
|
2023-09-18 12:55:29 +02:00 |
|
|
95424d49f9
|
Web: Added ru translations + autofixes
|
2023-09-18 14:17:00 +04:00 |
|
mushka-n
|
da7aec7445
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-18 13:06:39 +03:00 |
|
|
0deac4bf00
|
Merge branch 'develop' into feature/mobile-sdk
|
2023-09-18 13:45:20 +04:00 |
|
|
00c3d8a367
|
Merge branch 'develop' into feature/leave-room
# Conflicts:
# public/locales/en/Common.json
|
2023-09-15 18:46:34 +03:00 |
|
Viktor Fomin
|
15e58aa3c7
|
Web: add translates
|
2023-09-15 18:32:09 +03:00 |
|
|
9b5572552e
|
Web: Fix ru translations
|
2023-09-15 18:28:31 +04:00 |
|
|
d25e3e3d42
|
Web:Client:Plugins: add context menu item for all plugin actions, add opportunity change UNKNOWN file type and file.svg icon
|
2023-09-15 13:55:41 +03:00 |
|
Viktor Fomin
|
2f6861f43f
|
Web: add translates
|
2023-09-14 14:42:46 +03: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 |
|
mushka-n
|
95e3bc8f36
|
merge develop + merge fix
|
2023-09-11 13:52:47 +03:00 |
|
mushka-n
|
d96911a37c
|
merge develop + merge fix
|
2023-09-11 13:26:58 +03:00 |
|
|
1f77cf82a2
|
Merge branch 'develop' into feature/leave-room
|
2023-09-11 13:28:56 +04:00 |
|