32338fdcbc
Merge branch 'develop' into feature/drag-and-drop
2021-03-26 16:11:16 +03:00
Ilya Oleshko
53c0e36967
Web: Components: Reworked context-menu component
2021-03-26 16:03:51 +03:00
Ilya Oleshko
eef2e8f385
Web: Components: Added Portal component
2021-03-26 16:03:19 +03:00
Ilya Oleshko
10b27e532d
Web: Components: Utils: Added DOM helpers
2021-03-26 16:02:44 +03:00
Ilya Oleshko
f7b31231d0
Web: Components: Utils: Added object to JSX converter
2021-03-26 16:02:05 +03:00
Ilya Oleshko
983e689bbe
Web: Components: Utils: Added class name combiner
2021-03-26 16:01:22 +03:00
13f097e039
People: fix Activation
2021-03-26 15:59:56 +03:00
6b16402d82
Web: Files: fixed tree drag-and-drop, refactoring
2021-03-26 15:26:44 +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
1b9c327e10
Web: Files: SharingPanel: Fix icon path.
2021-03-26 14:51:25 +03:00
TatianaLopaeva
0e1225cc5a
Web: Files: helpers: Fix icon path.
2021-03-26 14:50:45 +03:00
TatianaLopaeva
c853accdf7
Web: Files: Fix icon path.
2021-03-26 14:50:12 +03:00
TatianaLopaeva
e2ebecac4d
Web: Files: Fix icon path.
2021-03-26 14:49:28 +03:00
TatianaLopaeva
e837ef77b5
Web: Files: Moved translation from common file to local folder.
2021-03-26 14:48:37 +03:00
TatianaLopaeva
ff2d8a8a28
Web: Editor: Changed name space fro i18n.
2021-03-26 14:46:19 +03:00
TatianaLopaeva
f27c38e2d9
Web: Moved icons from files to common folder.
2021-03-26 14:45:29 +03:00
TatianaLopaeva
2e44d28957
Added translate for access rights.
2021-03-26 14:43:50 +03:00
7c6bf909a6
Files: fixed query
2021-03-26 12:50:04 +03:00
a0570554dd
Fixed migrations
2021-03-26 12:26:57 +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
2125a10011
Web: Files: fixed displaying selected node
2021-03-25 15:59:53 +03:00
1955e4f141
Web: Files: fixed drag styles, added drag tooltip
2021-03-25 15:29:34 +03:00
3e225e2ebb
Web: Files: fixed move thirdparty files
2021-03-25 11:47:59 +03:00
9b1fa3fd86
Web: Files: fixed drag
2021-03-25 11:29:51 +03:00
f9f560f351
Web: Common: fixed files selection
2021-03-25 11:27:03 +03:00
9fcbb5c873
Web: Storybook issues fix:
...
+ Added copy public/images to static/images for publish
+ Fix checkbox click in theme-provider.stories.js
+ Added empty_screen_filter.png for EmptyScreenContainer
2021-03-24 13:55:50 +03:00
f732f5fba6
Web: Moved sw-template to @appserver/common and removed api cache (translation issue)
2021-03-24 11:45:58 +03:00
00699a4304
fixed Jenkinsfile
2021-03-23 22:22:38 +03:00
b8d484e62f
fixed locales
2021-03-23 21:10:47 +03:00
97fa6c82ab
Web: Editor: webpack: disabled compression
2021-03-23 19:34:18 +03:00
dde8f97cfd
Nginx: conf
2021-03-23 18:34:59 +03:00
848e5dc500
Merge pull request #204 from ONLYOFFICE/feature/workspaces
...
Feature/workspaces
2021-03-23 15:37:38 +03:00
7899ebe921
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-23 15:23:30 +03:00
5930c30150
Build: Front-end: commented wipe
2021-03-23 15:21:40 +03:00
30b976f25f
Web: Client: removed debugger, fixed onChangeOwner
2021-03-23 15:16:18 +03:00
acbe51d090
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-23 14:21:37 +03:00
f8c2f20fe8
Merge branch 'develop' into feature/workspaces
2021-03-23 14:21:30 +03:00
d04659a9c7
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-23 14:18:45 +03:00
a94a87855a
People: fix ChangeUserPassword
2021-03-23 14:18:44 +03:00
a50701e6da
Build: Refactoring
2021-03-23 14:10:33 +03:00
af9cc87717
Merge branch 'develop' into feature/workspaces
2021-03-23 11:03:37 +03:00
4c9e366f43
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-23 10:43:31 +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
40567ed10b
Web: Restore: remove remoteEntry script
2021-03-23 10:33:36 +03:00
d9e3e96ab8
Web: Fix: init Files
2021-03-23 10:33:05 +03:00
0d6fcd6f52
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 22:37:34 +03:00
