|
b5c55da859
|
Merge branch 'develop' into feature/oauth2-client
|
2023-10-27 11:34:56 +03:00 |
|
Viktor Fomin
|
d858434750
|
Client: PortalSettings: TFA: delete useless
|
2023-10-26 14:29:35 +03:00 |
|
|
abbeba5d32
|
Web: Files: removed unused translations
|
2023-10-19 14:29:24 +03:00 |
|
|
cdb2aaae15
|
Merge branch 'release/v2.0.0' into feature/public-room-translations
|
2023-10-18 20:10:29 +04:00 |
|
|
704e40ab6e
|
Merge branch 'release/v2.0.0' into feature/room-index
|
2023-10-18 16:54:38 +03:00 |
|
|
24d8530aa2
|
Web: Files: fixed translations
|
2023-10-18 16:16:28 +03:00 |
|
|
fc93d059b9
|
Web: Files: added new translations for the public-room
|
2023-10-18 14:49:15 +03:00 |
|
|
d4722fd01b
|
Merge pull request #17 from ONLYOFFICE/bugfix/Bug57787
Bugfix/bug57787
|
2023-10-17 18:58:14 +04:00 |
|
|
38b1bb5c06
|
Merge pull request #16 from ONLYOFFICE/feature/room-primary-link
Feature/room primary link
|
2023-10-17 18:45:29 +04:00 |
|
|
ed36ed779a
|
Web: Files: added CopyPrimaryLink translation
|
2023-10-17 13:57:35 +03:00 |
|
|
3bcef0dace
|
Web: Files: fixed link translation
|
2023-10-17 13:52:43 +03:00 |
|
|
6a70407eb9
|
Web: Files: fixed translations
|
2023-10-17 13:20:29 +03:00 |
|
|
7cac4ffee2
|
Merge branch 'release/v2.0.0' into feature/room-index
|
2023-10-17 12:34:39 +03:00 |
|
Viktor Fomin
|
51728a6d66
|
Client: add translate
|
2023-10-17 11:30:50 +03:00 |
|
|
b99c5591b1
|
Fix ru translation
|
2023-10-17 11:14:43 +04:00 |
|
Subhonbek
|
17ebbccf57
|
web client add locales word
|
2023-10-16 17:28:01 +03:00 |
|
|
6ac05b3a56
|
Web: Files: Fixed archive view
|
2023-10-16 15:51:56 +03:00 |
|
|
582e96991a
|
Web: Files: fixed custom room view
|
2023-10-16 14:55:25 +03:00 |
|
|
1f6e3aa3a3
|
Merge branch 'develop' into feature/room-primary-link
# Conflicts:
# packages/client/src/components/QuickButtons.js
# packages/client/src/components/panels/EditLinkPanel/index.js
|
2023-10-13 18:27:53 +03:00 |
|
|
3172bcdd02
|
Web: Files: DeleteLinkDialog: added new translations
|
2023-10-11 18:19:35 +03:00 |
|
Akmal Isomadinov
|
ac13bb8303
|
Client: moved into common translation
|
2023-10-11 16:49:13 +05:00 |
|
Akmal Isomadinov
|
fe81178f91
|
Client:Store:FilesActionsStore: Added toast for pinning/unpinning multiple rooms
|
2023-10-11 12:25:14 +05:00 |
|
Akmal Isomadinov
|
66d8177ab8
|
Client: Fixed public room selection
|
2023-10-09 13:32:33 +05:00 |
|
Viktor Fomin
|
6cb3ef610d
|
Client: delete useless
|
2023-10-06 15:03:29 +03:00 |
|
mushka-n
|
d1b60f6b5b
|
fixed MessageEmailActivationInstuctionsSentOnEmail translation key
|
2023-10-06 12:02:43 +03:00 |
|
|
3cdbdd6521
|
Web: Files: added new translations
|
2023-10-05 15:41:50 +03:00 |
|
|
ad047bc372
|
Merge branch 'develop' into feature/oauth2-client
|
2023-10-02 10:05:58 +03:00 |
|
|
13d090c178
|
Web: Added ru translations + autofixes
|
2023-09-29 17:59:55 +04:00 |
|
|
1e8fac378c
|
Web:Client:Plugin: apply new layouts, add delete dialog
|
2023-09-29 15:32:27 +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 |
|
|
3e204513a4
|
Web: added ru translation (FileManagement key) + autosorting
|
2023-09-28 12:44:30 +04:00 |
|
Viktor Fomin
|
005e1b4ff5
|
Merge branch 'develop' into feature/profile-redesign
|
2023-09-27 12:26:24 +03:00 |
|
Viktor Fomin
|
6604167a14
|
Client: add translate
|
2023-09-27 00:04:52 +03:00 |
|
|
ea3c18dcc7
|
Merge branch 'develop' into feature/room-share-optimization
|
2023-09-26 12:21:59 +04:00 |
|
|
88b283a28a
|
Web: Changed translations of NotFoundUsersDescription, SearchEmptyDescription keys
|
2023-09-26 12:21:40 +04:00 |
|
|
dc1274fb88
|
Web:Client:PortalSettings: add OAuth empty page
|
2023-09-25 17:03:25 +03:00 |
|
|
796cbf3265
|
Merge branch 'develop' into feature/room-share-optimization
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2023-09-25 15:58:53 +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 |
|
|
3c9dfca8c8
|
Web: Removed useless translations
|
2023-09-22 17:16:52 +04:00 |
|
|
a6d9ea95e9
|
Web: Removed useless key DNSSettingsTooltip
|
2023-09-22 17:13:57 +04:00 |
|
|
a4a89ed1c4
|
web: Fix DocumentServiceLocationHeaderInfo value + auto refactoing
|
2023-09-22 16:25:41 +04:00 |
|
|
5dab788680
|
Web: Files: InfoPanel: added infinite-loader to members list
|
2023-09-22 15:10:48 +03: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
|
b3023358f2
|
Client: delete useless
|
2023-09-20 17:35:56 +03:00 |
|
gazizova-vlada
|
69961e6900
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 17:19:12 +03:00 |
|
|
f1da568484
|
Merge branch 'develop' into feature/split-invite
|
2023-09-20 18:16:31 +04:00 |
|