|
|
b9fe2c338f
|
Added New Proxy settings
|
2021-04-05 15:49:02 +03:00 |
|
TatianaLopaeva
|
24e80979f5
|
Web: createUser: Fixed margin-top for mobile devices.
|
2021-04-05 15:18:24 +03:00 |
|
TatianaLopaeva
|
f79f75f6db
|
Merge branch 'develop' into feature/EditorIntegration
|
2021-04-01 16:42:33 +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 |
|
TatianaLopaeva
|
2a2b6cd1ac
|
Web: Editor: Refactoring.
|
2021-03-30 18:21:36 +03:00 |
|
TatianaLopaeva
|
af379ac72f
|
Web: Editor: Deleted useless console.log.
|
2021-03-30 15:48:08 +03:00 |
|
TatianaLopaeva
|
dea731dfa7
|
Web: Files/Editor: Deleted useless code.
|
2021-03-30 15:44:45 +03:00 |
|
TatianaLopaeva
|
1531a37951
|
Web: Editor: Fixed displaying of toast.
|
2021-03-30 14:03:43 +03:00 |
|
TatianaLopaeva
|
dc0baec941
|
Web: Editor/Files: Fix displaying of shared user list at Shared Panel & Refactoring.
|
2021-03-30 10:21:30 +03:00 |
|
TatianaLopaeva
|
005d6759e9
|
Web: Editor/Files: Deleted conditions for Edit & Fixed url to folder where the file is located.
|
2021-03-29 19:31:11 +03:00 |
|
TatianaLopaeva
|
c4bcb8772c
|
Web: Files/Editor: Added additional conditions for access to the sharing panel and updated conditions for the custom filter.
|
2021-03-28 22:59:36 +03:00 |
|
TatianaLopaeva
|
5ccb86abeb
|
Web: Editor/Files: Refactoring & Moved icon to the common folder for icons.
|
2021-03-28 21:38:48 +03:00 |
|
TatianaLopaeva
|
88392ffd56
|
Web: Editor/Files: Refactoring.
|
2021-03-28 19:21:08 +03:00 |
|
TatianaLopaeva
|
89dbfd1f54
|
Web: Editor/Files: Fixed share email from the Editor.
|
2021-03-28 18:47:04 +03:00 |
|
TatianaLopaeva
|
5d1e2f0e4c
|
Web: Editor: Added condition that don't change access when user can't edit.
|
2021-03-28 18:13:59 +03:00 |
|
TatianaLopaeva
|
40218e944e
|
Web: Editor: Added goBack button to the files.
|
2021-03-28 17:49:51 +03:00 |
|
TatianaLopaeva
|
7fba6003a2
|
Web: Editor: Added list of access rights when Editor initialized and access doesn't changed yet.
|
2021-03-26 18:27:30 +03:00 |
|
TatianaLopaeva
|
c417709197
|
Web: Editor: Refactoring.
|
2021-03-26 17:35:44 +03:00 |
|
TatianaLopaeva
|
7777d05515
|
Web: Editor/Files: Added full list of access rights for SharingPanel to Editor.
|
2021-03-26 17:18:43 +03:00 |
|
TatianaLopaeva
|
2dba92ba28
|
Web: Editor/Files: Added refresh list of people and their access rights after changed at SharingPanel.
|
2021-03-26 15:19:55 +03:00 |
|
TatianaLopaeva
|
4892b39e0e
|
Web: Editor: Added SharingPanel.
|
2021-03-26 15:14:17 +03:00 |
|
TatianaLopaeva
|
129b066802
|
Web: Editor: Added mobx and mobx-react dependencies.
|
2021-03-26 15:05:07 +03:00 |
|
TatianaLopaeva
|
ff2d8a8a28
|
Web: Editor: Changed name space fro i18n.
|
2021-03-26 14:46:19 +03:00 |
|
TatianaLopaeva
|
2e44d28957
|
Added translate for access rights.
|
2021-03-26 14:43:50 +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 |
|
