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
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
65e1c72c01
Sln: fixed packages
2021-03-26 12:26:12 +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
f732f5fba6
Web: Moved sw-template to @appserver/common and removed api cache (translation issue)
2021-03-24 11:45:58 +03:00
97fa6c82ab
Web: Editor: webpack: disabled compression
2021-03-23 19:34:18 +03:00
30b976f25f
Web: Client: removed debugger, fixed onChangeOwner
2021-03-23 15:16:18 +03:00
40567ed10b
Web: Restore: remove remoteEntry script
2021-03-23 10:33:36 +03:00
fd704ab12a
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 20:58:06 +03:00
5dd30c9502
Web: Client: fixed owner change
2021-03-22 20:56:53 +03:00
4ce205fe9a
Web: Client: Commented not used code
2021-03-22 20:00:38 +03:00
b0c430b7ba
Merge branch 'develop' into feature/workspaces
2021-03-22 19:46:49 +03:00
e4897160a9
fixed SendEmailActivationInstructions
2021-03-22 18:56:04 +03:00
f19ee78c0f
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 18:52:33 +03:00
dea3f3bb20
Web: Fixed login redirect
2021-03-22 18:52:25 +03:00
TatianaLopaeva
26ef7bdd65
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 18:31:41 +03:00
e279ece3c4
Removed commented code
2021-03-22 18:24:19 +03:00
ce86b6014b
Web: Settings: Add URL proxy
2021-03-22 18:24:03 +03:00
TatianaLopaeva
9baae539d2
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 18:11:45 +03:00
TatianaLopaeva
24cc620904
Web: Fixed displaying of shared files at aside & Deleted useless code.
2021-03-22 18:11:39 +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
Viktor Fomin
0da17ef641
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 16:15:07 +03:00
Viktor Fomin
74e5686a0e
Web: Client: fixed language-timezone settings
2021-03-22 16:14:41 +03:00
89f2431e1c
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 15:33:50 +03:00
Alexey Kostenko
3524f3b6c6
Web: Client/Common: Fixed Route to homepage (Incorrect header on homepage)
2021-03-22 15:27:36 +03:00
83e9a8b4a4
Web: Add URL proxy on tryRedirectTo usage
2021-03-22 12:16:41 +03:00
b6a5249147
Web: Editor: Add URL proxy
2021-03-22 12:12:34 +03:00
Viktor Fomin
d3fdc2d8a3
Web: Client: fixed greeting settings
2021-03-22 11:57:08 +03:00
25bbd0cf2a
Merge branch 'develop' into feature/workspaces
2021-03-22 11:34:54 +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
fc7bd11088
Fix getshortenlink
2021-03-21 18:29:35 +03:00
335cc31939
Notify: fix
2021-03-21 17:51:49 +03:00
accd318dc0
Web: Fixed z-index of #ipl-progress-indicator
2021-03-20 11:24:33 +03:00
6b8d644aab
Web: Replaced all homepages to config variant
2021-03-19 18:22:35 +03:00
1e02f165ca
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.People/Client/src/components/PeopleSelector/i18n.js
2021-03-19 10:55:22 +03:00
Artem Tarasov
dabf704485
Web: Client/Components: Wizard: layout fix
2021-03-18 22:55:15 +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
330c156cb8
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-18 18:20:31 +03:00
544abc2321
Web: Client: fixed changePassword form, removed debugger
2021-03-18 16:00:58 +03:00
TatianaLopaeva
2898cabc3f
Web: NavMenu: Fixed styles of title.
2021-03-18 13:53:21 +03:00
TatianaLopaeva
80247cbb1a
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-18 13:30:53 +03:00
TatianaLopaeva
242d6870aa
Web: PaymentsEnterprise: Fix styles & Added lost import.
2021-03-18 13:30:38 +03:00
23a23a0c68
Web: Client: fixed changeEmail confirm page
2021-03-18 12:29:16 +03:00
a861371826
Web: Client: fixed activateUser confirm page
2021-03-18 12:28:49 +03:00
6e2b2d5095
Web: Removed old svg
2021-03-17 21:26:28 +03:00
c3b49a713d
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-17 18:34:09 +03:00