mushka
|
58e68c1c12
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-08 17:23:02 +03:00 |
|
mushka
|
3facc47665
|
removed reasssign data link and unuseful comment from DeleteUser and ConnectCloud
|
2022-07-08 12:50:44 +03:00 |
|
|
|
7af929fee8
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# products/ASC.People/Server/Models/MemberModel.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-07-07 17:41:41 +03:00 |
|
mushka
|
2ba523da5f
|
fixed translations in ConflictResolve, Convert, MoveToTrash, DeleteUser and DeleteUsers dialogs
|
2022-07-07 17:40:23 +03:00 |
|
mushka
|
a75fdc7690
|
fixed ChangedStatus and DeleteUsers
|
2022-07-07 13:36:50 +03:00 |
|
|
|
a04ae63a82
|
MemberModel: CultureName
|
2022-07-07 12:05:31 +03:00 |
|
mushka
|
3fd65e887d
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-07-06 18:13:33 +03:00 |
|
mushka
|
b80f1c3237
|
redesigned SendInviteDialog and fixed VersionHistory
|
2022-07-06 18:01:38 +03:00 |
|
mushka
|
ce4e9c26fd
|
removed divider from ConflicResolve and added second btn to ChangeEmail and ChangePassword
|
2022-07-06 13:02:52 +03:00 |
|
|
|
aeac8613a8
|
Merge branch 'develop' into features/enum_generator
|
2022-07-05 17:22:43 +03:00 |
|
|
|
1218d31a42
|
enum generator
|
2022-07-05 16:58:11 +03:00 |
|
|
|
ed45bb0118
|
Fix Bug 57978 - Client.Clouds. Rename button 'Delete third-party' to 'Disconnect'
|
2022-07-05 16:58:05 +03:00 |
|
mushka
|
6566ca8645
|
removed unnecessary extra margin from second button on several dialogs
|
2022-07-05 15:31:17 +03:00 |
|
|
|
36ea73cbdc
|
Web: People: ProfileInfo: add offsetLeft
|
2022-07-05 13:34:50 +03:00 |
|
mushka
|
9f002e3249
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-07-05 12:17:58 +03:00 |
|
|
|
90fe1383b7
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-04 18:04:06 +03:00 |
|
|
|
d8a459f397
|
Web: i18n: Replaced i18next-http-backend package with custom realization from @appserver/common/utils/i18next-http-backend (fix issue: too many same translations files are loading at once)
|
2022-07-04 17:47:12 +03:00 |
|
mushka
|
24c0397ef0
|
fixed DeleteProfileEver and DeleteUsersDialog + fixed ModalDialogComponent
|
2022-07-04 13:20:18 +03:00 |
|
|
|
fb09f62881
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-04 11:39:38 +03:00 |
|
|
|
0f901bf6e3
|
added hy-AM
|
2022-07-04 11:38:57 +03:00 |
|
|
|
d6b7db91e3
|
Web: Translations: Added translations minimization
|
2022-07-03 13:25:41 +03:00 |
|
Vashchuk Nikita
|
5a0acc8eaa
|
Renaming folders for contexts and models
|
2022-07-01 14:23:07 +03:00 |
|
|
|
74d238bde8
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Common/Caching/KafkaCache.cs
# common/ASC.Common/Logging/Log.cs
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Backup.Core/BackupResource.Designer.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
# products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs
# products/ASC.Files/Core/Core/Compress/CompressToZip.cs
# products/ASC.Files/Core/Core/Compress/ICompress.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Resources/FilesJSResource.Designer.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
|
2022-06-30 16:13:31 +03:00 |
|
|
|
6b2f643441
|
Fix Bug 57852: add flags for languages combo
|
2022-06-30 11:25:20 +03:00 |
|
|
|
167a6b0db6
|
Fixed Bug 57770 - Client.Profile. Fixed display of the current theme after saving the profile
|
2022-06-28 12:45:49 +03:00 |
|
|
|
435a0f53bd
|
Fix Bug 57775: Profile tab is not static when swipe
|
2022-06-27 14:13:07 +03:00 |
|
|
|
2a854f1782
|
Fixed Bug 57770 - Client.Profile. Fixed display of the current theme after saving the profile
|
2022-06-27 09:49:44 +03:00 |
|
|
|
9f97d1f2b7
|
Fixed Bug 57733 - Client.Profile. Fixed update header-profile
|
2022-06-22 16:38:48 +03:00 |
|
|
|
aad8a92b4c
|
RoomInvite replaced by LinkInvite
|
2022-06-21 20:33:05 +03:00 |
|
|
|
b318b0390e
|
Fix Bug 57662: missing email in translation
|
2022-06-21 13:23:48 +03:00 |
|
|
|
6619e40896
|
Fix Bug 57690: current email when changing
|
2022-06-21 13:17:30 +03:00 |
|
|
|
3fdf32f445
|
Fixed Bug 57674: Client: People: Fixed DropDown out of page border opening
|
2022-06-20 23:02:33 +03:00 |
|
|
|
db89e1684c
|
Fixed Bug 57676: Client: People: Profile: Disabled email interaction for self profile
|
2022-06-20 21:52:21 +03:00 |
|
|
|
3c2c147662
|
Fixed Bug 57678: Client: People: Profile: Disabled toggle option for "Interface theme" parameter
|
2022-06-20 21:45:33 +03:00 |
|
|
|
46d495080a
|
Fixed Bug 57634: Web: Client: People: Fixed displaying "Sex" field for personal mode
|
2022-06-20 21:41:43 +03:00 |
|
|
|
e68ac70005
|
Merge branch 'develop' into feature/docspace
|
2022-06-20 12:15:08 +03:00 |
|
mushka
|
d4cfd235fc
|
merge with release
|
2022-06-20 11:25:28 +03:00 |
|
|
|
e2cee2c2fc
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.FederatedLogin/OAuth20Token.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/ASC.Resource.Manager/Program.cs
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# config/appsettings.json
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/ThumbnailSettings.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
# products/ASC.Files/Core/Model/SessionModel.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
# products/ASC.Files/Core/ThirdPartyApp/Token.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/DocStore
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Server/ASC.People.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
# web/ASC.Web.Core/PublicResources/Resource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
# web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-06-19 22:44:48 +03:00 |
|
|
|
34d55db6a6
|
Files: added invitation by link without email, added existing user to room by link
|
2022-06-16 18:39:50 +03:00 |
|
|
|
c9fb0d3dac
|
moved from ddf515b8
|
2022-06-16 11:13:53 +03:00 |
|
|
|
f3f3ed96ae
|
moved from ddf515b8
|
2022-06-15 12:46:21 +03:00 |
|
|
|
35bebe49f9
|
moved from ddf515b8
|
2022-06-14 11:11:41 +03:00 |
|
|
|
aa5edf7ba7
|
Web: Translations: Moved "DeleteUserDataConfirmation" key to Translations.json (FullEnDublicatesTest issue fix)
|
2022-06-10 12:25:08 +03:00 |
|
Artem Tarasov
|
d761598b1f
|
Web: Client: Settings: applied helpLink from settings
|
2022-06-08 17:47:24 +03:00 |
|
Artem Tarasov
|
1f856ef377
|
Web: Common/People: Fixed Bug 57478 - Client.Profile. The ‘Learn more’ link in the popup helper window leads to a page with a 404 Error.
|
2022-06-08 17:44:27 +03:00 |
|
|
|
b693779ea1
|
Merge branch 'develop' into feature/docspace-pin
|
2022-06-08 16:38:16 +03:00 |
|
|
|
c1d152becc
|
moved from ddf515b8
|
2022-06-07 21:00:08 +03:00 |
|
|
|
5f4c61e807
|
Fix Bug 57476: min width profile info
|
2022-06-06 12:37:12 +03:00 |
|
|
|
db238ffedb
|
update lo
|
2022-06-02 17:03:42 +03:00 |
|
|
|
e2d39453f8
|
edit translations
|
2022-06-02 13:21:37 +03:00 |
|
|
|
219366b3f6
|
Web: Moved translations to Common.
|
2022-06-01 15:56:50 +03:00 |
|
|
|
8b1facfcae
|
edit translations
|
2022-05-31 18:37:00 +03:00 |
|
|
|
05eb1a7596
|
edit translations
|
2022-05-30 17:18:12 +03:00 |
|
|
|
2d72dcf337
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-27 16:15:16 +03:00 |
|
|
|
4d02251c6b
|
edit translations
|
2022-05-27 16:14:45 +03:00 |
|
mushka
|
5ad2231fc3
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-05-27 15:24:29 +03:00 |
|
|
|
881a70a540
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-27 14:58:43 +03:00 |
|
|
|
c092ae1d13
|
Fixed Bug 57327: Wrong size of icon on mobile shortcut
|
2022-05-27 14:58:32 +03:00 |
|
|
|
a16b2c7927
|
edit translations
|
2022-05-27 14:08:27 +03:00 |
|
|
|
032191f542
|
edit translations
|
2022-05-26 19:22:25 +03:00 |
|
|
|
968e4440ea
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 13:18:06 +03:00 |
|
|
|
52a779326e
|
edit translations
|
2022-05-26 13:16:53 +03:00 |
|
|
|
ba1b93d777
|
Web: People, Files: fixed banner display delay
|
2022-05-26 15:08:10 +05:00 |
|
|
|
e7886aff2c
|
Log: refactoring
|
2022-05-26 12:01:54 +03:00 |
|
|
|
0bce8b6d17
|
edit translations
|
2022-05-25 18:41:16 +03:00 |
|
|
|
b13fd240ad
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-25 18:11:50 +03:00 |
|
|
|
903767b3e8
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
# web/ASC.Web.Client/public/locales/ro/Error403.json
# web/ASC.Web.Client/public/locales/ro/ErrorInvalid.json
# web/ASC.Web.Client/public/locales/ro/Offline.json
|
2022-05-25 18:07:28 +03:00 |
|
|
|
8612f14060
|
Web: Client: Fixed displaying page icon for creating page shortcut, fixed page display mode at manifest
|
2022-05-25 18:01:38 +03:00 |
|
|
|
e514f67cea
|
edit translations
|
2022-05-25 17:51:59 +03:00 |
|
|
|
56152784de
|
Web: Translations: Moved ReassignmentData from Reassign.json to Home.json (SingleKeyFilesTest issue fix)
|
2022-05-25 15:12:43 +03:00 |
|
|
|
1f58e81928
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-25 10:55:42 +03:00 |
|
|
|
ffa6b10825
|
Web: People: fixed styles
|
2022-05-25 10:55:37 +03:00 |
|
|
|
70a6a44196
|
Web: Client: Disable PWA feature for mobile devices
|
2022-05-25 10:53:39 +03:00 |
|
|
|
a66c03aa86
|
Merge branch 'develop' into feature/logger-refactoring
# Conflicts:
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/GlobalUsings.cs
# common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
# common/ASC.Data.Storage/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
# common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
# common/services/ASC.Notify/GlobalUsings.cs
# common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
# common/services/ASC.Notify/Services/NotifySenderService.cs
# common/services/ASC.TelegramService/GlobalUsings.cs
# common/services/ASC.TelegramService/TelegramHandler.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/Settings/StorageController.cs
|
2022-05-24 23:13:57 +03:00 |
|
|
|
7c3762ec9a
|
edit translations
|
2022-05-24 18:29:25 +03:00 |
|
|
|
bed0e0d324
|
edit translations
|
2022-05-24 14:57:37 +03:00 |
|
|
|
13ad4381f7
|
Api: removed CustomHttpMethodAttribute
added AllowNotPaymentAttribute
|
2022-05-23 18:48:23 +03:00 |
|
|
|
42a6eccb84
|
edit translations (SpellCheck)
|
2022-05-23 18:07:29 +03:00 |
|
|
|
8c68b9fb40
|
edit translations (SpellCheck)
|
2022-05-22 13:36:45 +03:00 |
|
|
|
7493fe68e6
|
Merge branch 'release/v1.2' into bugfix/ReleaseBugfixes
|
2022-05-20 19:17:43 +03:00 |
|
|
|
4935dbc8cd
|
Merge branch 'release/v1.2' into feature/update-translation-tests
|
2022-05-20 18:37:42 +03:00 |
|
|
|
0d805033d0
|
Web: Client: People: Fixed language selector, use mobile view only on mobile devices
|
2022-05-20 16:29:13 +03:00 |
|
|
|
fe93f0325b
|
Web: Client: People: Fixed header translation for editing profile
|
2022-05-20 15:57:28 +03:00 |
|
|
|
bfaefee8fd
|
Web: Client: People: Fixed displaying for some values at user profile for personal mode
|
2022-05-20 15:27:42 +03:00 |
|
|
|
cb0879da10
|
update, edit translations
|
2022-05-20 13:48:47 +03:00 |
|
|
|
4541fa82d1
|
update translations (web, people)
|
2022-05-19 23:35:37 +03:00 |
|
|
|
b9e98fc3ad
|
update translations (web)
|
2022-05-19 23:07:57 +03:00 |
|
|
|
011e24b306
|
update bg, pl, el
|
2022-05-19 18:06:13 +03:00 |
|
mushka
|
0c69bfdabf
|
Merge branch 'release/v1.2' into bugfix/ReleaseBugfixes
|
2022-05-19 17:56:19 +03:00 |
|
mushka
|
f9698e767e
|
trash folder api tryouts
|
2022-05-19 17:53:26 +03:00 |
|
Timofey Boyko
|
7fa4aee0b6
|
Web:People:Tests: add new mock endpoints and data: subscription and tfaapp
|
2022-05-19 17:29:56 +03:00 |
|
Timofey Boyko
|
85a28a78e3
|
Web:People:Tests: add new translation test: profile page
|
2022-05-19 17:28:45 +03:00 |
|
Timofey Boyko
|
cb23ce1718
|
Web:Files/People:Tests: update changeCulture helper for personal
|
2022-05-19 17:25:20 +03:00 |
|
Timofey Boyko
|
6c73ad9bbe
|
Web: add scripts for build and start translation tests on personal
|
2022-05-19 15:26:09 +03:00 |
|
Timofey Boyko
|
58a41243e1
|
Web:Files/People:Tests: add mock-data for personal build
|
2022-05-19 15:25:10 +03:00 |
|
Timofey Boyko
|
d7898d3bf1
|
Web:Files/People:Tests: update translation tests for personal
|
2022-05-19 15:09:26 +03:00 |
|
Timofey Boyko
|
00fcb61aa7
|
Web:Files/People:Tests: delete screenshotOutput when model translation tests begin
|
2022-05-19 15:07:38 +03:00 |
|
|
|
15f4fb324e
|
update it, edit fr
|
2022-05-19 14:34:56 +03:00 |
|
Timofey Boyko
|
830491e7ca
|
Merge branch 'release/v1.2' into feature/update-translation-tests
|
2022-05-18 19:17:12 +03:00 |
|
|
|
321085c205
|
Merge pull request #669 from ONLYOFFICE/feature/change-size-table-view
Feature/Change table resize with info panel
|
2022-05-18 18:33:31 +03:00 |
|
Timofey Boyko
|
6dd814bd12
|
Web: fix translation tests crash
|
2022-05-18 17:57:09 +03:00 |
|
|
|
874374d6ad
|
update translations (People)
|
2022-05-18 17:35:19 +03:00 |
|
Timofey Boyko
|
a7c08fa80a
|
Web:People: start cloneModelScreenshot helper after creating model translation screenshots for en culture
|
2022-05-18 16:27:17 +03:00 |
|
Timofey Boyko
|
3ebc2db9dc
|
Web:People:Tests: add cloneModelScreenshot helper
|
2022-05-18 16:21:03 +03:00 |
|
Timofey Boyko
|
a8dab95ada
|
Web:People:Tests: update translation tests and delete useless code
|
2022-05-18 16:20:39 +03:00 |
|
Timofey Boyko
|
2d892cf6c7
|
Web:People:Tests: change screenshotOutput and baseFolder for translation tests
|
2022-05-18 16:16:14 +03:00 |
|
Timofey Boyko
|
44cf38ba7f
|
Web:People:Tests: remove translation models from git
|
2022-05-18 16:14:41 +03:00 |
|
|
|
5f4d8b3b4c
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-18 12:58:24 +03:00 |
|
|
|
9180fbe42e
|
update ko
|
2022-05-18 12:58:02 +03:00 |
|
Timofey Boyko
|
538f16ec0f
|
Web:Files/People/Components:TableView: remove inline styles and move it to styled components
|
2022-05-18 11:27:17 +03:00 |
|
Timofey Boyko
|
ae18b68008
|
Merge branch 'release/v1.2' into feature/change-size-table-view
|
2022-05-18 10:41:26 +03:00 |
|
|
|
90d4a68946
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
# web/ASC.Web.Client/public/locales/sl/Settings.json
|
2022-05-18 10:09:44 +03:00 |
|
|
|
9c824a0bfa
|
Update translation - sl
|
2022-05-18 09:59:02 +03:00 |
|
|
|
f1130c51d9
|
update ro
|
2022-05-17 19:54:47 +03:00 |
|
Timofey Boyko
|
263af1cc85
|
Merge branch 'release/v1.2' into feature/change-size-table-view
|
2022-05-17 17:58:49 +03:00 |
|
mushka
|
f1ccf5f34f
|
some tests on asc.files
|
2022-05-17 17:20:57 +03:00 |
|
|
|
232ca0355e
|
edit es, fr
|
2022-05-17 16:48:47 +03:00 |
|
|
|
2ed7b96dd9
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-17 16:43:15 +03:00 |
|
|
|
cc9d934b13
|
update de, edit en (Confirm)
|
2022-05-17 16:42:54 +03:00 |
|
|
|
43da9f3949
|
Update translation - fi
|
2022-05-17 15:35:03 +03:00 |
|
|
|
be3362dbc3
|
update ja, edit fr, es, zh-CN (Settings)
|
2022-05-17 12:56:56 +03:00 |
|
mushka
|
78cd5dce67
|
backup codes dialog redesign + some tests at asc.files
|
2022-05-17 12:49:18 +03:00 |
|
|
|
36855d656f
|
remove application/x-www-form-urlencoded
|
2022-05-17 12:29:24 +03:00 |
|
Timofey Boyko
|
2970f6815d
|
Merge branch 'release/v1.2' into feature/change-size-table-view
|
2022-05-17 10:54:21 +03:00 |
|
|
|
606f0bca2a
|
update es (Home), add zh
|
2022-05-16 21:05:58 +03:00 |
|
|
|
1c4dacf66b
|
added data for validation
|
2022-05-16 20:19:24 +03:00 |
|
|
|
0b92150d57
|
added data check, added audit
|
2022-05-16 20:19:02 +03:00 |
|
|
|
4264a0da16
|
update fr
|
2022-05-16 17:04:04 +03:00 |
|
|
|
39302e3f59
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-16 12:51:35 +03:00 |
|
|
|
5915c6e23e
|
update es
|
2022-05-16 12:51:04 +03:00 |
|
Timofey Boyko
|
1cf0be4369
|
Web:People:TableView: remove useless padding right for icon table cell of name column
|
2022-05-16 11:45:01 +03:00 |
|
Timofey Boyko
|
b542de12a5
|
Web:People:TableView: increase min width for name table column
|
2022-05-16 11:42:55 +03:00 |
|
|
|
44a323b8db
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-16 10:25:43 +03:00 |
|
|
|
0d37d2ba1f
|
Web: Common/People: Refactoring.
|
2022-05-16 10:25:25 +03:00 |
|
|
|
7c05eaf14c
|
Web: People: Profile: fix memory leak
|
2022-05-16 00:29:42 +03:00 |
|
|
|
018e77258f
|
added room inviting
|
2022-05-15 23:19:03 +03:00 |
|
|
|
c7c1745528
|
People: changed dto
|
2022-05-15 18:12:51 +03:00 |
|
|
|
d85b208dc9
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-13 23:21:42 +03:00 |
|
|
|
d12c6f89e4
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-13 19:33:23 +03:00 |
|
|
|
93a53092d6
|
Web: Translations: Fix UselessTranslationKeysTest issues
|
2022-05-13 19:33:16 +03:00 |
|
|
|
11243c773b
|
Web: People: Profile: fix memory leak
|
2022-05-13 18:59:31 +03:00 |
|
|
|
e39da2cbaa
|
Web: People: Bar: fix memory leak
|
2022-05-13 18:16:19 +03:00 |
|
|
|
294a449d78
|
add new ru-keys, edit en
|
2022-05-13 17:30:51 +03:00 |
|
|
|
ddbf44f6a4
|
Web: People: fixed view of the contact field
|
2022-05-13 18:29:34 +05:00 |
|
|
|
5d3013f44d
|
add logger
|
2022-05-13 14:24:01 +03:00 |
|
|
|
2df77cd8e6
|
Web: Components: DatePicker: Fixed drop-down style for mobile devices
|
2022-05-13 13:38:02 +03:00 |
|
|
|
a956c25d16
|
Merge pull request #639 from ONLYOFFICE/feature/resx-add
Feature/resx add
|
2022-05-13 11:50:54 +03:00 |
|
|
|
7262c4cbb8
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-12 19:00:51 +03:00 |
|
|
|
e9be6684ae
|
Resources: fixed projects
|
2022-05-12 18:32:39 +03:00 |
|
mushka
|
cc41fc36e2
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into bugfix/ReleaseBugfixes
|
2022-05-12 17:22:39 +03:00 |
|
|
|
3b7309eb6b
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-12 15:12:16 +03:00 |
|
|
|
fce8bdba20
|
Web:People:Added setIsBurgerLoading to HOC withLoader.
|
2022-05-12 15:02:33 +03:00 |
|
|
|
f7698d6b3f
|
People: Resources
|
2022-05-12 14:22:22 +03:00 |
|
|
|
fc846860f9
|
Web: Translations: Moved "AddUsers" key from "Files,People" to "Common" (test issue fix)
|
2022-05-12 14:18:16 +03:00 |
|
mushka
|
25811f3922
|
fixed AvatarEditor
|
2022-05-12 14:06:20 +03:00 |
|
|
|
58b7c5f678
|
Web: Translations: Moved "Location" key from "People" to "Common": (test issue fix)
|
2022-05-11 17:40:23 +03:00 |
|
|
|
b0450cf55b
|
Web: Translations: Moved "Comments" key from "People" to "Common": (test issue fix)
|
2022-05-11 17:25:10 +03:00 |
|
mushka
|
03544f94c1
|
fixed AvatarEditor centering
|
2022-05-11 14:04:16 +03:00 |
|
|
|
72c04d4791
|
Web: Common/People: Added list loader to people/group selector.
|
2022-05-11 11:46:45 +03:00 |
|
|
|
802e5a773f
|
Web: People: fixed horizontal scroll in profile
|
2022-05-06 14:21:18 +03:00 |
|
Timofey Boyko
|
2df4d09407
|
Web:Components:Aside: fix transform for tablet devices
|
2022-05-05 15:11:51 +03:00 |
|
|
|
9dc03c7b17
|
Web: People: fixed InviteAgainLbl translation
|
2022-05-04 13:34:07 +03:00 |
|
Timofey Boyko
|
fd48db182b
|
Web:People:Article: reduce z-index for mobile view of main button
|
2022-04-29 13:04:31 +03:00 |
|
Timofey Boyko
|
9843557ef0
|
Web:People:Profile: ignore timezone when set birthday and work from dates
|
2022-04-28 15:55:48 +03:00 |
|
Timofey Boyko
|
5033d851ff
|
Web:People:Dialogs: sending password change instructions when enter down
|
2022-04-28 14:56:06 +03:00 |
|
mushka
|
53a53da543
|
finished tests on login, in progress on people and files
|
2022-04-28 13:38:16 +03:00 |
|
|
|
89059cf32e
|
Structured Logging
|
2022-04-28 12:15:33 +03:00 |
|
|
|
282ebd69a8
|
Web: Fix build without --env personal
|
2022-04-28 10:41:27 +03:00 |
|
|
|
33f155f825
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-04-27 19:55:04 +03:00 |
|
|
|
d2733a2608
|
Web: Added IS_PERSONAL build parameter (yarn start:personal and yarn build:personal) for hiding useless login and confirm functional
+ removed module federated Login from personal
+ fix potential /login redirect from Editor.jsx
|
2022-04-27 19:53:25 +03:00 |
|
|
|
833591d2bd
|
Web: People: ProfileAction: fix read more url
|
2022-04-27 19:39:28 +03:00 |
|
|
|
72aceefc6c
|
Web: People: Profile: add container for language selector
|
2022-04-27 19:31:26 +03:00 |
|
|
|
1bd4104c6c
|
Web: People: Profile: fix learn more url
|
2022-04-27 19:28:28 +03:00 |
|
|
|
0d6484f46a
|
Web: People: Profile: fix t key
|
2022-04-27 19:15:10 +03:00 |
|
|
|
c51ed410ef
|
Web: People: ProfileAction: fix tooltip width, offset
|
2022-04-27 12:25:47 +03:00 |
|
|
|
13bbce8ea4
|
Custom logger replaced with Microsoft.Extensions.Logging
|
2022-04-26 20:53:48 +03:00 |
|
Timofey Boyko
|
8ec3d02ab9
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-04-26 17:02:05 +03:00 |
|
Timofey Boyko
|
9f13b0a0ba
|
Web:People:Profile: wrap profile page into withCultureNames HOC
|
2022-04-26 17:01:59 +03:00 |
|
|
|
c4971e8bb3
|
Web: People: ChangeEmailDialog header
|
2022-04-26 15:43:16 +03:00 |
|
|
|
6a7333c7ef
|
Web: People: Article: fix t key
|
2022-04-25 21:40:29 +03:00 |
|
|
|
f86afee2d5
|
Web: move t key from People to Common
|
2022-04-25 21:39:46 +03:00 |
|
|
|
97b45d3bd5
|
ILog: refactoring
|
2022-04-25 21:02:18 +03:00 |
|
mushka
|
cbd91d1500
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-04-25 16:40:40 +03:00 |
|
|
|
7230e146e1
|
Web: People: Dialogs: use modal
|
2022-04-22 18:46:50 +03:00 |
|
mushka
|
6d7d0425b5
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-04-22 16:37:23 +03:00 |
|
|
|
9eba173a44
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Model/CreateFileModel.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-04-21 22:36:29 +03:00 |
|
|
|
f9fb0777d1
|
Bump version to v1.2.0
|
2022-04-21 19:15:08 +03:00 |
|
|
|
78944a490e
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-21 18:55:41 +03:00 |
|
|
|
1dff9e18c4
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Api.Core/Core/CustomHealthCheck.cs
# common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.IPSecurity/IPRestrictionsRepository.cs
# common/ASC.IPSecurity/IPRestrictionsService.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
|
2022-04-21 17:51:31 +03:00 |
|
|
|
bef4af84c8
|
Web: People: ProfileInfo: fixed horizontal scroll
|
2022-04-21 13:27:48 +03:00 |
|
Timofey Boyko
|
811c4d1ded
|
Web:People:Profile: add 'onChangeTheme' method and update interface theme radio button group options value
|
2022-04-21 10:35:38 +03:00 |
|
Timofey Boyko
|
216ae27b25
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-20 18:04:57 +03:00 |
|
Timofey Boyko
|
00df2ec2b6
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-04-20 17:27:27 +03:00 |
|
|
|
6c28b6777d
|
added DarkThemeSettings
|
2022-04-20 17:19:06 +03:00 |
|
Timofey Boyko
|
e9223f91e3
|
Web:People:Article: delete useless code
|
2022-04-20 17:08:50 +03:00 |
|
Timofey Boyko
|
6bd67cb19c
|
Web:People:Components: add HOC withLoader for article components
|
2022-04-20 11:42:22 +03:00 |
|
mushka
|
0cafa97440
|
Merge branch 'feature/virtual-rooms-1.2' into feature/modal-redesign
|
2022-04-19 14:18:53 +03:00 |
|
mushka
|
67cb03cc46
|
redesign of all dialogs
|
2022-04-18 16:41:17 +03:00 |
|
Timofey Boyko
|
8eb578aa4a
|
Web:People:Profile: add interface-theme section into user profile
|
2022-04-18 15:11:08 +03:00 |
|
Timofey Boyko
|
8306b01071
|
Web:People: add new keys 'DarkTheme', 'InterfaceTheme', 'LightTheme', 'SystemTheme' for EN and RU locales
|
2022-04-18 14:41:30 +03:00 |
|
