Commit Graph

2488 Commits

Author SHA1 Message Date
93ba9c5940 Web: People: change trans on t 2021-06-08 16:09:51 +03:00
18cdf1dc95 Web: People: fixed translations 2021-06-08 15:29:44 +03:00
Artem Tarasov
c25fa589a9 Web: People: deleted fonts with ext .woff, added hash to font name 2021-06-08 15:26:56 +03:00
65936fb856 Web: People: fixed translations 2021-06-08 15:25:26 +03:00
6a06707d18 Web: People: fixed translations 2021-06-08 15:19:49 +03:00
27e6226e66 Web: People: get backupCodes from tfa store 2021-06-08 14:19:55 +03:00
Artem Tarasov
67feed3cf9 Web: People: fix crash Profile 2021-06-08 14:01:19 +03:00
71564c7348 Web: People: deleted duplicate key 2021-06-08 13:35:31 +03:00
ffbbcc6ac2 Web: People: change trans on t 2021-06-08 13:34:41 +03:00
af6d7cd160 Web: People: fixed 2021-06-08 13:26:04 +03:00
Artem Tarasov
46a76abef3 Web: People: added withLoader to ProfileAction 2021-06-08 13:25:43 +03:00
Artem Tarasov
b32edbc3f5 Web: People: added wtihLoader to GroupAction header 2021-06-08 13:06:01 +03:00
Artem Tarasov
d0995aa9a9 Web: People: added withLoader to GroupAction 2021-06-08 13:01:16 +03:00
ffb5dace5d Web: People: fixed 2021-06-08 12:28:51 +03:00
Artem Tarasov
5dc279b5a9 Web: People: added withLoader to Profile 2021-06-08 12:28:19 +03:00
Artem Tarasov
81b6ea3d02 Web: People: refactoring withLoader, applied for Home 2021-06-08 02:49:34 +03:00
Artem Tarasov
a317b02e2e Web: People: added and applied LoadingStore 2021-06-08 01:22:28 +03:00
Vladislav Makhov
789d96d21e Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal 2021-06-07 14:28:30 +03:00
Vladislav Makhov
b6fa346fc0 web: my profile: fix onBack navigation in updateUserForm 2021-06-07 14:28:14 +03:00
54d5c658bd
Merge branch 'develop' into feature/two-factor-auth 2021-06-07 11:54:06 +03:00
Artem Tarasov
b3bccbb98d Web: People: added usage setFirsLoad 2021-06-07 01:15:07 +03:00
Artem Tarasov
6d7361ecd0 Web: People: added HOC withLoader 2021-06-07 01:09:13 +03:00
Artem Tarasov
9f21862f51 Merge branch 'develop' into bugfix/fixed-styles 2021-06-07 00:24:19 +03:00
Artem Tarasov
acd4a3893c Web: added rule to webpack.config for woff, woff2 2021-06-06 23:39:52 +03:00
5754a9b753 Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal 2021-06-04 14:43:10 +03:00
d01ef10cc5 Web: NavMenu/PageLayout: Was done:
- fixed loaders: two rectangle loader combined into one
- fixed loaders at index.html: two rectangle loader combined into one
- hide NavItem component
- hide click on Headline component
- fixed article padding style for desktop
- added new logo.
2021-06-04 14:42:21 +03:00
a4ee59974e Web: People: Profile: Fixed displaying user information for "personal" setting 2021-06-04 12:47:37 +03:00
43de25b62a Merge branch 'develop' into feature/remove-unused-dep
# Conflicts:
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
2021-06-03 12:52:21 +03:00
c6f85ef4ce
Merge branch 'develop' into feature/two-factor-auth 2021-06-02 23:57:00 +03:00
bd299a718b Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-06-02 13:55:19 +03:00
62ac315c8d Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring 2021-06-02 13:55:11 +03:00
f9e53d038f Web: People: fixed onDeletePersonalDataClick 2021-06-02 13:46:25 +03:00
d187b2767a Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations 2021-06-02 12:04:36 +03:00
60a7e84f60 Web: ProfileAction : Added locale usage for DateInput 2021-06-02 12:04:26 +03:00
33ccfa550b Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
# Conflicts:
#	products/ASC.People/Client/public/locales/en/Translations.json
#	products/ASC.People/Client/public/locales/ru/Translations.json
2021-06-02 11:53:29 +03:00
c4a89a9e50 Web: People: fixed translation of "Birthdate", duplicated translation of "Birthdate" moved to a common file 2021-06-02 11:49:35 +03:00
Artem Tarasov
5df2788783 Web: added new translation key "SuccessDeletePersonalData" for "delete-personal-data" in context options 2021-06-02 11:36:23 +03:00
Artem Tarasov
883130c002 Web: added new translation key "ChangePhoneInstructionSent" for ChangePhoneDialog 2021-06-02 11:23:02 +03:00
95dbfb8c5c Merge branch 'develop' into feature/translations 2021-06-01 20:02:48 +03:00
23e1083be7 Web: Removed empty translations keys 2021-06-01 13:49:37 +03:00
76d8ebb459 Tests moved to separate projects.
Removed unused dependepcies
2021-06-01 12:21:51 +03:00
de98856728 Web: Tests: Added new 'sk' translations; 2021-06-01 11:21:39 +03:00
8e532bc8b9 Web: Tests: Added new 'ro' translations; 2021-06-01 11:20:14 +03:00
3d62da4422 Web: Tests: Added new 'pt-BR' translations; 2021-06-01 11:19:13 +03:00
c5a5072aa7 Web: Tests: Added new 'lo' translations; 2021-06-01 11:17:19 +03:00
8eb62d8079 Web: Tests: Added new 'it' translations; 2021-06-01 11:15:24 +03:00
a0fc465678 Web: Tests: Added new 'fr' translations; 2021-06-01 11:13:50 +03:00
e3b5ac774a Web: Tests: Added new 'de' translations; 2021-06-01 10:56:47 +03:00
7beccd192b Web: Added not found keys in 'de' language translation files (fix NotTranslatedKeysTest issue) 2021-05-31 20:33:12 +03:00
e2b9561d7b Web: Rewritten all json translation files with sorting of properties alphabetically 2021-05-31 18:34:15 +03:00
f78742ac39 Web: Fix UselessModuleTranslationKeysTest issues 2021-05-31 17:35:25 +03:00
6b56b539c5 Web: Update EN language 2021-05-31 17:10:34 +03:00
570ede7bba Merge branch 'develop' into feature/11.5.2
# Conflicts:
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-31 13:32:51 +03:00
7026b19db0 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-05-31 09:23:53 +03:00
a454c6a210 Web: People: commentary changes 2021-05-30 22:40:27 +03:00
b88ad2480d Web: People: fixed by layouts 2021-05-30 17:50:52 +03:00
86b2d7547d Web: People: commentary changes 2021-05-30 17:26:54 +03:00
74064fc76d Merge branch 'develop' into feature/translations 2021-05-29 21:59:02 +03:00
72527ccded Merge branch 'master' into develop
# Conflicts:
#	lerna.json
#	package.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Login/package.json
2021-05-29 21:57:42 +03:00
d585c0a785 Web: Bumped version to 0.1.10 2021-05-29 21:26:13 +03:00
Artem Tarasov
215c933d9e Web: added new translation keys "ProviderNotConnected", "Mail" to "static/locale/de/Common.json" 2021-05-28 13:28:40 +03:00
e4f5da1f32 Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations 2021-05-27 12:42:53 +03:00
f075863903 Web: Fixed FullDublicatesTest for "LblInviteAgain" translation key, key renamed for Article 2021-05-27 12:42:44 +03:00
Artem Tarasov
102f26ed3c Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
# Conflicts:
#	public/locales/de/Common.json
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
2021-05-27 11:58:53 +03:00
Artem Tarasov
46d80f7b34 Web: moved translation keys "ByFirstNameSorting", "ByLastNameSorting" to "static/locales/{lng}/Common.json" 2021-05-27 11:57:20 +03:00
3536be88c2 Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations 2021-05-27 11:51:39 +03:00
00957a65ad Web: moved translation keys "LblSelect", "EditUserDialogTitle", "Version" 2021-05-27 11:51:32 +03:00
b57da432bf Web: Fixed FullDublicatesTest for "CopyEmailAndPassword" translation key, key moved to Common. 2021-05-27 11:50:11 +03:00
Artem Tarasov
95aa0153d6 Web: fixed ns 2021-05-27 11:00:13 +03:00
fe18e7e55c Web: moved translation key "LblSelect" 2021-05-26 17:53:36 +03:00
151ffc7b26 Web: moved translation key "Active" 2021-05-26 17:46:09 +03:00
e437c7a035 Web: moved translationKeys "Size", "View", "Review" 2021-05-26 17:37:03 +03:00
541b14c8fe Web: moved translationKeys "DisableUserButton", "NotFoundLanguage" 2021-05-26 16:40:02 +03:00
bf63128496 Web: moved translationKeys "LastName", "Language", "Mail" 2021-05-26 16:28:58 +03:00
2c5b95e352 Web: moved translationKeys "ProjectsProduct", "InviteLinkTitle", MoveConfirmationMessage" 2021-05-26 16:06:40 +03:00
dc4872129b Web: moved translationKeys "More", "Search", "AddFilter", "Comments" 2021-05-26 15:15:43 +03:00
563540528d Web: moved translationKeys "MaleSexStatus", "maxSizeFileError", "orDropFileHereLabel" 2021-05-26 15:03:12 +03:00
f87b1f78f3 Web: moved translationKeys "Error", "ErrorUnknownFileImageType", "FemaleSexStatus", "LDAPLbl", "Location" 2021-05-26 14:55:33 +03:00
252fef7ae3 Web: moved translationKeys "AboutCompanyTitle", "ClearButton", "CommunityProduct", "EmptyFieldError" 2021-05-26 14:36:58 +03:00
3c1e322406 Web: moved translationKeys "Profile", "RecoverErrorMessage" 2021-05-26 14:21:11 +03:00
49bf2618d2 Web: moved translationKeys "Enable", "ProviderLoginError", "ProviderNotConnected" 2021-05-26 13:35:11 +03:00
5e6a7a8a20 Web: moved translationKeys "SendInviteAgain", "UploadingLabel", "DeleteOperation" 2021-05-26 13:16:51 +03:00
761bf17625 Web: People: Moved translationKeys "SuccessChangeUserStatus", "NotBeUndone", "ReassignData" 2021-05-26 12:09:54 +03:00
6159fb0b17 Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
# Conflicts:
#	products/ASC.People/Client/public/locales/de/ProfileAction.json
#	products/ASC.People/Client/public/locales/en/ProfileAction.json
#	products/ASC.People/Client/public/locales/ru/ProfileAction.json
2021-05-26 11:45:16 +03:00
3eee928fae Web: People: Moved translationKeys "SuccessSentInvitation", "SocialProfiles", "Sex", "selectNewPhotoLabel" 2021-05-26 11:44:37 +03:00
Artem Tarasov
98ee9062e8 Web: moved translation keys "SelectAll", "SelectAllLbl" to "/static/locales/{lng}/Common.json" 2021-05-26 11:44:36 +03:00
Artem Tarasov
e0fda9155a Web: People: fixed duplicate translation key "EmailChangeButton", key moved to "@appserver/people/public/locales/{lng}/Translation.json" 2021-05-26 11:19:29 +03:00
Artem Tarasov
144c7479e2 Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
# Conflicts:
#	products/ASC.Files/Client/public/locales/de/Home.json
2021-05-25 15:25:57 +03:00
Artem Tarasov
f68bb45e61 Web: moved translation keys "Delete", "DeleteButton" to "/static/locales/{lng}/Common.json" 2021-05-25 15:22:59 +03:00
4b110884a9 Web: Moved translationKeys "DeleteSelfProfile", "PendingTitle" 2021-05-25 14:06:05 +03:00
45fffaf652 Web: Moved translationKeys "PasswordChangeButton", "RemoveData" 2021-05-25 13:55:34 +03:00
478d2764ec Web: Moved translationKeys "AddMembers" 2021-05-25 13:34:57 +03:00
60679a5da7 Web: Moved translationKeys "Disabled", "Close" 2021-05-25 11:43:42 +03:00
a80890f7cc Web: Moved translationKeys "Guest" to "/static/locales/{lng}/Common.json" 2021-05-24 19:40:26 +03:00
43e65a51d1 Web: Moved translationKeys "Next", "Previous", "PageOfTotalPage" and "CountPerPage" to "/static/locales/{lng}/Common.json" 2021-05-24 19:22:20 +03:00
b8dd8b3048 Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
# Conflicts:
#	public/locales/de/Common.json
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
2021-05-24 19:07:46 +03:00
1e954b15d7 Web: Moved translationKeys "PasswordLimitLength", "PasswordLimitMessage", "PasswordLimitDigits", "PasswordLimitSpecialSymbols" and "PasswordLimitUpperCase" to "/static/locales/{lng}/Common.json" 2021-05-24 19:05:29 +03:00
b8edf32f87 Web: Moved translationKeys "User", "Warning" to Common.json 2021-05-24 17:55:14 +03:00
c652209b49 Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-05-24 13:58:54 +03:00
1b730233c9 ElasticSearch: moved from 08a01422 2021-05-23 19:11:25 +03:00
Artem Tarasov
be0aca139b Web: fixed usage translation keys for errorsKeys in ChangeEmailDialog 2021-05-22 01:31:03 +03:00
e83d1d5922 Web: Moved translationKeys "DirectionAscLabel" and "DirectionDescLabel" to "/static/locales/{lng}/Common.json" 2021-05-21 17:59:28 +03:00
e52f868dd4 Web: Moved translationKeys "AddButton" to "/static/locales/{lng}/Common.json" 2021-05-21 17:53:12 +03:00
5159e351c4 Web: Moved translationKeys "ShowUsersList" to "/static/locales/{lng}/Common.json" 2021-05-21 17:45:12 +03:00
d6a5041c3d Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-05-21 16:38:23 +03:00
facf0a01cf Web: Moved translationKeys "SignInWithFacebook", "SignInWithGoogle", "SignInWithLinkedIn", "SignInWithTwitter" to "/static/locales/{lng}/Common.json" 2021-05-21 16:37:46 +03:00
8e889049c2 Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-05-21 15:03:19 +03:00
14214f2ad8 Web: Fixed translation usage for keys: "SignInWithFacebook", "SignInWithGoogle", "SignInWithLinkedIn", "SignInWithTwitter" 2021-05-21 15:00:30 +03:00
5afe35f58f Web: Removed useless translations 2021-05-21 14:24:16 +03:00
db4d769321 Web: Moved translationKeys "Actions" to "/static/locales/{lng}/Common.json" 2021-05-21 11:22:43 +03:00
50efa8f384 Web: Moved translationKeys "MeLabel", "DefaultOptionLabel" and "AuthorMe" to "/static/locales/{lng}/Common.json" 2021-05-21 11:16:54 +03:00
bebc5ce03a Web: Moved translationKey "Documents" to "/static/locales/{lng}/Common.json" 2021-05-21 11:12:03 +03:00
eb7f493304 Web: Moved translationKeys "RequiredField" and "FullAccess" to "/static/locales/{lng}/Common.json" 2021-05-21 11:05:37 +03:00
8120e24d15 Web: Moved translationKeys "Type", "ByType" and "UserType" to "/static/locales/{lng}/Common.json" 2021-05-21 10:43:52 +03:00
cc2bb50862 Web: Resolved NotFoundKeysTest issues 2021-05-21 10:31:32 +03:00
46627f202c Web: Moved translationKeys "EditButton" and "EditAvatar" to "/static/locales/{lng}/Common.json" 2021-05-20 14:11:27 +03:00
af2f24e4ac Merge branch 'develop' into feature/translations 2021-05-20 13:11:13 +03:00
f5372bbba8 Web: People: MyProfile: Fix translations loading 2021-05-20 11:45:13 +03:00
fc822e5ad5 Web: Fix setModuleInfo usage 2021-05-20 11:27:50 +03:00
fc195f0325 Web: People: refactoring 2021-05-20 02:17:03 +03:00
0a5662220c Web: People: refactoring 2021-05-20 02:09:49 +03:00
ece8fcaabb Web: People: get backup codes count 2021-05-20 02:01:37 +03:00
b99ab0aa2a Web: People: get old backup codes 2021-05-20 01:44:20 +03:00
8c504e762b Web: People: added error handler 2021-05-20 01:29:38 +03:00
c950d53751 Web: People: deleted console, unused imports 2021-05-20 01:16:28 +03:00
4e57f2a47f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-05-20 00:47:45 +03:00
2ee22ab052 Web: People: hide tfa settings if tfa dissabled 2021-05-19 18:51:32 +03:00
536c6c2f5e Web: Moved custom.scss to @appserver/common
+ Added missing ErrorBoundary
+ Removed useless commented code
2021-05-19 11:14:44 +03:00
3433c074d7 Merge branch 'develop' into feature/my-profile
# Conflicts:
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
2021-05-19 10:16:40 +03:00
c4c4d940a0
Merge pull request #252 from ONLYOFFICE/feature/remove-wq
Feature/remove wq
2021-05-18 19:04:34 +03:00
5f36009630 Web: Moved translationKeys "LoadingDescription" and "LoadingLabel" to "/static/locales/{lng}/Common.json" 2021-05-18 18:35:03 +03:00
bc901b8a4a Web: People: disabled user type change 2021-05-18 18:00:29 +03:00
f6ecc35ae7 Web: Moved translationKeys "LearnMore" and "ComingSoon" to "/static/locales/{lng}/Common.json" 2021-05-18 15:10:20 +03:00
0ae236ad6d Web: Moved translationKey "People" to "/static/locales/{lng}/Common.json" 2021-05-18 14:42:44 +03:00
923f5012bc Web: Moved translationKey "SendButton" to "/static/locales/{lng}/Common.json" 2021-05-18 14:35:54 +03:00
49780cee24 Web: Moved translationKey "Email" to "/static/locales/{lng}/Common.json" 2021-05-18 14:27:59 +03:00
99b86212dd Web: Moved translationKey "Password" to "/static/locales/{lng}/Common.json" 2021-05-18 13:57:17 +03:00
08411cfc3b Web: Moved translationKey "CloseButton" to "/static/locales/{lng}/Common.json" 2021-05-18 13:47:36 +03:00
35da962d06 Web: Moved translationKey "LoadingProcessing" to "/static/locales/{lng}/Common.json" 2021-05-18 13:40:32 +03:00
7a2167a0b9 Web: Rename translationKeys to Common "OKButton", "SaveButton" and "CancelButton" to "/static/locales/{lng}/Common.json" 2021-05-18 13:23:54 +03:00
629239fd9b Web: Moved translationKey "OkButton" to "/static/locales/{lng}/Common.json" 2021-05-18 13:07:05 +03:00
cdb9ef6be9 Web: Moved translationKey "SaveButton" to "/static/locales/{lng}/Common.json" 2021-05-18 10:56:24 +03:00
9591974312 Web: People: reset tfa app 2021-05-17 23:29:03 +03:00
a98e12c2b7 Web: People: show tfa backup codes 2021-05-17 17:32:32 +03:00
36ce7a1b93 Web: People: fixed translations 2021-05-17 17:21:29 +03:00
0eb4f830d2 Web: People: fixed translates 2021-05-17 17:11:15 +03:00
b91ddca880 Web: Moved translationKey "CancelButton" to "/static/locales/{lng}/Common.json" 2021-05-17 12:08:57 +03:00
85bd971735 Merge branch 'develop' into feature/translations 2021-05-14 12:07:48 +03:00
67e166772c Web: People: MyProfile: Added setModuleInfo 2021-05-13 18:20:24 +03:00
d7d22a9369 Web: People: Disabled editing of UserType and Group in MyProfile with action=edit 2021-05-13 13:43:45 +03:00
3db2963106 Web: People: Added transition back from MyProfile with action=edit 2021-05-13 13:08:30 +03:00
bb48586343 Web: People: Added transition back from MyProfile 2021-05-13 13:03:36 +03:00
f5b242e957 Web: People: Added transition to edit page from MyProfile 2021-05-13 12:56:11 +03:00
16deb72acc Web: People: MyProfile refactoring 2021-05-13 11:26:55 +03:00
6867ded281 Merge branch 'develop' into feature/remove-wq
# Conflicts:
#	common/ASC.Common/DIHelper.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Common/Threading/Progress/ProgressQueue.cs
#	common/ASC.Common/Threading/Workers/WorkerQueue.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
2021-05-13 11:23:44 +03:00
710e3db4c5 Web: People: Added new component "people/MyProfile" for users without "People" module access 2021-05-13 10:55:31 +03:00
f0bb88da5f Web: People: fixed incorrect user date of birth 2021-05-11 13:46:23 +03:00
c857751572 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
# Conflicts:
#	yarn.lock
2021-05-11 12:22:17 +03:00
8f6bcf6e68 Web: Client scripts optimizations:
+ Fix deploy script (xcopy not installed issue)
+ Added concurrently for build and deploy scripts
+ Added new packages "mkdirp" (original "mkdir" not working with yarn run <script>), "rimraf"
+ Added missing "terser-webpack-plugin" package
2021-05-07 20:59:39 +03:00
3ae370deed Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2021-05-07 18:54:42 +03:00
6c3244a3e9 Web: Added opportunity to deploy all static clients to build/deploy directory (yarn build && yarn deploy) 2021-05-07 18:54:25 +03:00
7a27280dc3 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-05-07 14:49:44 +03:00
69fb32552a Web: People: fixed InviteDialog z-index 2021-05-07 11:01:16 +03:00
95c9c9d1a3 Merge branch 'develop' into feature/portal-modal-dialog 2021-05-06 16:30:31 +03:00
b7af18f636 v0.1.9 2021-05-06 14:57:01 +03:00
5216ab5b6d Web: Fixed ModalDialog component styles 2021-05-06 12:51:32 +03:00
37f8bdd872 Merge branch 'master' into develop 2021-05-05 20:52:06 +03:00
261e6d8b4c Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-05-05 15:09:59 +03:00
5f0f262adf Web: People: get tfa backup codes 2021-05-05 14:59:58 +03:00
85f5b3c775 fix Bug 49858 2021-05-05 11:45:13 +03:00
9e40feb771 Added and applied Common.json for common translations (languages issue) 2021-04-29 10:14:47 +03:00
b27e973ec0
Merge pull request #237 from ONLYOFFICE/feature/support-hosting-as-service
Feature/support hosting as service
2021-04-28 15:33:53 +03:00
fc4a58966c Web: Bumped version to 0.1.9 2021-04-28 14:03:59 +03:00
8fc80a419b Merge branch 'develop' into feature/translations 2021-04-28 13:08:52 +03:00
3c7ab3b748 Web: People: fixed after merge 2021-04-28 11:25:58 +03:00
0656725149 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
# Conflicts:
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Client/src/components/pages/Confirm/index.js
2021-04-28 11:20:32 +03:00
6c51ae8a15 Merge branch 'develop' into feature/translations 2021-04-27 13:59:58 +03:00
2b6d536590 Merge branch 'release/v0.1.8' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.8 2021-04-27 13:48:38 +03:00
c324693034 Merge branch 'develop' into release/v0.1.8 2021-04-27 12:11:36 +03:00
Alexey Kostenko
bf963f511b Merge branch 'develop' into bugfix/thirdparty 2021-04-27 11:25:30 +03:00
11eea156a5 Web: People: fixed GroupAction 2021-04-27 10:18:53 +03:00
8bb173fa92 Thirdparty: fix providers 2021-04-26 21:42:39 +03:00
d97928fd37 Merge branch 'develop' into feature/support-hosting-as-service 2021-04-26 19:52:32 +03:00
db1f883005 Bump version v0.1.8 2021-04-26 18:59:33 +03:00
Alexey Kostenko
a96ae77570 OAuth: Fixed crash on login page 2021-04-26 16:41:57 +03:00
0128b01518 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
# Conflicts:
#	products/ASC.People/Client/public/locales/en/Profile.json
#	products/ASC.People/Client/public/locales/ru/Profile.json
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Client/public/locales/en/Confirm.json
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Confirm.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
2021-04-26 15:57:19 +03:00
6d2f417c5c Method GetAuthProviders moved to PeopleController 2021-04-25 11:46:44 +03:00
c47f896f75 Client: added translations 2021-04-24 10:42:49 +03:00
d2588270cf Merge branch 'master' into develop 2021-04-23 20:16:42 +03:00
4bdf5e4e55 Web: Fix fallback language apply on new language setup 2021-04-23 19:51:10 +03:00
2d8b085d02 add support WindowsService/systemd for IHostBuilder
listen unix socket if it setup for Kestrel Web Server
2021-04-23 16:54:39 +03:00
Alexey Kostenko
c79c248b3a Web: People: OAuth buttons have been moved from the edit profile section to the profile view section 2021-04-22 16:09:56 +03:00
Alexey Kostenko
8519fe4d60 Web: Components: SocialButton style fix 2021-04-22 14:54:06 +03:00
553ac70278 Bump version v0.1.7 2021-04-22 14:13:12 +03:00
Alexey Kostenko
667a76b95f Oauth: Refactoring 2021-04-22 13:34:42 +03:00
Alexey Kostenko
138fe92f9f OAuth: Refactoring 2021-04-21 16:31:18 +03:00
Alexey Kostenko
691e7d5498 Merge branch 'develop' into feature/oauth2.0 2021-04-21 15:04:26 +03:00
Alexey Kostenko
1aae2e60cf Web: Client/Login: Removed 2nd window for actions through oAuth 2021-04-21 14:48:17 +03:00
bd495757cc Merge branch 'master' into develop 2021-04-19 18:52:56 +03:00
36c65c1c43 Bump version v0.1.6 2021-04-19 18:41:27 +03:00
461110e1a7 Web: Fix show loaders timeout for quickly responses 2021-04-19 13:36:40 +03:00
Alexey Kostenko
c45cfe87a1 Merge branch 'feature/oauth2.0' of github.com:ONLYOFFICE/AppServer into feature/oauth2.0 2021-04-19 09:50:05 +03:00
Alexey Kostenko
03ec607cbf Merge branch 'develop' into feature/oauth2.0 2021-04-19 08:25:42 +03:00
2a6a556a38
Merge pull request #226 from ONLYOFFICE/feature/dotnet-core-debugging-with-WSL-2
Feature/dotnet core debugging with wsl 2
2021-04-17 11:36:14 +03:00
4917131ccc People: fixed signup 2021-04-16 21:50:50 +03:00
e586d42d3b Web: Added clickBackdrop() for close unpinned Article on Tablet and Mobile 2021-04-16 20:23:08 +03:00
5f2998af87 refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00
995579ac8b People: change number method 2021-04-16 18:32:31 +03:00
ee76d58ee8 Web: People|Files: Added timeout for 500 ms on setup "isLoading" flag (for quickly responses) 2021-04-16 16:37:22 +03:00
Alexey Kostenko
82e66bf861 Server: People: Fixed signup API 2021-04-16 16:33:17 +03:00
3aae413e12 replace Path.Combine to CrossPlatform.PathCombine 2021-04-16 16:26:26 +03:00
Viktor Fomin
0b84d9a7fe Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-04-16 14:40:47 +03:00
Alexey Kostenko
96ec652313 Merge branch 'develop' into feature/oauth2.0 2021-04-16 14:25:37 +03:00
741c3a17ab People: Added thirdparty/signup method 2021-04-15 14:34:22 +03:00
Viktor Fomin
fb0048f998 Web: People: show count remaining codes 2021-04-13 13:03:26 +03:00
Viktor Fomin
d2028bf529 Web: People: fixed codes render 2021-04-13 12:42:40 +03:00
Viktor Fomin
0fe04284a4 Web: People: print backup codes 2021-04-13 12:22:40 +03:00
Viktor Fomin
6a30340eed Web: People: fixed 2021-04-13 11:57:41 +03:00
Viktor Fomin
6128702bfd Web: People: added backup codes dialog on page 2021-04-13 01:29:06 +03:00
Viktor Fomin
ad8432097d Web: People: created backup codes dialog 2021-04-13 01:28:50 +03:00
Viktor Fomin
1f8f47693b Web: People: added reset application dialog on page 2021-04-13 00:03:10 +03:00
Viktor Fomin
ee7152816e Web: People: created reset application dialog 2021-04-13 00:02:06 +03:00
Viktor Fomin
800b85f5c8 Web: People: strong text 2021-04-12 23:33:41 +03:00
Viktor Fomin
47b0046b2e Web: People: added translates 2021-04-12 19:11:25 +03:00
Viktor Fomin
2d7214334f Web: People: added login settings 2021-04-12 19:11:09 +03:00
Alexey Kostenko
cf7072a714 Refactoring 2021-04-12 10:57:21 +03:00
Alexey Kostenko
6f3c3d6c2a Web: People: Fixed facebook social button style 2021-04-12 10:36:37 +03:00
95352a2116 Bump version v0.1.3 2021-04-09 11:02:13 +03:00
Alexey Kostenko
b017562eaf Web: Changed facebook icon 2021-04-09 10:30:54 +03:00
b66008b33e Bump version v0.1.2 2021-04-08 20:00:15 +03:00
Alexey Kostenko
ec6c1df3cf Merge branch 'develop' into feature/oauth2.0 2021-04-08 11:59:08 +03:00
bcf350c1d9 Bump version to v0.1.1 2021-04-08 10:23:33 +03:00
559d7a9940 Web: Fixed export and import registerSW 2021-04-07 15:41:42 +03:00
4484d609a6 Web: Added registerSW for start Service-Worker + Added post SkipWaiting on update 2021-04-07 15:27:51 +03:00
Artem Tarasov
3ee7541e54 Web: Components/People: fixed translation in PasswordInput 2021-04-07 14:41:46 +03:00
Vladislav Makhov
33c3905c65 web: people: fix goBackAndReset, when creating user 2021-04-07 12:34:37 +03:00
TatianaLopaeva
375ce74464 Web:People: Fixed scroll to top when switching a group. 2021-04-07 11:34:05 +03:00
Vladislav Makhov
fbf2c27910 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-06 14:18:26 +03:00
Vladislav Makhov
065115fffd web: people: fix avatar changes 2021-04-06 14:18:15 +03:00
TatianaLopaeva
3a35fb09fd Web: People: Profile: Fixed the problem of displaying a different avatar when editing profile. 2021-04-06 14:11:02 +03:00
Vladislav Makhov
2c7c5532eb web: people: fix tracking of avatar changes 2021-04-06 14:03:14 +03:00
Artem Tarasov
056c288fae Web: People: fixed reset filter after switching from profile 2021-04-05 18:06:48 +03:00
Artem Tarasov
9d7f6265e7 Web: People: fixed manager name for a group without a manager 2021-04-05 16:35:38 +03:00
Artem Tarasov
e304af064b Web: People: fixed group list query 2021-04-05 16:18:41 +03:00
Vladislav Makhov
bf6cb4b134 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 16:09:34 +03:00
Vladislav Makhov
cf85e950ff web: people: fix onGroupClick 2021-04-05 16:09:21 +03:00
2655f0c62d Web: fixed Trans 2021-04-05 15:35:50 +03:00
Alexey Kostenko
866a1bfa68 Web: People: Removed unused method 2021-04-05 13:36:04 +03:00
Alexey Kostenko
e333e7e82d Web: People: Clear interval if getter token window is closed (connecting providers) 2021-04-04 16:53:27 +03:00
Alexey Kostenko
c4aaa3618f Web: People: Show login settings only on your account 2021-04-02 11:10:26 +03:00
18b4fba15a Merge branch 'develop' into feature/dotnet5 2021-03-31 20:38:05 +03:00
Alexey Kostenko
e4d11c8246 Web: People: Updating to the state of the connection to providers. Added notifications 2021-03-31 16:38:52 +03:00
Alexey Kostenko
e66d9e52d9 Web: People: Removed unnecessary method getSerializedProfile 2021-03-30 15:08:01 +03:00
Alexey Kostenko
0f5e5cce3f Web: Components/People/Login: Fixed warning ("React does not recognize prop") 2021-03-30 11:37:21 +03:00
Alexey Kostenko
7ff66e894a Web: Login: Render only available providers for login 2021-03-26 17:19:26 +03:00
13f097e039 People: fix Activation 2021-03-26 15:59:56 +03:00
18a2c0a53d Merge branch 'develop' into feature/dotnet5
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
#	common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
#	common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
#	common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
#	common/ASC.Core.Common/EF/Model/DbipLocation.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
#	common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
#	common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResData.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
#	common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
#	common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTag.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
2021-03-25 21:50:09 +03:00
Alexey Kostenko
6fadc94b71 Web: Components/People: Fixed social-button styles 2021-03-25 18:06:48 +03:00
Alexey Kostenko
482530b2f8 Web: People: Added translations 2021-03-25 17:09:32 +03:00
Alexey Kostenko
3e4424b67b Web: People/Common: Refactoring 2021-03-25 16:10:10 +03:00
Alexey Kostenko
894449d95c Web: People: Unlink account from provider 2021-03-24 16:51:16 +03:00
Alexey Kostenko
17956f05c0 Web: People: Linking with providers 2021-03-24 14:20:59 +03:00
f732f5fba6 Web: Moved sw-template to @appserver/common and removed api cache (translation issue) 2021-03-24 11:45:58 +03:00
Alexey Kostenko
e1df253b22 Web: People/Components: Added login settings buttons to edit profile page, social button - style fix 2021-03-23 18:29:29 +03:00
f8c2f20fe8
Merge branch 'develop' into feature/workspaces 2021-03-23 14:21:30 +03:00
a94a87855a People: fix ChangeUserPassword 2021-03-23 14:18:44 +03:00
TatianaLopaeva
7ef1429cb7 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-23 10:40:23 +03:00
TatianaLopaeva
cc707204d9 Web: Removed jumps of article when the page is loading. 2021-03-23 10:39:37 +03:00
0d6fcd6f52 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 22:37:34 +03:00
051a69e5b5 Web: People: GroupAction: Fix translation loading 2021-03-22 22:37:21 +03:00
TatianaLopaeva
6bb12c9524 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 21:10:23 +03:00
TatianaLopaeva
21b6567f7a Web: People: Fix proxy route. 2021-03-22 21:10:15 +03:00
5dd30c9502 Web: Client: fixed owner change 2021-03-22 20:56:53 +03:00
d7981f3f53 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 17:35:41 +03:00
a8a6121e59 Web: Proxy fixes 2021-03-22 17:35:33 +03:00
78fd4f632c Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 16:46:34 +03:00
879259f160 Web: People: fixed getting peopleList 2021-03-22 16:45:24 +03:00
Viktor Fomin
0da17ef641 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 16:15:07 +03:00
89f2431e1c Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 15:33:50 +03:00
05b417f63d Web: People: hidden the phone field 2021-03-22 15:31:42 +03:00
Viktor Fomin
5a9c782fc5 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 13:08:46 +03:00
Viktor Fomin
12f920047c Web: People: fixed translate 2021-03-22 13:08:40 +03:00
TatianaLopaeva
7dc1b80ab6 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 13:00:35 +03:00
TatianaLopaeva
7c56caf2a6 Web: People: Fixed returned to the homepage after created group. 2021-03-22 12:59:06 +03:00
f8a2b438a9 Web: People: Add URL proxy 2021-03-22 12:06:30 +03:00
TatianaLopaeva
d0f2d9871f Web: People: Deleted useless code at icon path. 2021-03-22 11:46:31 +03:00
d568693154 Big Fix commit:
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
75859212ab Web: People: Fix conversation of Filter to URL and back 2021-03-20 13:16:45 +03:00
1c4acb2842 Web: Fixed issue with Tree link first click 2021-03-20 11:54:21 +03:00
e797d01bee Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 21:07:16 +03:00
efe94a4589 Web: People: Fixed Filter translations loading 2021-03-19 21:07:10 +03:00
TatianaLopaeva
c1e53e3c6e Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 19:21:20 +03:00
Artem Tarasov
aebb3c479f Web: fix after merge 2021-03-19 19:24:16 +03:00
Artem Tarasov
6418c3af89 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	products/ASC.People/Client/src/pages/Profile/Section/Header/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
2021-03-19 19:21:16 +03:00
TatianaLopaeva
7f193e003c Web: People: Fix color of icon. 2021-03-19 19:11:16 +03:00
Artem Tarasov
4d9920a4d0 Web: People: fixed updating of user information after editing 2021-03-19 19:06:55 +03:00
741fca254f Web: Fixed usage of auth.settingsStore 2021-03-19 19:02:43 +03:00
b42eb03270 Web: People: Hide reasign button 2021-03-19 18:41:22 +03:00
60b57e5535 Web: People: Fixed move to edit profile (double slash in URL) 2021-03-19 18:36:11 +03:00
2df2b6809e Web: People: Fixed primary link redirect to default filter 2021-03-19 18:23:14 +03:00