Commit Graph

4494 Commits

Author SHA1 Message Date
Ilya Oleshko
a1a4eadd07 Web: Files: Row: Added locales for new and version badges 2021-04-06 18:48:42 +03:00
740099ff52 Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0 2021-04-06 17:25:25 +03:00
90fea0fb50 Web: Files: fixed onDragOver event 2021-04-06 17:25:15 +03:00
Ilya Oleshko
fb47962f12 Web: Files: Row: Disabled version action inside trash folder 2021-04-06 16:46:48 +03:00
19526b1d96 Web: Files: fixed canShareOwnerChange 2021-04-06 16:31:39 +03:00
54763ead47 Web: Files: fixed drag events 2021-04-06 16:06:16 +03:00
7bbf46fd90 Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0 2021-04-06 15:47:14 +03:00
424efc1e72 Web: Files: fixed treeFolders drag 2021-04-06 15:47:04 +03:00
Artem Tarasov
fad3757a82 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-06 15:30:17 +03:00
Artem Tarasov
b673e76d67 Web: Files: fixed update of the version in row after making changes in VersionHistoryPanel 2021-04-06 15:29:42 +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
Vladislav Makhov
5a6d3509fd web: files: fix working with files without extension 2021-04-06 11:35:11 +03:00
8a9ad2d473 Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 18:14:25 +03:00
12b5c6b769 Web: Projects: Fixed switch to desktop version 2021-04-05 18:14:20 +03:00
7861c432aa Web: CRM: Fixed switch to desktop version 2021-04-05 18:14:04 +03:00
Ilya Oleshko
b228e20cdb Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 18:10:35 +03:00
Ilya Oleshko
f6d8238602 Web: Files: Fixed empty elements inside context menu, added missing actions for deleted items 2021-04-05 18:10:26 +03:00
Artem Tarasov
817f810590 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 18:07:30 +03:00
Artem Tarasov
056c288fae Web: People: fixed reset filter after switching from profile 2021-04-05 18:06:48 +03:00
88ab4c53d9 Projects: Changed HelpURL 2021-04-05 17:47:00 +03:00
92ff8b3b2d CRM: Changed HelpURL 2021-04-05 17:46:48 +03:00
Ilya Oleshko
7f0e24dc2b Web: Files: Header: Fixed plus icon path 2021-04-05 17:10:04 +03:00
Viktor Fomin
27eb32d296 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 16:54:48 +03:00
Viktor Fomin
4e7e795046 Web: Files: fixed scroll in upload panel 2021-04-05 16:54:28 +03:00
Ilya Oleshko
f94e093896 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 16:45:49 +03:00
Ilya Oleshko
018f3fad33 Web: Files: Added data-api for new ContextMenu 2021-04-05 16:44:55 +03:00
cea14a9d4f Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 16:42:09 +03:00
ce7647ac5f Web: Files: fixed Trans, hidden duplicate 2021-04-05 16:42:01 +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
Viktor Fomin
acd3e3db12 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 15:22:00 +03:00
Viktor Fomin
6f4a6a972a Web: Files: fixed import 2021-04-05 15:21:52 +03:00
Vladislav Makhov
dbd6c08772 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 15:08:25 +03:00
Vladislav Makhov
b400a93407 web: files: remove api query, if cancelled or same title 2021-04-05 15:07:58 +03:00
Viktor Fomin
ded5ce44f2 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 14:54:10 +03:00
Viktor Fomin
10f9d2ad2c Web: Files: fixed getting userId 2021-04-05 14:53:37 +03:00
TatianaLopaeva
f095e9c71b Web: Files: FloatingButton remains visible on error until the UploadPanel is opened. 2021-04-05 14:43:03 +03:00
TatianaLopaeva
ed97700dcb Web:Files: UploadPanel: Fixed styles of row content. 2021-04-05 10:26:46 +03:00
a11804b60d temp fix. BinaryFormatter deprecated in .net 5 2021-04-02 21:48:40 +03:00
b89e232e59 Web: Files: fixed drag 2021-04-02 19:29:06 +03:00
Vladislav Makhov
b45e243fe6 web: files: fix stores init 2021-04-02 18:12:50 +03:00
Vladislav Makhov
3180831e19 web: files: fix stores init 2021-04-02 17:03:52 +03:00
Vladislav Makhov
0f6b08b2f3 web: files: transfer InitFilesStore to FilesStore 2021-04-02 16:33:18 +03:00
Vladislav Makhov
601c9441cb web: files: remove unnecessary code 2021-04-02 15:45:49 +03:00
Vladislav Makhov
179fec232e Merge branch 'develop' into bugfix/files-store
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-04-02 15:34:34 +03:00
Vladislav Makhov
3e3c442f7c web: files: destructured variables 2021-04-02 15:02:03 +03:00
Vladislav Makhov
ff04684f53 web: remove unused code 2021-04-02 13:49:42 +03:00
Vladislav Makhov
d63132d9e7 web: files: remove console log 2021-04-02 13:06:12 +03:00
Vladislav Makhov
c99fc660c9 web: files: remove unused code and imports 2021-04-02 13:03:28 +03:00
Vladislav Makhov
1bc8ad8600 web: files: fix FilesStore accesses 2021-04-02 12:41:13 +03:00
Vladislav Makhov
f532c06c55 web: files: fix UploadDataStore accesses 2021-04-02 12:40:59 +03:00
Vladislav Makhov
2bafdbc0d2 web: files: fix TreeFoldersStore accesses 2021-04-02 11:20:19 +03:00
Vladislav Makhov
df3f8ca9e5 web: files: fix MediaViewerDataStore accesses 2021-04-02 11:16:01 +03:00
Vladislav Makhov
0eeee5842a web: files: fix FormatsStore accesses 2021-04-02 11:13:33 +03:00
Vladislav Makhov
f70bcc52ca web: files: fix FilesActionStore accesses 2021-04-01 17:34:22 +03:00
TatianaLopaeva
f79f75f6db Merge branch 'develop' into feature/EditorIntegration 2021-04-01 16:42:33 +03:00
a71bbc9886 Files: fix finding template when saving file, hat doesn't have template 2021-04-01 16:32:10 +03:00
TatianaLopaeva
0ea46425c6 Web:Files: Fix SharedPanel when uploadPanel is visible. 2021-04-01 15:32:21 +03:00
TatianaLopaeva
26fe94ae5f Web: Files: Added translation for EmbeddingPanel. 2021-04-01 13:50:57 +03:00
Vladislav Makhov
61fcaf8315 web: files: fix SettingsStore accesses 2021-04-01 13:28:59 +03:00
TatianaLopaeva
968e0009ee Web: Files: SharingPanel/EmbeddingPanel: Fixed icon path. 2021-04-01 13:03:28 +03:00
Vladislav Makhov
3915d28737 web: files: fix InitFilesStore accesses 2021-04-01 12:27:19 +03:00
Vladislav Makhov
07c457882a web: files: fix FilesStore accesses 2021-04-01 11:58:22 +03:00
TatianaLopaeva
833bd357a0 Web: Files: Deleted useless condition for Editor. 2021-04-01 11:55:20 +03:00
TatianaLopaeva
fc1d8001b6 Web: Files: Deleted useless props. 2021-04-01 11:52:24 +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
Vladislav Makhov
b0b8849ae5 web: files: fix isDesktop refer 2021-03-31 17:59:03 +03:00
TatianaLopaeva
33b165fd40 Web: Files/Editor: Added SharingDialog. 2021-03-31 16:49:14 +03:00
Vladislav Makhov
2c253bd471 web: files: rename isItemsSelected to selectionCount 2021-03-31 13:56:56 +03:00
Vladislav Makhov
56f49526ad web: files: fix link 2021-03-31 13:54:29 +03:00
c0e780a287 Web: Files: fixed showDragItems 2021-03-31 11:03:56 +03:00
Vladislav Makhov
1728da802d web: fix isAccessedSelected 2021-03-31 10:49:46 +03:00
TatianaLopaeva
b52997a7f8 Merge branch 'develop' into feature/EditorIntegration 2021-03-30 18:39:09 +03:00
Vladislav Makhov
75386c10ea web: files: add missing whitespaces in description 2021-03-30 16:05:04 +03:00
Vladislav Makhov
627e84aeaa web: files: fix isAccessedSelected 2021-03-30 15:53:47 +03:00
TatianaLopaeva
dea731dfa7 Web: Files/Editor: Deleted useless code. 2021-03-30 15:44:45 +03:00
TatianaLopaeva
3960ca1490 Web: Files: SharingPanel: Added loader when list of users does not load yet. 2021-03-30 15:24:44 +03:00
6c46dd759f Web: Files: fixed context options props 2021-03-30 12:14:25 +03:00
Vladislav Makhov
b4ea70ddaa web: files: regDesktop fix 2021-03-30 11:34:48 +03:00
06f34408ff Merge branch 'develop' into feature/drag-and-drop 2021-03-30 11:10:15 +03:00
9427d98318 Web: Files: refactoring 2021-03-30 11:08:38 +03:00
TatianaLopaeva
f6e242f341 Web: Files: Added name space for translation. 2021-03-30 10:34:09 +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
3a756986a0 Files: added enableExternalExt when creating file 2021-03-29 17:53:12 +03:00
91aa5996b5 Web: Files: refactoring 2021-03-29 17:45:26 +03:00
Vladislav Makhov
701e5fc2d1 web: files: fix isOnlyFoldersSelected 2021-03-29 16:25:16 +03:00
Vladislav Makhov
ddba3d91bf web: files: fix isEncryptionSupport value 2021-03-29 16:13:21 +03:00
Vladislav Makhov
70b6e8fe51 web: files: fix share button for private room 2021-03-29 16:05:00 +03:00
Vladislav Makhov
760c3268df web: files: add missing prop 2021-03-29 16:03:34 +03:00
a8d475cb91 Merge branch 'develop' into feature/drag-and-drop 2021-03-29 15:26:22 +03:00
b574424224 Files: added enableExternalExt when creating file 2021-03-29 15:06:51 +03:00
f381eb2780 Web: Files: fixed move operations for third party folders 2021-03-29 14:56:39 +03:00
d10f47d984 Web: Files: fixed scroll 2021-03-29 12:06:01 +03:00
fa372f118b Web: Files: fixed scroll 2021-03-29 11:41:42 +03:00
TatianaLopaeva
704f241674 Web: Files: SharingPanel: Fixed icon pathname. 2021-03-28 23:00:21 +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
9309818e77 Web: Files: Fixed internal link for document from the Editor. 2021-03-28 19:04:49 +03:00
TatianaLopaeva
89dbfd1f54 Web: Editor/Files: Fixed share email from the Editor. 2021-03-28 18:47:04 +03:00
06e8a79b06 Web: Files: fixed drag to tree 2021-03-26 19:11:41 +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
e72558182b Web: Files: removed debugger 2021-03-26 17:12:40 +03:00
32338fdcbc Merge branch 'develop' into feature/drag-and-drop 2021-03-26 16:11:16 +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
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
f27c38e2d9 Web: Moved icons from files to common folder. 2021-03-26 14:45:29 +03:00
7c6bf909a6 Files: fixed query 2021-03-26 12:50:04 +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
f732f5fba6 Web: Moved sw-template to @appserver/common and removed api cache (translation issue) 2021-03-24 11:45:58 +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
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
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
051a69e5b5 Web: People: GroupAction: Fix translation loading 2021-03-22 22:37:21 +03:00
0a9a1b1809 Files: fixed root method 2021-03-22 22:14:43 +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
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
Ilya Oleshko
de8dc35fca Web: Files: Apply route proxy 2021-03-22 20:51:52 +03:00
a1eb540d9d Web: Files: Fixed routing from settings and folder 2021-03-22 20:34:02 +03:00
92530da98f Web: Files: Fix proxy 2021-03-22 20:26:35 +03:00
0847693c55 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 20:02:03 +03:00
577464933b Web: Files: Fixed proxy 2021-03-22 20:00:04 +03:00
b0c430b7ba Merge branch 'develop' into feature/workspaces 2021-03-22 19:46:49 +03:00