66f36bf0a6
Web: Client: added empty screen
2021-05-31 12:51:23 +03:00
f0f6400563
Web: Client: commentary changes
2021-05-30 22:40:44 +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
12bcf816b5
Web: Client: added new translations keys
2021-05-28 12:09:10 +03:00
90821d3fe1
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-05-27 12:15:53 +03:00
f5909cc0e0
Web: Temporary removed minimal translations lng files
2021-05-27 12:14:36 +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
b57da432bf
Web: Fixed FullDublicatesTest for "CopyEmailAndPassword" translation key, key moved to Common.
2021-05-27 11:50:11 +03:00
Artem Tarasov
a12ab6c970
Web: moved translationKeys "Error520Text", "ErrorInitWizardHeader" to "static/locales/{lng}/Common.json"
2021-05-26 18:30:57 +03:00
Artem Tarasov
d5ddeb4c42
Web: moved translation keys "AboutCompanyVersion", "Version" to "static/locales/{lng}/Common.json"
2021-05-26 17:58:05 +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
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
4228b0a5dc
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-25 17:26:12 +03:00
2452ec957d
Web: Moved translationKeys "Enable" to "/static/locales/{lng}/Common.json"
2021-05-25 17:16:09 +03:00
Artem Tarasov
671f98519a
Web: Moved translation Keys "ContinuteButton" to "/static/locales/{lng}/Common.json"
2021-05-25 12:49:56 +03:00
60679a5da7
Web: Moved translationKeys "Disabled", "Close"
2021-05-25 11:43:42 +03:00
e01af3fd20
Web: Moved translationKeys "AdminSettings" to "/static/locales/{lng}/Common.json"
2021-05-24 19:47:26 +03:00
a80890f7cc
Web: Moved translationKeys "Guest" to "/static/locales/{lng}/Common.json"
2021-05-24 19:40:26 +03:00
f94c19385f
Web: Moved translationKeys "Settings" to "/static/locales/{lng}/Common.json"
2021-05-24 19:31:41 +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
4e32c53567
Web: Moved translationKeys "About" to Common.json
2021-05-24 18:36:31 +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
Artem Tarasov
098e04891c
Web: deleted "WhiteLabel" translation key
2021-05-22 01:31:50 +03:00
Artem Tarasov
11166ed85a
Web: Client: fixed usage translation keys for Settings page
2021-05-21 18:37:16 +03:00
6b7cab8236
Web: Moved translationKeys "Sending", "RecoverProcessSending", "ThirdPartyProcessSending" and "RegisterProcessSending" to "/static/locales/{lng}/Common.json"
2021-05-21 18:06:31 +03:00
e83d1d5922
Web: Moved translationKeys "DirectionAscLabel" and "DirectionDescLabel" to "/static/locales/{lng}/Common.json"
2021-05-21 17:59:28 +03:00
c664e80ae8
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-21 17:39:01 +03:00
9960cef423
Web: Removed useless translations "OwnerSettings", "PortalSecurity", "ProductsAndInstruments"
2021-05-21 17:38:55 +03:00
b0bc8ec720
Web: Removed useless translations (DataManagement, DeactivationDeletionPortal, GreetingSettingsTitle, GreetingTitle, LoginHistoryNav)
2021-05-21 17:31:03 +03:00
66b30360de
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-21 17:21:16 +03:00
389ee969a2
Web: Moved translationKeys "Pin" and "Unpin" to "/static/locales/{lng}/Common.json"
2021-05-21 17:19:00 +03:00
81febda210
Web: Removed useless translations "CommunityUserCapability", "CrmProduct", "CRMUserCapabilityCreate", "CRMUserCapabilityEdit"
2021-05-21 17:04:16 +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
5afe35f58f
Web: Removed useless translations
2021-05-21 14:24:16 +03:00
53419df9d1
Web: Removed useless translations "ProjectsUserCapabilityCreate", "ProjectsUserCapabilityForm", "ProjectsUserCapabilityTrack", "ProjectsUserCapabilityView"
2021-05-21 14:11:21 +03:00
989f74af52
Web: Removed useless translations
2021-05-21 13:36:02 +03:00
cfbb6a3ac6
Web: Fix translation key select
2021-05-21 13:35:30 +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
cc2bb50862
Web: Resolved NotFoundKeysTest issues
2021-05-21 10:31:32 +03:00
87baab93fd
Web: Client: added urls on authenticator app
2021-05-20 06:38:09 +03:00
Alexey Kostenko
c1e29096ac
Web: Client: Added HelpButtons to admins page
2021-05-19 18:04:35 +03:00
5f36009630
Web: Moved translationKeys "LoadingDescription" and "LoadingLabel" to "/static/locales/{lng}/Common.json"
2021-05-18 18:35:03 +03:00
df1ebc8d77
Web: Moved translationKeys "OpenApp" and "ViewWeb" to "/static/locales/{lng}/Common.json"
2021-05-18 15:23:12 +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
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
cdb9ef6be9
Web: Moved translationKey "SaveButton" to "/static/locales/{lng}/Common.json"
2021-05-18 10:56:24 +03:00
b91ddca880
Web: Moved translationKey "CancelButton" to "/static/locales/{lng}/Common.json"
2021-05-17 12:08:57 +03:00
Alexey Kostenko
64f70c1bd0
Web: Client: Added translations
2021-05-14 17:22:45 +03:00
124ea0aa5c
Web: Client: fixed translates
2021-05-14 13:58:21 +03:00
9e40feb771
Added and applied Common.json for common translations (languages issue)
2021-04-29 10:14:47 +03:00
71b69c3560
Web: Client: fixed after merge
2021-04-28 11:42:12 +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
c47f896f75
Client: added translations
2021-04-24 10:42:49 +03:00
Alexey Kostenko
691e7d5498
Merge branch 'develop' into feature/oauth2.0
2021-04-21 15:04:26 +03:00
TatianaLopaeva
0f3eb1350b
Merge branch 'develop' into feature/team-template
...
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
2021-04-20 12:05:19 +03:00
Viktor Fomin
56e61a028c
Web: Client: add fake qr-code
2021-04-19 14:01:29 +03:00
Viktor Fomin
e5906324c5
Web: Client: fixed key
2021-04-19 13:49:36 +03:00
Viktor Fomin
62edc883db
Web: Client: add translations
2021-04-18 23:34:26 +03:00
Alexey Kostenko
d7930f9a8b
Web: Client: Redesign access rights page
2021-04-16 12:19:19 +03:00
TatianaLopaeva
e738cab4a2
Web: Added Error message & Added loader.
2021-04-15 19:51:59 +03:00
Viktor Fomin
dd4ca59e66
Web: Client: add translations
2021-04-14 15:23:03 +03:00
Viktor Fomin
f76ebe4095
Web: Client: added access portal page
2021-04-14 13:01:56 +03:00
TatianaLopaeva
73d113e26f
Wen: Settings: Added translation.
2021-04-13 14:28:36 +03:00
Alexey Kostenko
571b412d27
Web: Client/Components: Fixed facebook button styles/icon, fixed translations
2021-04-13 11:17:39 +03:00
Alexey Kostenko
544a24d0f1
Web: Client/Components: Style fix and added translations
2021-04-13 09:45:52 +03:00
TatianaLopaeva
3b94348cf5
Web: Settings: Fixed translation.
2021-04-12 15:59:20 +03:00
TatianaLopaeva
8c7ec5d0d0
Web: Settings: Added team template to the settings tree.
2021-04-12 14:34:08 +03:00
TatianaLopaeva
91bd2c8c74
Web: Settings: Added team-template page.
2021-04-12 12:56:08 +03:00
b9fe2c338f
Added New Proxy settings
2021-04-05 15:49:02 +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
8e6b2c78d8
Web: Moved ipl-progress-indicator to NavMenu
2021-03-18 22:26:52 +03:00
f3f4037282
Web: Fixed Wizard
2021-03-18 21:54:03 +03:00
6e2b2d5095
Web: Removed old svg
2021-03-17 21:26:28 +03:00
Artem Tarasov
c9e4df5f1b
Web: moved PeopleSelector to People
2021-03-17 13:37:22 +03:00
bac65c6744
Web: Client: Modified production build
2021-03-10 18:31:21 +03:00
TatianaLopaeva
5412f7b860
Web: NavMenu: Fixed icon path, deleted useless icons from modules.
2021-03-05 11:09:23 +03:00
TatianaLopaeva
e81d2c8bb7
Web: Common: Fixed logoUrl.
2021-03-05 11:01:49 +03:00
TatianaLopaeva
5c826bcf29
Web: Added top loading indicator for desktop.
2021-03-04 14:36:31 +03:00
68930abdcb
Web: Move toastr function to Web Client (mf: "studio/toastr")
2021-03-03 16:46:04 +03:00
TatianaLopaeva
ada47512f1
Web: Moved PeopleSelector to the Web Client.
2021-03-03 15:41:28 +03:00
TatianaLopaeva
5212633a8d
Web: Moved errors from Common to the Web Client.
2021-03-03 11:15:11 +03:00
bf7f680d08
Web: Moved NavMenu to Web Client
2021-03-02 18:25:20 +03:00
b9b4c4b1e2
Web: Added opportunity to load login page by primary link
2021-03-01 15:28:51 +03:00
55a4a53bbc
Web: Fixed 404 error on translation.json loading
2021-02-25 12:25:16 +03:00
507fadff55
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/store/auth/selectors.js
# packages/asc-web-components/src/components/icons/svg/index.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
# products/ASC.People/Client/src/components/Article/Body/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# yarn.lock
2021-02-24 10:57:03 +03:00
34d9eed580
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/GroupSelector/GroupSelector.stories.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-logo-item.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PeopleSelector/PeopleSelector.stories.js
# packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
# packages/asc-web-common/src/store/AuthStore.js
# packages/asc-web-common/src/store/ModuleStore.js
# packages/asc-web-common/src/store/SettingsStore.js
# packages/asc-web-common/src/store/UserStore.js
# packages/asc-web-common/src/store/auth/actions.js
# packages/asc-web-common/src/store/auth/index.js
# packages/asc-web-common/src/store/auth/reducer.js
# packages/asc-web-common/src/store/auth/selectors.js
# products/ASC.Files/Client/config-overrides.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/components/Article/Header/index.js
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ConvertDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteThirdPartyDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ThirdPartyMoveDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js
# products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js
# products/ASC.Files/Client/src/components/panels/ChangeOwnerPanel/index.js
# products/ASC.Files/Client/src/components/panels/EmbeddingPanel/index.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
# products/ASC.Files/Client/src/components/panels/VersionHistoryPanel/index.js
# products/ASC.Files/Client/src/helpers/desktop.js
# products/ASC.Files/Client/src/helpers/i18n.js
# products/ASC.Files/Client/src/helpers/utils.js
# products/ASC.Files/Client/src/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/rootReducer.js
# products/ASC.People/Client/config-overrides.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/Article/Body/index.js
# products/ASC.People/Client/src/components/Article/Header/index.js
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeEmailDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangePasswordDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangePhoneDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeUserStatusDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeUserTypeDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DataLossWarningDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteProfileEverDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteSelfProfileDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteUsersDialog/index.js
# products/ASC.People/Client/src/components/dialogs/InviteDialog/index.js
# products/ASC.People/Client/src/components/dialogs/SendInviteDialog/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
# products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/avatarEditorPage.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# products/ASC.People/Client/src/components/pages/Reassign/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Reassign/index.js
# products/ASC.People/Client/src/helpers/i18n.js
# products/ASC.People/Client/src/helpers/utils.js
# products/ASC.People/Client/src/index.js
# products/ASC.People/Client/src/store/people/reducers.js
# products/ASC.People/Client/src/store/portal/actions.js
# products/ASC.People/Client/src/store/portal/reducers.js
# products/ASC.People/Client/src/store/profile/actions.js
# products/ASC.People/Client/src/store/profile/selectors.js
# products/ASC.People/Client/src/store/rootReducer.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/config-overrides.js
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/About/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePhone.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/index.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/advantagesContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/buttonContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/contactContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/headerContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/custom-titles.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/language-and-time-zone.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/whitelabel.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/accessRights.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/modules.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/owner.js
# web/ASC.Web.Client/src/components/pages/ThirdParty/index.js
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/src/helpers/i18n.js
# web/ASC.Web.Client/src/helpers/utils.js
# web/ASC.Web.Client/src/index.js
# web/ASC.Web.Client/src/store/confirm/actions.js
# web/ASC.Web.Client/src/store/payments/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Client/src/store/settings/selectors.js
# web/ASC.Web.Client/src/store/store.js
# web/ASC.Web.Client/src/store/wizard/actions.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/Login.jsx
# web/ASC.Web.Login/src/sub-components/register-container.js
# yarn.lock
2021-02-24 10:30:42 +03:00
ef067c6040
Web: Client: Moved translations to public folder
2021-02-23 12:10:31 +03:00
TatianaLopaeva
5fdb5c8508
Web: Fix not displaing of icons.
2021-02-20 18:25:46 +03:00
6c80ebdff0
Merge branch 'develop' into feature/mobx
...
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# products/ASC.People/Client/src/store/group/actions.js
# products/ASC.People/Client/src/store/people/actions.js
# products/ASC.People/Client/src/store/people/selectors.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/About/index.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Common/src/components/Layout/index.js
# web/ASC.Web.Common/src/components/NavMenu/index.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header-nav.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header-unauth.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/nav-item.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/store/auth/actions.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/store/auth/selectors.js
# web/ASC.Web.Components/src/components/loader/types/rombs.js
2021-02-20 17:31:58 +03:00
TatianaLopaeva
7023cf5f3a
Web: Transferring icons from a shared folder to modules. Icons are displayed by url.
2021-02-20 11:46:32 +03:00
85a500eac6
Web: Client: Simplified translation
2021-02-19 20:26:41 +03:00
Ilya Oleshko
e486a7919a
Web: Fixed modules icons
2021-01-25 14:28:51 +03:00
789b547ccf
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-components/src/components/icons/svg/icon_box.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_dropbox.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_google_drive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_kdrive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_nextcloud.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_onedrive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_owncloud.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_sharepoint.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_webdav.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_yandex_disk.react.svg
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# yarn.lock
2021-01-22 11:24:16 +03:00
ef22eb04c5
Web: Client: Fix third-party response page displaying
2021-01-15 18:15:07 +03:00
889949eb95
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/Layout/index.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.stories.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/README.md
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/StyledHistoryRowsLoader.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/index.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section.js
# packages/asc-web-common/src/desktop/index.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js
# products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/pages/login/i18n.js
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/LoginContent.jsx
# yarn.lock
2021-01-11 12:21:59 +03:00
Vladislav Makhov
44ba6f350f
Merge branch 'develop' into feature/desktop-view
2020-12-30 16:20:47 +03:00
Artem Tarasov
3d7eada1a6
Web: Cluient/Files/People: fix for safari - disabled security zone (white stripes around the edges of the screen in landscape orientation
2020-12-30 12:15:50 +03:00
7b4dc42620
Fix displaying header pre-loader on Desktop
2020-12-29 17:19:02 +03:00
52798af66e
Notification images
2020-12-18 16:12:48 +03:00
4afadf2e0c
Web: Added support of public folders + moved back to original index.html
2020-12-15 19:27:30 +03:00
Ilya Oleshko
4147d2f31a
Web: Fixed temp loaders
2020-12-07 11:11:04 +03:00
Viktor Fomin
f66fc4c7ba
Web: Client: fix
2020-11-12 14:36:42 +03:00
Viktor Fomin
9a7237aea0
Web: Client: added header loader
2020-11-12 13:31:48 +03:00
Viktor Fomin
d6b92a59be
Web: Client: fix first loader
2020-11-10 18:21:11 +03:00
Viktor Fomin
9cbe89d4b5
Merge branch 'develop' into feature/filter-loader
2020-11-10 11:02:29 +03:00
Viktor Fomin
022f28c676
Web: Client: delete first header preloader
2020-11-10 10:41:00 +03:00
Viktor Fomin
835b6a2b62
Web: Client: fix first loader
2020-11-09 15:11:17 +03:00
Viktor Fomin
96276d23af
Web: Client: delete logo
2020-11-09 13:07:58 +03:00
Viktor Fomin
4dc0e0d13d
Web: Client: fix color
2020-11-06 16:17:20 +03:00
Viktor Fomin
71bf070324
Web: Client: fix loader
2020-11-05 12:24:15 +03:00
Vladislav Makhov
1e483de4ba
Merge branch 'develop' into feature/third-party-settings
...
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
2020-11-03 15:29:09 +03:00
60e66c1abe
Web: Fixed PWA App icon url on iOS
2020-11-02 21:42:53 +03:00
5d76e7e6b0
Web: Redesigned displaying of loading processes
2020-10-13 15:51:14 +03:00
ad4b28d1f2
Merge branch 'feature/files' into feature/loading-acceleration
...
# Conflicts:
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Common/src/components/index.js
2020-09-29 11:48:36 +03:00
TatianaLopaeva
5d01d660a5
Return lock.png
2020-09-24 13:05:17 +03:00
TatianaLopaeva
59716a184b
Deleted png images
2020-09-24 12:14:56 +03:00
TatianaLopaeva
6021ea4a76
Deleted png images
2020-09-24 12:01:08 +03:00
885eb4a691
Web: Clients: Added #temp-content markup on load and opportunity to hide it + router refactoring
2020-09-23 18:42:47 +03:00
TatianaLopaeva
ca420104fc
Merge branch 'feature/files' into feature/payments-enterprise
...
# Conflicts:
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
2020-09-21 14:54:05 +03:00
c16659c322
Web: Client: Removed useless markup
2020-09-17 10:21:15 +03:00
fdf4e7564b
Web: Client: Speeded up loading first page + refactoring
2020-09-17 10:18:44 +03:00
Vladislav Makhov
31f28acf88
Fix logos
2020-09-08 10:21:49 +03:00
TatianaLopaeva
792f2368ce
Changed images and rename them
2020-08-28 10:33:59 +03:00
TatianaLopaeva
9fff932736
Changed App and images from png into svg, added action and reducer for payments
2020-08-28 10:26:39 +03:00
TatianaLopaeva
fecb7383dd
added styled for desktop
2020-08-18 08:49:35 +03:00
Tatiana Lopaeva
271bfc1eb8
added payments
2020-08-17 12:20:24 +03:00
Artem Tarasov
36f11ff673
Created page Wizard
2020-06-19 16:47:41 +03:00
0eb0048596
Web: Client: change title of pages
2020-02-17 16:50:42 +03:00
35ee20c957
Web: Client: added logo icons
2020-02-14 16:05:32 +03:00
Ilya Oleshko
e99d1acc3c
Web: Common: Layout: Added use of icons from module
2020-02-12 16:18:23 +03:00
effad5439c
web: Added dummy Documents product
2020-01-27 14:07:02 +03:00
NikolayRechkin
3fb01e78ac
web: forbade a scalability
2019-12-13 13:25:09 +03:00
NikolayRechkin
c0c69badf3
first version of a progressive web application
2019-12-03 17:04:40 +03:00
Daniil Senkiv
5c61500118
Web.Client: Settings: added WhiteLabel page with getting logo urls, sizes, text for logo; added function for generating (drawing) logo
2019-11-13 12:22:50 +03:00
Daniil Senkiv
347ec412b2
Web.Client: deleted unsused i18n config and translation files
2019-09-03 12:42:16 +03:00
Daniil Senkiv
1fb3799208
Web: Client: translated existing words in current version, Login [EN]
2019-08-19 14:27:04 +03:00
Daniil Senkiv
7c28197679
Web: Client: translated existing words in current version, Layout [EN]
2019-08-19 14:25:46 +03:00
a9ce68847f
web: client: Init translation
2019-08-13 17:47:40 +03:00
4da674ab75
web: People: Added people.svg
2019-08-05 18:24:34 +03:00
d24a08b16f
Moved Studio->ClientApp to separated ASC.Web.Client folder
2019-07-09 14:51:18 +03:00
