Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implemented a new optional file manager called Resource Manager #4152

Merged
merged 88 commits into from
Oct 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
8679bbe
add resource manager module to replace DAM.
zyhfish Apr 29, 2020
437e1ea
restore the solution version.
zyhfish Apr 29, 2020
ad4b7db
update the build script.
zyhfish Apr 29, 2020
2cb0b55
Merge pull request #3709 from zyhfish/feature/resource-manager
mitchelsellers Apr 29, 2020
681357e
Ensure yarn runs when module is built
donker May 4, 2020
8b1a6f4
Set scripts for debugging
donker May 4, 2020
d226a07
Include new module's react in version mgt
donker May 4, 2020
386c8ac
Merge pull request #3726 from donker/rmfix2
mitchelsellers May 4, 2020
4f25953
Fix resource manager to use the revised upload file handler in the core
donker May 4, 2020
e42c4de
Merge pull request #3727 from donker/rmfix3
mitchelsellers May 4, 2020
7a90240
Resource Manager Standardization & Improvement (#3734)
mitchelsellers May 6, 2020
7e3317e
Makes the resource manager build as the other projects (#3799)
valadas Jun 17, 2020
bf61f9f
Downgrade react-dropzone
donker Jun 24, 2020
22cd992
Fix dropzone
donker Jun 24, 2020
482116f
Improve package description, icon and owner
donker Jun 24, 2020
9e22f30
Update DNN Platform/Modules/ResourceManager/ResourceManager.dnn
donker Jun 24, 2020
9fcb5da
Merge pull request #3853 from donker/fix-rm-3
mitchelsellers Jun 24, 2020
2283bbe
Update file upload validation - ResourceManager (#3855)
daguiler Jun 25, 2020
654d7b9
Merge branch 'develop' into feature/resource-manager
valadas Jul 12, 2020
702942e
Fixes 2 wrong merged conflicts resolutions
valadas Jul 13, 2020
20193d7
Merge pull request #3907 from valadas/fix-rm-build
valadas Jul 13, 2020
577a711
Fix issue with Item Name dropdown list height
david-poindexter Aug 5, 2020
a09212c
Add proper wildcard support
david-poindexter Aug 5, 2020
c717cac
Merge pull request #3962 from david-poindexter/wildcard-search
mitchelsellers Aug 6, 2020
d09e73f
Optimize WildcardToRegex for file search (#3963)
david-poindexter Aug 6, 2020
c151345
Merge branch 'develop' into mergedev
donker Aug 23, 2020
dc1e4ee
Merge pull request #4006 from donker/mergedev
valadas Aug 23, 2020
3823f9e
Fixes services framework usage in permission grid for the file manage…
valadas Aug 25, 2020
24f02ea
Implement saving permissions
donker Aug 26, 2020
9cd1597
Fixes frontend build warnings in resource-manager
valadas Sep 1, 2020
4049031
Removed unused vars in Permissions.jsx
valadas Sep 1, 2020
0e0112c
Removed unused vars in DropZoneContainer.jsx
valadas Sep 1, 2020
18e81bc
Fixes 2 wrong svg imports in resource-manager
valadas Sep 1, 2020
e61e190
Actually commit the right change...
valadas Sep 1, 2020
5b08158
Merge pull request #4026 from valadas/rm-svg-imports
mitchelsellers Sep 1, 2020
18cb66b
Merge pull request #4025 from valadas/rm-warnings
mitchelsellers Sep 1, 2020
d91078c
Removes svg from resource-manager build (#4024)
valadas Sep 1, 2020
cd38479
Merge branch 'develop' into fm-rebase-develop
valadas Sep 5, 2020
8ce0f19
Merge pull request #4056 from valadas/fm-rebase-develop
valadas Sep 5, 2020
85184b2
Added button for folder types support
valadas Sep 6, 2020
5e15220
Created manage folder types container
valadas Sep 6, 2020
cf8128c
Created folder types list ui
valadas Sep 7, 2020
b2c0575
Implemented basic of remove button
valadas Sep 7, 2020
cddf2ae
Implemented removal of folder types
valadas Sep 7, 2020
161230a
Implemented edit url for mappings
valadas Sep 7, 2020
f6fe27b
Implementes add folder type button
valadas Sep 7, 2020
80daafb
Update DNN Platform/Modules/ResourceManager/App_LocalResources/Resour…
valadas Sep 7, 2020
8a8ccd4
Update DNN Platform/Modules/ResourceManager/App_LocalResources/Resour…
valadas Sep 7, 2020
627f996
Update DNN Platform/Modules/ResourceManager/App_LocalResources/Resour…
valadas Sep 8, 2020
0c57a20
Uses injected IModuleControlPipeline
valadas Sep 8, 2020
0c499b1
Renamed private variables in EditFolderMapping.ascx.cs
valadas Sep 8, 2020
4d8ad7b
Moved usings into namespace in EditFolderMapping.ascx.cs
valadas Sep 8, 2020
b297859
Moved using declarations into namespace in ItemsController.cs
valadas Sep 8, 2020
fb82726
Merge pull request #4061 from valadas/fm-folder-providers
valadas Sep 8, 2020
a43437f
Create dropdown for refresh/sync and restyle
david-poindexter Sep 8, 2020
881da6e
Merge branch 'feature/resource-manager' into rm-sync
david-poindexter Sep 8, 2020
167afa0
Merge pull request #4063 from david-poindexter/rm-sync
valadas Sep 8, 2020
7b3ff67
Fixes stylecop warnings in resource manager project.
valadas Sep 8, 2020
86ca441
Wire up sync this folder and recursive
david-poindexter Sep 9, 2020
e46b2c7
Merge pull request #4072 from david-poindexter/rm-sync
mitchelsellers Sep 9, 2020
bf16905
Replaces deprecated method call.
valadas Sep 10, 2020
f80ca97
Merge pull request #4065 from valadas/rm-stylecop
valadas Sep 10, 2020
d582d1a
Removed deprecated tabId invocation to use TabController
SkyeHoefling Sep 10, 2020
91d54c5
Fixed version conflicts with Netwonsoft.Json
SkyeHoefling Sep 10, 2020
858b313
Enabled TreatWarningsAsBuildErrors for the ResourceManager project
SkyeHoefling Sep 10, 2020
55a4d80
Added required web.config for the compiler to understand binding redi…
SkyeHoefling Sep 10, 2020
a574744
Added warning level 4 as the default warning level (msft recommendation)
SkyeHoefling Sep 10, 2020
d157750
Added stylecop nuget packages
SkyeHoefling Sep 10, 2020
7c87b94
Fixed newtonsoft.json reference as there was some malform xml after r…
SkyeHoefling Sep 11, 2020
d119a31
Fixed build warnings
SkyeHoefling Sep 11, 2020
e922a29
Removed duplicate records from web.config
SkyeHoefling Sep 11, 2020
aebee0d
Removed stale comments
SkyeHoefling Sep 11, 2020
ba09173
Removed duplicate stylecop.json record
SkyeHoefling Sep 11, 2020
c3f4962
Removed double stylecop record
SkyeHoefling Sep 11, 2020
7a54682
Created moduleContextInstance to prevent multiple calls
SkyeHoefling Sep 11, 2020
b85fc9f
Merge pull request #4080 from ahoefling/resource-manager-build-warnings
valadas Sep 11, 2020
d9d2a1c
Merge branch 'develop' into rm-rebase20200920
valadas Sep 20, 2020
bc7a3eb
Merge pull request #4106 from valadas/rm-rebase20200920
valadas Sep 20, 2020
ca77a74
Merge branch 'develop' into feature/resource-manager
valadas Sep 27, 2020
6e34751
Fixed a wrong merge resolution in solution file
valadas Sep 27, 2020
2b65063
Merge pull request #4134 from valadas/feature/resource-manager
valadas Oct 4, 2020
707cae6
Implemented file/folder move in resource manager.
valadas Oct 6, 2020
ff31d79
Merge pull request #4149 from valadas/rm-add-move2
mitchelsellers Oct 6, 2020
f35dbce
Merge pull request #4150 from dnnsoftware/develop
valadas Oct 6, 2020
ce1b0c7
Optimised images with calibre/image-actions
github-actions[bot] Oct 6, 2020
a297a85
Move project's .gitignore into main .gitignore
bdukes Oct 6, 2020
d2300e2
Remove unused package-lock.json
bdukes Oct 6, 2020
0dc7665
Fix license in package.json
bdukes Oct 6, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ DNN [Pp]latform/Syndication/[Bb]in/*
DNN [Pp]latform/[Cc]onnectors/*/[Bb]in/*
DNN [Pp]latform/[Pp]roviders/*/[Bb]in/*

DNN [Pp]latform/Modules/ResourceManager/**/scripts/*-bundle.*

# ignore all other language resx files
*.de-DE.resx
*.es-ES.resx
Expand All @@ -130,3 +132,5 @@ DNN [Pp]latform/[Pp]roviders/*/[Bb]in/*

# Add fips back
!DNN Platform/[Ww]ebsite/App_Data/FipsCompilanceAssemblies/Lucene.Net.dll

yarn-error.log
4 changes: 2 additions & 2 deletions Build/BuildScripts/AEModule.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="4.0" DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\Yarn.MSBuild.1.13.0\build\Yarn.MSBuild.props" Condition="Exists('..\..\packages\Yarn.MSBuild.1.13.0\build\Yarn.MSBuild.props')" />
<Import Project="..\..\packages\Yarn.MSBuild.1.13.0\build\Yarn.MSBuild.targets" Condition="Exists('..\..\packages\Yarn.MSBuild.1.13.0\build\Yarn.MSBuild.targets')" />
<Import Project="..\..\packages\Yarn.MSBuild.1.16.0\build\Yarn.MSBuild.props" Condition="Exists('..\..\packages\Yarn.MSBuild.1.16.0\build\Yarn.MSBuild.props')" />
<Import Project="..\..\packages\Yarn.MSBuild.1.16.0\build\Yarn.MSBuild.targets" Condition="Exists('..\..\packages\Yarn.MSBuild.1.16.0\build\Yarn.MSBuild.targets')" />

<PropertyGroup>
<ResourceZipWorkingDirectory>$(MSBuildProjectDirectory)\Package\Resources\admin\personaBar</ResourceZipWorkingDirectory>
Expand Down
1 change: 1 addition & 0 deletions Build/Cake/version.cake
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ Task("SetPackageVersions")
var packages = GetFiles("./Dnn.AdminExperience/ClientSide/*.Web/package.json");
packages.Add(GetFiles("./Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json"));
packages.Add(GetFiles("./Dnn.AdminExperience/ClientSide/*.Web/**/_exportables/package.json"));
packages.Add(GetFiles("./DNN Platform/Modules/ResourceManager/ResourceManager.Web/package.json"));

// Set all package.json in Admin Experience to the current version and to consume the current (local) version of dnn-react-common.
foreach(var file in packages){
Expand Down
Loading