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
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
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
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
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
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
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
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
6b8d644aab
Web: Replaced all homepages to config variant
2021-03-19 18:22:35 +03:00
06621ca2cb
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 16:31:48 +03:00
e63fc30a2e
Web: People: Fixed move to direct link
2021-03-19 16:31:41 +03:00
Artem Tarasov
51b978f6a3
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 14:13:56 +03:00
Artem Tarasov
7c7e7e8c05
Web: People: fixed transition from profile editing
2021-03-19 14:13:22 +03:00
9fc950665b
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 11:22:36 +03:00
e87709dc70
Web: People: fixed InviteDialog styles
2021-03-19 11:22:25 +03:00
Artem Tarasov
a6c21657a1
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 11:18:21 +03:00
Artem Tarasov
9cfbc4f6a0
Web: People: fix position of email value in Profile
2021-03-19 11:17:36 +03:00
33281d9260
Web: Files: commented debug in i18n config
2021-03-19 10:53:13 +03:00
c862bbc7ef
Web: People: Fixed loading translations
2021-03-19 10:49:50 +03:00
78140c0739
Web: People: Fixed double init
2021-03-19 10:46:49 +03:00
3b340396a7
Web: Fixed jumping of NavMenu
2021-03-19 10:45:34 +03:00
TatianaLopaeva
7299252d8f
Web: People: PeopleSelector: Fixed load path of translations.
2021-03-19 10:01:42 +03:00
8e6b2c78d8
Web: Moved ipl-progress-indicator to NavMenu
2021-03-18 22:26:52 +03:00