c652209b49
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-05-24 13:58:54 +03:00
90c67cac13
ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422
2021-05-24 13:26:13 +03:00
1b730233c9
ElasticSearch: moved from 08a01422
2021-05-23 19:11:25 +03:00
Artem Tarasov
098e04891c
Web: deleted "WhiteLabel" translation key
2021-05-22 01:31:50 +03:00
Artem Tarasov
28dc774e26
Web: Client: Settings: fixed tKey for AccessRights'
2021-05-21 18:47:08 +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
4fdeec00e7
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-05-21 17:59:37 +03:00
e83d1d5922
Web: Moved translationKeys "DirectionAscLabel" and "DirectionDescLabel" to "/static/locales/{lng}/Common.json"
2021-05-21 17:59:28 +03:00
ae56fc0ecc
Web: fixed translation usage for keys "Alert", "Done", "Info"
2021-05-21 17:57:55 +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
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
f825c6eabd
Web: Resolved NotFoundKeysTest issues (OkButton, LoadingLicenseSuccess, LoadingLicenseError, OrganizationName)
2021-05-21 14:58:00 +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
Alexey Kostenko
7d440ff861
Web: Client: Fixed number of administrators on access rights page
2021-05-21 10:31:00 +03:00
Artem Tarasov
b9d7afb332
Web: Client: Settings: fixed selected tree node style
2021-05-21 01:16:22 +03:00
Alexey Kostenko
e16ca1677a
Web: Client: Added loading effect, if request sending more 0.1s
2021-05-20 19:12:50 +03:00
Artem Tarasov
c6fa305b30
Web: Client: NavMenu: fixed postition version-box
2021-05-20 18:38:50 +03:00
354841442e
Web: Editor: Fixed shell name
2021-05-20 14:21:26 +03:00
af2f24e4ac
Merge branch 'develop' into feature/translations
2021-05-20 13:11:13 +03:00
Alexey Kostenko
8702a8827e
Web: Client: Style fix ( Displaying long names in row and aside panel )
2021-05-20 12:36:13 +03:00
c2a3d1efee
Web: fixed mobile page swipe
2021-05-20 12:08:07 +03:00
fc822e5ad5
Web: Fix setModuleInfo usage
2021-05-20 11:27:50 +03:00
Alexey Kostenko
fc813eca1f
Web: Client: Fixed help info position, removed unnecessary imports
2021-05-20 10:04:36 +03:00
c7ab1ed8a8
Web: Client: fixed styles
2021-05-20 08:17:20 +03:00
87baab93fd
Web: Client: added urls on authenticator app
2021-05-20 06:38:09 +03:00
b8ef6150ab
Web: Client: added error message
2021-05-20 05:22:36 +03:00
eccf52eba1
Web: Client: added button loader
2021-05-20 05:14:22 +03:00
9ebc5dada7
Web: Client: fixed styles
2021-05-20 04:51:18 +03:00
1274230c30
Web: Client: fixed styles
2021-05-20 04:49:15 +03:00
1ec0cb320b
Web: Client: fixed styles
2021-05-20 04:40:21 +03:00
cebb38491e
Web: Client: added loader
2021-05-20 04:27:25 +03:00
Artem Tarasov
d17887eabc
Web: Client: NavMenu: fixed appearance of the cursor when hovering over profile icon
2021-05-20 01:48:06 +03:00
0f1ccb86bb
Web: Client: deleted console, unused imports
2021-05-20 01:16:40 +03:00
ab1e14f503
Web: Client: fixed show/hide save button
2021-05-20 01:09:04 +03:00
Artem Tarasov
5996b3f74f
Merge branch 'develop' into bugfix/fixed-styles
2021-05-20 01:00:36 +03:00
Artem Tarasov
80a09fdb31
Web: Client: NavMenu: fixed position version-box when change orientation or window size
2021-05-20 00:57:11 +03:00
4e57f2a47f
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-20 00:47:45 +03:00
70de9e483c
Web: Client: added loader
2021-05-19 19:30:41 +03:00
8d35cebc25
Web: Client: fixed show button
2021-05-19 18:29:49 +03:00
e5395c48d7
Web: Client: fixed save settings
2021-05-19 18:23:30 +03:00
692c60a444
Web: Client: login with code and cookie
2021-05-19 18:23:09 +03:00
Alexey Kostenko
f25eb00494
Merge branch 'develop' into feature/access-rights-admins
2021-05-19 18:05:19 +03:00
16f3b4b791
Merge branch 'feature/two-factor-auth' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-19 18:04:59 +03:00
ee8119eb6d
Web: Client: submit by enter
2021-05-19 18:04:44 +03:00
Alexey Kostenko
c1e29096ac
Web: Client: Added HelpButtons to admins page
2021-05-19 18:04:35 +03:00
e14948944f
Tfa: added validation
2021-05-19 18:04:32 +03:00
1f54f301c5
Web: Client: added input error, max length
2021-05-19 18:03:50 +03:00
3f1ae6ae60
Web: Client: fixed tfa login
2021-05-19 17:25:05 +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
b5578b943a
Web: Client: added toastr
2021-05-19 03:27:55 +03:00
b9c52c526e
Fixed DistributedTask
2021-05-18 21:24:22 +03:00
4b4b03f2a4
Merge branch 'develop' into feature/crm-migrate
2021-05-18 19:06:54 +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
Alexey Kostenko
0f19106f6d
Web: Client: Admins page - style fix
2021-05-18 14:22:48 +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
Vashchuk Nikita
82abf11109
Merge branch 'develop' into feature/calendar
...
# Conflicts:
# ASC.Web.sln
# config/autofac.products.json
# config/nginx/onlyoffice.conf
# products/ASC.Calendar/Server/ASC.Calendar.csproj
# products/ASC.Calendar/Server/Controllers/CalendarController.cs
# products/ASC.Calendar/Server/Program.cs
# products/ASC.Calendar/Server/Properties/launchSettings.json
# products/ASC.Calendar/Server/Resources/CalendarAddonResource.Designer.cs
# products/ASC.Calendar/Server/Resources/CalendarAddonResource.resx
# products/ASC.Calendar/Server/Startup.cs
2021-05-18 13:24:02 +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
Alexey Kostenko
082b06c04c
Web: Client: Fixed groupButtonMenu on admins page
2021-05-18 13:14:09 +03:00
Alexey Kostenko
e043269d4f
Web: Client: Disable change settings if before request not finished
2021-05-18 12:18:01 +03:00
Alexey Kostenko
745abafe28
Web: Client: Changing full access without user request, small refactoring
2021-05-18 11:30:31 +03:00
cdb9ef6be9
Web: Moved translationKey "SaveButton" to "/static/locales/{lng}/Common.json"
2021-05-18 10:56:24 +03:00
Alexey Kostenko
969f0abb7c
Web: Client: Changing access rights to modules without user request
2021-05-18 10:44:19 +03:00
27caf0932e
tfaappnewapp: enable empty body
2021-05-17 22:14:58 +03:00
Vashchuk Nikita
94047ab0a1
Fix Calendar
2021-05-17 21:35:23 +03:00
8a3db93d0d
Backup: moved from 08a01422
2021-05-17 21:27:39 +03:00
04412edf82
Web: Client: deleted console.log
2021-05-17 16:52:48 +03:00
97a0dda7a6
Web: Client: added tfa login
2021-05-17 16:33:53 +03:00
cec8ee2d59
Web: Login: fixed redirect
2021-05-17 16:31:45 +03:00
Artem Tarasov
026366b1b9
Web: Client: fix position verion badge when orientation change
2021-05-17 12:53:58 +03:00
Artem Tarasov
9eb3b2a375
Web: Components/Client: fix tree loader, fix version badge
2021-05-17 12:40:46 +03:00
b91ddca880
Web: Moved translationKey "CancelButton" to "/static/locales/{lng}/Common.json"
2021-05-17 12:08:57 +03:00
2beacfcf23
Web: Enabled Common.json translations loading
2021-05-17 11:19:38 +03:00
Alexey Kostenko
08cc7b3560
Web: Client: Fixed warning, style, added text translation
2021-05-17 10:56:40 +03:00
Alexey Kostenko
64f70c1bd0
Web: Client: Added translations
2021-05-14 17:22:45 +03:00
Alexey Kostenko
663417d14b
Web: Client: Configuring access rights to modules, small refactoring
2021-05-14 17:05:39 +03:00
9f83d67ffb
Web: Client: get secret key and qr
2021-05-14 15:59:40 +03:00
57589a4e9e
Web: Client: init confirm store
2021-05-14 15:57:56 +03:00
4c618c0826
Web: Client: added confirm loader HOC
2021-05-14 15:57:00 +03:00
c4df455587
Web: Client: created confirm store
2021-05-14 15:54:03 +03:00
Alexey Kostenko
d2b51b4672
Web: Client: Removed the ability to add the portal owner to the list of administrators
2021-05-14 15:53:02 +03:00
124ea0aa5c
Web: Client: fixed translates
2021-05-14 13:58:21 +03:00
Alexey Kostenko
22f0d3bd37
Web: Client: Do not show the owner of the portal on the admins page
2021-05-14 12:50:09 +03:00
85bd971735
Merge branch 'develop' into feature/translations
2021-05-14 12:07:48 +03:00
Alexey Kostenko
4300861abf
Web: Client: Show all available modules in the settings, request for admins list only on the componentDidMount, added onFullAccessToggle method
2021-05-13 18:35:19 +03:00
Artem Tarasov
811a41bbc5
Web: Client: fixed position version badge
2021-05-13 14:04:40 +03:00
7ad62ded2b
Auth: fix confirm
2021-05-13 14:02:33 +03:00
d01db1eed6
Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq
...
# Conflicts:
# common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
# common/ASC.Data.Storage/Encryption/EncryptionServiceNotifier.cs
# common/ASC.Data.Storage/Encryption/EncryptionWorker.cs
# common/ASC.Data.Storage/StaticUploader.cs
# common/services/ASC.Data.Backup/BackupAjaxHandler.cs
# common/services/ASC.Data.Backup/Service/BackupService.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-13 11:57:40 +03:00
28cbbc1671
Web: Added allowForMe for Route My
2021-05-13 11:26:11 +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
Alexey Kostenko
7ae752b86e
Web: Client: Added ModalDialog, removed unused code
2021-05-12 16:51:50 +03:00
Alexey Kostenko
3694d3a251
Web: Client: PeopleSelector moved from header to admins page
2021-05-12 13:36:09 +03:00
198f1e4fe6
Settings: fixed tfaapp/confirm
2021-05-11 22:30:37 +03:00
Alexey Kostenko
6672b6c4f3
Web: Client: Fixed mobile view on admins page
2021-05-11 13:36:12 +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
Alexey Kostenko
62c789d68b
Merge branch 'develop' into feature/access-rights-admins
2021-05-11 10:19:31 +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
3ffd45f998
Web: Client: fixed page title
2021-05-07 14:34:08 +03:00
c7f4e69082
Web: Client: get tfa settings
2021-05-07 14:22:32 +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
88923a5e4d
Web: Fix build static bundle
2021-05-05 20:30:54 +03:00
a4c73548bc
Web: i18n configs fix
2021-05-05 20:30:13 +03:00
07c6749243
Merge branch 'feature/two-factor-auth' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-05 15:59:01 +03:00
90117eb6f8
Auth: setCookies
2021-05-05 15:57:12 +03:00
3365d1a1dc
Web: Client: added showCopyLink prop to password-input component, fixed displaying "copy email and password" link
2021-05-05 15:48:19 +03:00
d7ea692b3e
Web: Client: fixed styles for createUser confirm
2021-05-05 15:29:18 +03:00
261e6d8b4c
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-05 15:09:59 +03:00
c8d73981a4
Web: Client: added tfa settings
2021-05-05 14:59:38 +03:00
9705508e61
Web: Client: Fix About page base url setup
2021-05-05 12:06:03 +03:00
abfb65f42e
Web: Client: Fix height on Desktop Editors
2021-05-05 11:29:48 +03:00
32abd05d10
Web: Hide user-select on Desktop Editors
2021-05-05 11:21:21 +03:00
026306d7ca
Web: Login: Fix hard-coded list of trusted domains on registration
2021-05-04 15:35:09 +03:00
c86257cf67
Merge branch 'develop' into feature/crm-migrate
2021-05-04 11:25:27 +03:00
0dbadc6394
from Microsoft.NET.Sdk.Web to Microsoft.NET.Sdk for ClassLibrary Projects
2021-04-30 18:42:10 +03:00
bc8ea5a3be
Merge branch 'hotfix/v0.1.9' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.9
2021-04-30 18:01:25 +03:00
7c1283c26f
Web: Fix login redirect on Editor not authorized link opening
2021-04-30 18:01:16 +03:00
c8f48d1861
Resource: profile removed
2021-04-30 17:43:26 +03:00
Alexey Kostenko
f9e04eb8d5
Web: Client: Removing admins
2021-04-30 15:57:43 +03:00
9f3f03a963
Web: added store to webpack.config, fixed Firefox store problems
2021-04-30 15:19:11 +03:00
Alexey Kostenko
17d4b0a4db
Merge branch 'develop' into feature/access-rights-admins
2021-04-29 15:11:50 +03:00
9e40feb771
Added and applied Common.json for common translations (languages issue)
2021-04-29 10:14:47 +03:00
Alexey Kostenko
5f81e5a0ce
Web: Client: Added group button menu, fixed api getListAdmins, the ability to add new administrators
2021-04-29 09:40:55 +03:00
8816e535c1
merge from develop
2021-04-28 19:50:59 +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
71b69c3560
Web: Client: fixed after merge
2021-04-28 11:42:12 +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
38ed10ccb8
Merge branch 'feature/two-factor-auth' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-04-28 11:13:01 +03:00
f53eef184f
Tfa: added tfaapp/setup method for receiving code and image
2021-04-27 20:31:05 +03:00
631dd5034f
Merge branch 'release/v0.1.8' of github.com:ONLYOFFICE/AppServer into release/v0.1.8
2021-04-27 15:55:45 +03:00
69c9ee2d0e
Web: Fixed changing the language on the page when the user changes it through the settings and has already changed the language in the profile.
2021-04-27 15:55:38 +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
932e18be1c
Web: Editor: Fix display additional buttons by doc param
2021-04-27 13:48:32 +03:00
5777f0abd4
Settings: confirm url
2021-04-27 13:41:32 +03:00
6114d960e3
Auth: AuthenticateMe added ConfirmUrl
2021-04-27 13:40:25 +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
20ee2a4772
Web: Client: fixed ConfirmRoute
2021-04-27 10:16:36 +03:00
Vladislav Makhov
9a06ab8b3b
web: client: fix closing on logo click
2021-04-27 09:27:24 +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
f11f18dffb
Auth: check tfa
2021-04-26 14:56:38 +03:00
Alexey Kostenko
2cc413ed16
Web: Client: Added button "AddUsers" on header on access-rights/admins page
2021-04-26 09:14:08 +03:00
a66a454462
Settings: added tfaapp method
2021-04-25 18:06:56 +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
cd699e37e2
Files: Fix opening of version
2021-04-23 18:00:05 +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
d19a3469d1
Merge branch 'develop' into feature/access-rights-admins
2021-04-23 16:07:42 +03:00
Alexey Kostenko
67ae709db7
Web: Client: Moved page from old branch
2021-04-23 13:10:30 +03:00
Alexey Kostenko
c430e983b4
Web: Client: Added admins page
2021-04-23 08:22:58 +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
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
TatianaLopaeva
ce20ae3de2
Web: Fixed tabIndex.
2021-04-20 11:55:14 +03:00
Ilya Oleshko
7adfe3112f
Merge branch 'feature/access-rights-new' of github.com:ONLYOFFICE/AppServer into feature/access-rights-new
2021-04-19 18:54:12 +03:00
Ilya Oleshko
b8910edc01
Merge branch 'develop' into feature/access-rights-new
2021-04-19 18:53:55 +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
6c8654ba77
Merge branch 'develop' into feature/team-template
2021-04-19 16:47:52 +03:00
TatianaLopaeva
224bee68b4
Web: Settings: Added tabIndex.
2021-04-19 16:46:15 +03:00
Alexey Kostenko
1627490b05
Merge branch 'develop' into feature/access-rights-new
2021-04-19 16:21:38 +03:00
Alexey Kostenko
6bb13d77c8
Web: Client: Fixed HelpButton on mobile devices
2021-04-19 16:21:02 +03:00
Alexey Kostenko
49c2496391
Web: Client: Fixed translation in PeopleSelector, small refactoring
2021-04-19 16:12:34 +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
461110e1a7
Web: Fix show loaders timeout for quickly responses
2021-04-19 13:36:40 +03:00
TatianaLopaeva
2a3d50cfd5
Web: Settings: Fixed position of buttons for desktop.
2021-04-19 12:30:54 +03:00
Alexey Kostenko
2749df79df
Web: Client: Redirect to default page after OAuth registration
2021-04-19 10:19:27 +03:00
Alexey Kostenko
03ec607cbf
Merge branch 'develop' into feature/oauth2.0
2021-04-19 08:25:42 +03:00
Viktor Fomin
15153b0fd4
Web: Client: add app activation route
2021-04-18 23:35:06 +03:00
Viktor Fomin
035708010f
Web: Client: add app activation page
2021-04-18 23:34:53 +03:00
Viktor Fomin
62edc883db
Web: Client: add translations
2021-04-18 23:34:26 +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
Alexey Kostenko
49fd31c19b
Web: Client: Style fix
2021-04-16 18:22:04 +03:00
TatianaLopaeva
ab10641b45
Web: Rename teamTemplate.
2021-04-16 17:10:37 +03:00
Alexey Kostenko
8cb74d14b4
Web: Client/Common: Added thirdParty signup api
2021-04-16 16:34:24 +03:00
7cb9affc77
Web: Remove tap-highlight
2021-04-16 16:27:07 +03:00
3aae413e12
replace Path.Combine to CrossPlatform.PathCombine
2021-04-16 16:26:26 +03:00
TatianaLopaeva
42d29cbae5
Web: Settings: Added customName and customId.
2021-04-16 15:57:34 +03:00
ebc751530b
Web: Open menu by module title
2021-04-16 15:53:52 +03:00
TatianaLopaeva
06348316ec
Web: Settings: Deleted useless code.
2021-04-16 15:43:08 +03:00
TatianaLopaeva
b0f29486ff
Web: Deleted useless console log.
2021-04-16 15:36:06 +03:00
TatianaLopaeva
052157d1fe
Web: Rename functions.
2021-04-16 15:35:02 +03:00
Alexey Kostenko
96ec652313
Merge branch 'develop' into feature/oauth2.0
2021-04-16 14:25:37 +03:00
TatianaLopaeva
cd00030b24
Web: Layout: Fixed close the context menu. (Only for Mobile Devices).
2021-04-16 12:45:21 +03:00
Alexey Kostenko
067079363b
Web: Client: Fixed changing portal owner
2021-04-16 12:32:28 +03:00
Alexey Kostenko
d7930f9a8b
Web: Client: Redesign access rights page
2021-04-16 12:19:19 +03:00
TatianaLopaeva
2075aa6647
Web: Settings: Fix displaying of loading date.
2021-04-16 11:28:06 +03:00
TatianaLopaeva
ab1d41b2a8
Web: Fixed loading date.
2021-04-16 11:21:17 +03:00
TatianaLopaeva
297e4f42e9
Merge branch 'develop' into feature/team-template
2021-04-16 09:25:43 +03:00
TatianaLopaeva
53d449c508
Web: Deleted useless console.log.
2021-04-15 19:53:49 +03:00
TatianaLopaeva
e738cab4a2
Web: Added Error message & Added loader.
2021-04-15 19:51:59 +03:00
TatianaLopaeva
69ca5bbd90
Web: Settings: Fixed:
...
- the input is displayed without error if you changed the template
- if the template input is empty, then the option is changed to custom
- the problem with the correct display of the current option.
2021-04-15 17:49:16 +03:00
Alexey Kostenko
cd831d3f93
Web: Client: Refactoring
2021-04-15 16:20:41 +03:00
TatianaLopaeva
a9e9729cab
Web: Settings: Fixed save button if selected Custom schema.
2021-04-15 13:27:39 +03:00
TatianaLopaeva
5b07217b83
Web: Settings: Added saving session for selected option.
2021-04-15 11:28:13 +03:00
Alexey Kostenko
a8a9c8115f
Web: Client: Show the real number of administrators on the portal, small refactoring
2021-04-15 10:11:15 +03:00
2f38b2ec33
Settings: fixed custom schemaName
2021-04-14 21:08:27 +03:00
TatianaLopaeva
bb1c322672
Web: Settings: Added logic for click cancel button.
2021-04-14 19:31:30 +03:00
TatianaLopaeva
cfdc6f8568
Web: Added showReminder & Fixed selected option.
2021-04-14 18:44:35 +03:00
TatianaLopaeva
60218edb3b
Web: Added show button only if one of the input of form was changed & Added saving data during the session.
2021-04-14 18:18:11 +03:00
TatianaLopaeva
5a3f14d6fd
Merge branch 'feature/team-template' of github.com:ONLYOFFICE/AppServer into feature/team-template
2021-04-14 16:34:03 +03:00
038fd58d7c
Settings: fixed custom schemaName
2021-04-14 16:21:37 +03:00
Alexey Kostenko
7ee2de69d1
Web: Client: Redesign AccessRights page
2021-04-14 15:28:04 +03:00
Viktor Fomin
0150903ef3
Web: Client: add app auth route
2021-04-14 15:24:00 +03:00
Viktor Fomin
b7226cbfbc
Web: Client: add app auth page
2021-04-14 15:23:28 +03:00
Viktor Fomin
dd4ca59e66
Web: Client: add translations
2021-04-14 15:23:03 +03:00
fdc5ee0838
Settings: fixed custom name settings
2021-04-14 15:03:08 +03:00
TatianaLopaeva
88ed42bcfe
Merge branch 'feature/team-template' of github.com:ONLYOFFICE/AppServer into feature/team-template
2021-04-14 15:03:00 +03:00
TatianaLopaeva
fc40487de0
Web: Added setCurrentShema and setCustomShema methods, added form validation.
2021-04-14 14:26:26 +03:00
Viktor Fomin
f76ebe4095
Web: Client: added access portal page
2021-04-14 13:01:56 +03:00
TatianaLopaeva
39064cf4e2
Web: Settings: Added cancel and save button.
2021-04-13 22:51:43 +03:00
TatianaLopaeva
a599b70c96
Web: Added name of current template.
2021-04-13 21:43:23 +03:00
a30915f618
Settings: post and put customschemas
2021-04-13 21:11:38 +03:00
783a5f2b37
Merge branch 'feature/team-template' of github.com:ONLYOFFICE/AppServer into feature/team-template
2021-04-13 20:10:32 +03:00
0df4b998d1
Api: removed SchemaItemModel
2021-04-13 20:10:14 +03:00
TatianaLopaeva
ff370259e9
Web: Added "learn more and help url for common setting.
2021-04-13 14:47:46 +03:00
TatianaLopaeva
3487e40c51
Web: Settings: Added logic for team template, added getCustomSchema.
2021-04-13 14:34:04 +03:00
TatianaLopaeva
73d113e26f
Wen: Settings: Added translation.
2021-04-13 14:28:36 +03:00
NikitaVashchuk
b56fc15f51
fix calendar
2021-04-13 11:40:31 +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
Alexey Kostenko
64ccdf81ae
Web: Client: Added oAuth to create user form
2021-04-12 18:14:39 +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
2c0dd28ad4
Merge branch 'develop' into bugfix/files-panel
2021-04-12 12:09:33 +03:00
Alexey Kostenko
cf7072a714
Refactoring
2021-04-12 10:57:21 +03:00
Alexey Kostenko
0e4e7debac
Web: Login: Show facebook button first
2021-04-12 10:26:46 +03:00
Alexey Kostenko
6a6e4c4705
Web: Login: Added translations
2021-04-09 16:01:04 +03:00
Alexey Kostenko
e187db767f
Web: Login: Updated field with buttons for login
2021-04-09 16:00:41 +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
TatianaLopaeva
23ba37cc9d
Web: Layout: Fixed width of article for mobile.
2021-04-08 14:59:23 +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
80e796ed1e
Web: Hide displaying logo on Tables and Mobiles
2021-04-07 16:23:46 +03:00
559d7a9940
Web: Fixed export and import registerSW
2021-04-07 15:41:42 +03:00
9cbdfaab1b
Web: Removed commented code
2021-04-07 15:29:00 +03:00
4484d609a6
Web: Added registerSW for start Service-Worker + Added post SkipWaiting on update
2021-04-07 15:27:51 +03:00
TatianaLopaeva
cdef097fdd
Web: Fixed hiding header when switching group.
2021-04-07 13:35:32 +03:00
ee6ffd3ace
Updated packages
2021-04-06 20:16:24 +03:00
Artem Tarasov
f9107ae9f6
Web: Client: fixed bug with height calculation on ios
2021-04-06 20:01:32 +03:00
Alexey Kostenko
ab157b2caf
Web: Client: Fix
2021-04-05 17:34:58 +03:00
2c7434710c
Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0
2021-04-05 15:49:08 +03:00
b9fe2c338f
Added New Proxy settings
2021-04-05 15:49:02 +03:00
2655f0c62d
Web: fixed Trans
2021-04-05 15:35:50 +03:00
TatianaLopaeva
24e80979f5
Web: createUser: Fixed margin-top for mobile devices.
2021-04-05 15:18:24 +03:00
Alexey Kostenko
df635f3bfd
Web: Login/Common: Clear interval if getter token window is closed
2021-04-04 16:39:35 +03:00
Alexey Kostenko
0647881975
Web: Login: Removed unnecessary method
2021-04-04 15:54:32 +03:00
Alexey Kostenko
aadb8e3827
Web: Login: Show notification if account not connected to provider
2021-04-02 13:06:27 +03:00
TatianaLopaeva
f79f75f6db
Merge branch 'develop' into feature/EditorIntegration
2021-04-01 16:42:33 +03:00
c0582c1130
merge from develop
2021-04-01 16:28:36 +03:00
TatianaLopaeva
8f8a0d2f44
Web: Editor: Deleted useless props.
2021-04-01 11:50:30 +03:00
TatianaLopaeva
386529c6fd
Merge branch 'develop' into feature/EditorIntegration
...
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
2021-04-01 10:17:14 +03:00
18b4fba15a
Merge branch 'develop' into feature/dotnet5
2021-03-31 20:38:05 +03:00
166aaa8239
Merge branch 'develop' into bugfix/privacy-room
2021-03-31 18:01:58 +03:00
TatianaLopaeva
33b165fd40
Web: Files/Editor: Added SharingDialog.
2021-03-31 16:49:14 +03:00
Vladislav Makhov
a6f1ed972c
web: fix progress-indicator style for desktop
2021-03-31 12:46:09 +03:00
Ilya Oleshko
ff79708e59
Web: Client: Layout: Fixed component render on old webkit devices, disable webkit-touch-callout at article
2021-03-31 10:42:59 +03:00
