Akmal Isomadinov
|
99b0c90219
|
Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
# packages/client/public/locales/en/Files.json
# packages/common/utils/image-helpers.js
|
2023-11-17 11:30:49 +05:00 |
|
|
|
40e941d4db
|
Merge branch 'release/v2.0.0' into feature/form-gallery-error-view
|
2023-11-16 23:03:36 +04:00 |
|
namushka
|
becc3ca8b0
|
remake of ErrorView component as an EmpySceenContainer instance
|
2023-11-16 15:22:43 +03:00 |
|
|
|
7d87515d0c
|
Fix UselessTranslationKeysTest (removed useless FolderId key)
|
2023-11-16 13:53:11 +04:00 |
|
|
|
b7dad01e22
|
Fix UselessTranslationKeysTest (removed useless FolderContents key)
|
2023-11-16 13:37:15 +04:00 |
|
|
|
f4863d06fe
|
Fix UselessTranslationKeysTest (removed useless EmptyFolderHeader key)
|
2023-11-16 13:32:25 +04:00 |
|
|
|
eb488e6caf
|
Fix UselessTranslationKeysTest (removed useless Destroy key)
|
2023-11-16 13:28:04 +04:00 |
|
|
|
2a0fa54d13
|
Fix UselessTranslationKeysTest (removed useless DeleteGroupUsersSuccessMessage key)
|
2023-11-16 13:25:40 +04:00 |
|
|
|
effc12a846
|
Fix UselessTranslationKeysTest (removed useless ConnectEmpty key)
|
2023-11-16 13:23:12 +04:00 |
|
|
|
9a920c0d45
|
Fix UselessTranslationKeysTest (removed useless UploadPluginsHere key)
|
2023-11-16 13:19:09 +04:00 |
|
|
|
766019c7c9
|
Fix UselessTranslationKeysTest (removed useless Webhook key)
|
2023-11-16 13:13:19 +04:00 |
|
|
|
d3f32a3f38
|
Fix UselessTranslationKeysTest (removed useless keys)
|
2023-11-16 13:09:46 +04:00 |
|
|
|
553c66ad33
|
Fix UselessTranslationKeysTest (removed useless keys)
|
2023-11-16 13:05:52 +04:00 |
|
|
|
64ac2715a6
|
Fix UselessTranslationKeysTest (removed useless keys)
|
2023-11-16 13:02:19 +04:00 |
|
|
|
4430b177fe
|
Fix UselessTranslationKeysTest (removed useless AutoBackupHelp and AutoBackupHelpNote keys)
|
2023-11-16 12:55:40 +04:00 |
|
|
|
a371331c60
|
Fix UselessTranslationKeysTest (removed useless AdminsMessageDescription and AdminsMessageHelper keys)
|
2023-11-16 12:52:23 +04:00 |
|
|
|
b185b5a7cc
|
Fix translation MessageEmailActivationInstuctionsSentOnEmail key
|
2023-11-16 12:41:15 +04:00 |
|
|
|
ec8d56951b
|
Web: Client: fix when text overflows in version history badge
|
2023-11-15 18:34:56 +01:00 |
|
|
|
86484af409
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-15 15:44:20 +03:00 |
|
|
|
e9a292004a
|
Fix EnDublicatesByContentTest (moved "Price" and "Free" keys to Common translations)
|
2023-11-15 14:47:32 +04:00 |
|
|
|
e161432f3a
|
Fix EmptyValueKeysTest (removed useless EmptyScreenDescription, GalleryEmptyScreenDescription, GalleryEmptyScreenHeader)
|
2023-11-15 14:38:49 +04:00 |
|
|
|
3a2c002d72
|
Fix FullEnDublicatesTest (moved "Plugins" key to Common translations)
|
2023-11-15 14:32:58 +04:00 |
|
|
|
331a06b67f
|
Auto-sorting
|
2023-11-15 14:08:59 +04:00 |
|
Akmal Isomadinov
|
36bb6da9ce
|
Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
# packages/client/src/store/FilesStore.js
|
2023-11-13 10:33:45 +05:00 |
|
|
|
65bf52310b
|
Merge branch 'release/v2.0.0' into bugfix/portal-restriction
|
2023-11-10 22:47:44 +04:00 |
|
|
|
0fa27aeb8e
|
Added translation key "ErrorAccountAlreadyUse"
|
2023-11-10 16:39:22 +03:00 |
|
|
|
c8ee4d0560
|
Web: Files: Public-room: fixed translations
|
2023-11-10 13:41:37 +03:00 |
|
|
|
500bafeac7
|
Web: Added portal restriction error component.
|
2023-11-10 12:53:20 +03:00 |
|
|
|
5be61afd7d
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-09 19:05:58 +03:00 |
|
|
|
56b0bb1f8b
|
Web: Files: changed delete-link translation, added new icon
|
2023-11-09 17:12:51 +03:00 |
|
Akmal Isomadinov
|
8fd1f5d546
|
Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
# packages/client/src/components/Badges.js
# packages/client/src/components/EmptyContainer/EmptyFolderContainer.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/pages/Home/InfoPanel/Body/helpers/MembersHelper.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/SelectedFolderStore.js
|
2023-11-05 22:20:45 +05:00 |
|
mushka-n
|
2fcebdd5d8
|
Merge branch 'release/v2.0.0' into feature/new-form-gallery
|
2023-11-01 18:43:11 +03:00 |
|
mushka-n
|
0b54b0d1c2
|
code cleanup
|
2023-11-01 12:39:17 +03:00 |
|
mushka-n
|
fed4bf3235
|
new empty info panel view + translation and styling fixes
|
2023-10-30 15:30:38 +03:00 |
|
Elyor Djalilov
|
22b281c3de
|
useless translate was deleted
|
2023-10-30 16:12:04 +05:00 |
|
Elyor Djalilov
|
54ecdf8b95
|
useless translate was deleted
|
2023-10-30 15:17:50 +05:00 |
|
mushka-n
|
6ac7700678
|
merge release + merge fix
|
2023-10-27 15:10:43 +03:00 |
|
Viktor Fomin
|
d858434750
|
Client: PortalSettings: TFA: delete useless
|
2023-10-26 14:29:35 +03:00 |
|
mushka-n
|
5805f1b995
|
Merge branch 'release/v2.0.0' into feature/new-form-gallery
|
2023-10-20 11:09:31 +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 |
|
mushka-n
|
65e809cd97
|
merge release + merge resolve
|
2023-10-18 14:26:12 +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 |
|
Viktor Fomin
|
2251c6f310
|
Merge branch 'develop' into feature/my-documents-share
|
2023-10-16 20:14:33 +03: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 |
|
mushka-n
|
5ec8dec79e
|
merge new develop + merge changes
|
2023-10-05 11:23:00 +03:00 |
|
Akmal Isomadinov
|
477d648980
|
Web: Added badge
|
2023-10-05 12:31:06 +05:00 |
|
Akmal Isomadinov
|
bdddc705bb
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Entries/Folder.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/FilterTypeEnum.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs
# products/ASC.Files/Server/Api/VirtualRoomsController.cs
# products/ASC.Files/Core/Helpers/DocSpaceHelper.cs
|
2023-10-04 14:34:03 +05:00 |
|
Viktor Fomin
|
f6f3369b8a
|
Merge branch 'develop' into feature/my-documents-share
|
2023-10-02 12:21:15 +03:00 |
|
mushka-n
|
e91f1f2e61
|
added translation keys
|
2023-10-02 03:52:47 +03:00 |
|
|
|
13d090c178
|
Web: Added ru translations + autofixes
|
2023-09-29 17:59:55 +04:00 |
|
Akmal Isomadinov
|
0748d05c19
|
Web: Added alert badge
|
2023-09-29 18:41:26 +05:00 |
|
|
|
1e8fac378c
|
Web:Client:Plugin: apply new layouts, add delete dialog
|
2023-09-29 15:32:27 +03:00 |
|
|
|
f778106bc4
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 10:36:07 +03:00 |
|
Viktor Fomin
|
a220a39f38
|
Client: add translate
|
2023-09-28 18:50:23 +03:00 |
|
Viktor Fomin
|
9bfe6a57af
|
Client: delete useless
|
2023-09-28 18:50:14 +03:00 |
|
Viktor Fomin
|
d11f3a997f
|
Client: add translate
|
2023-09-28 15:56:49 +03:00 |
|
Akmal Isomadinov
|
ec45eebb88
|
Web:FormRoom: Added empty screen
|
2023-09-28 17:21:07 +05: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 |
|
|
|
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 |
|
mushka-n
|
10f8b0e00a
|
Merge branch 'develop' into feature/new-form-gallery
|
2023-09-25 14:25:46 +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 |
|
Akmal Isomadinov
|
d70c057848
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
|
2023-09-25 10:40:22 +05:00 |
|
mushka-n
|
a843a45b09
|
merge develop + merge fix
|
2023-09-23 23:52:51 +03:00 |
|
mushka-n
|
4cf63b74b7
|
added empty screen translation key
|
2023-09-23 23:49:13 +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 |
|
Akmal Isomadinov
|
0d46cd6394
|
Web:CreateEditRoomDialog: Added SystemFolders component
|
2023-09-22 16:41:06 +05:00 |
|
Akmal Isomadinov
|
d4211afcab
|
Web: Added translations
|
2023-09-21 19:31:10 +05: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 |
|
