IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,460 Commits 38 Branches 22 Tags 359 MiB
c0582c1130
Commit Graph

2639 Commits

Author SHA1 Message Date
Alexey Bannov
c0582c1130 merge from develop 2021-04-01 16:28:36 +03:00
pavelbannov
18b4fba15a Merge branch 'develop' into feature/dotnet5 2021-03-31 20:38:05 +03:00
Alexey Safronov
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
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
gopienkonikita
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
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
gopienkonikita
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
gopienkonikita
06f34408ff Merge branch 'develop' into feature/drag-and-drop 2021-03-30 11:10:15 +03:00
gopienkonikita
9427d98318 Web: Files: refactoring 2021-03-30 11:08:38 +03:00
pavelbannov
3a756986a0 Files: added enableExternalExt when creating file 2021-03-29 17:53:12 +03:00
gopienkonikita
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
gopienkonikita
a8d475cb91 Merge branch 'develop' into feature/drag-and-drop 2021-03-29 15:26:22 +03:00
pavelbannov
b574424224 Files: added enableExternalExt when creating file 2021-03-29 15:06:51 +03:00
gopienkonikita
f381eb2780 Web: Files: fixed move operations for third party folders 2021-03-29 14:56:39 +03:00
gopienkonikita
d10f47d984 Web: Files: fixed scroll 2021-03-29 12:06:01 +03:00
gopienkonikita
fa372f118b Web: Files: fixed scroll 2021-03-29 11:41:42 +03:00
gopienkonikita
06e8a79b06 Web: Files: fixed drag to tree 2021-03-26 19:11:41 +03:00
gopienkonikita
e72558182b Web: Files: removed debugger 2021-03-26 17:12:40 +03:00
gopienkonikita
6b16402d82 Web: Files: fixed tree drag-and-drop, refactoring 2021-03-26 15:26:44 +03:00
pavelbannov
7c6bf909a6 Files: fixed query 2021-03-26 12:50:04 +03:00
pavelbannov
65e1c72c01 Sln: fixed packages 2021-03-26 12:26:12 +03:00
pavelbannov
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
gopienkonikita
2125a10011 Web: Files: fixed displaying selected node 2021-03-25 15:59:53 +03:00
gopienkonikita
1955e4f141 Web: Files: fixed drag styles, added drag tooltip 2021-03-25 15:29:34 +03:00
gopienkonikita
3e225e2ebb Web: Files: fixed move thirdparty files 2021-03-25 11:47:59 +03:00
gopienkonikita
9b1fa3fd86 Web: Files: fixed drag 2021-03-25 11:29:51 +03:00
AlexeySafronov
f732f5fba6 Web: Moved sw-template to @appserver/common and removed api cache (translation issue) 2021-03-24 11:45:58 +03:00
Alexey Safronov
f8c2f20fe8
Merge branch 'develop' into feature/workspaces 2021-03-23 14:21:30 +03:00
AlexeySafronov
d9e3e96ab8 Web: Fix: init Files 2021-03-23 10:33:05 +03:00
pavelbannov
0a9a1b1809 Files: fixed root method 2021-03-22 22:14:43 +03:00
gopienkonikita
fd704ab12a Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 20:58:06 +03:00
Ilya Oleshko
de8dc35fca Web: Files: Apply route proxy 2021-03-22 20:51:52 +03:00
AlexeySafronov
a1eb540d9d Web: Files: Fixed routing from settings and folder 2021-03-22 20:34:02 +03:00
AlexeySafronov
92530da98f Web: Files: Fix proxy 2021-03-22 20:26:35 +03:00
AlexeySafronov
0847693c55 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 20:02:03 +03:00
AlexeySafronov
577464933b Web: Files: Fixed proxy 2021-03-22 20:00:04 +03:00
gopienkonikita
b0c430b7ba Merge branch 'develop' into feature/workspaces 2021-03-22 19:46:49 +03:00
gopienkonikita
12af2890dc Web: Files: fixed markAsRead 2021-03-22 19:21:36 +03:00
Alexey Bannov
11e3738090 files: added 'scope' attribute for several classes 2021-03-22 19:10:14 +03:00
pavelbannov
44c4967f0f Files: indexes renamed 2021-03-22 18:43:51 +03:00
TatianaLopaeva
26ef7bdd65 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 18:31:41 +03:00