Merge pull request #85 from DNNCommunity/development

Merging for 6.5.5 release
DNNCommunity · Feb 14, 2021 · bf91ee4 · bf91ee4
2 parents 6652471 + 73ae090
commit bf91ee4
Show file tree

Hide file tree

Showing 80 changed files with 6,680 additions and 5,920 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,30 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+
+---
+
+## Describe the bug
+A clear and concise description of what the bug is.
+
+## To Reproduce
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+## Expected behavior
+A clear and concise description of what you expected to happen.
+
+## Screenshots
+If applicable, add screenshots to help explain your problem.
+
+## Error log
+**Note: Debug DLL's**
+Please replace the current extension DLL's with the debug DLL's (if these are available with the release) and reproduce the error with the debug DLL's before pasting the error log.
+
+Paste the error log that is related to this issue.
+
+## Additional context
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,18 @@
+---
+name: Feature Request
+about: Suggest an idea for this project
+
+---
+
+## Is your feature request related to a problem?
+**Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+## Describe the solution you'd like
+A clear and concise description of what you want to happen.
+
+## Describe alternatives you've considered
+A clear and concise description of any alternative solutions or features you've considered.
+
+## Additional context
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/help-and-other-questions.md b/.github/ISSUE_TEMPLATE/help-and-other-questions.md
@@ -0,0 +1 @@
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,23 @@
+<!-- 
+Explain the benefit of this pull request
+You can erase any parts of this template not applicable to your Pull Request. 
+-->
+
+### Description of PR...
+
+## Changes made
+- Item 1
+- Item 2
+
+
+## PR Template Checklist
+
+- [ ] Fixes Bug
+- [ ] Feature solution
+- [ ] Other
+
+
+## Please mark which issue is solved
+<!-- Type numbers directly after the #, it will show the issues with that number -->
+
+Close #
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,10 @@
 *.sln.docstates
 *.local.sln
 *.sln.GhostDoc.xml
+DotNetNuke.Modules.UserDefinedTable.xml
+web.config
+web.Debug.config
+web.Release.config
 
 ## Ignore VS2015/Roslyn artifacts
 *.sln.ide/

diff --git a/.ionide/symbolCache.db b/.ionide/symbolCache.db
diff --git a/App_LocalResources/FieldEditor.ascx.resx b/App_LocalResources/FieldEditor.ascx.resx
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="ControlHelpText.Help" xml:space="preserve">
     <value>This is the Help Text displayed to the user to explain this field.</value>
@@ -258,4 +258,7 @@
   <data name="ListSettings.Text" xml:space="preserve">
     <value>List Settings</value>
   </data>
+  <data name="TitleCannotHavePipe.Text" xml:space="preserve">
+    <value>The pipe character is not allowed in the field title.</value>
+  </data>
 </root>
diff --git a/App_LocalResources/ImportCSV.ascx.resx b/App_LocalResources/ImportCSV.ascx.resx
@@ -121,7 +121,7 @@
     <value>Folder</value>
   </data>
   <data name="plFolder.Help" xml:space="preserve">
-    <value>Select the  folder</value>
+    <value>Select the folder</value>
   </data>
   <data name="plFile.Text" xml:space="preserve">
     <value>File</value>
@@ -142,7 +142,7 @@
     <value>The module specified does not have any content</value>
   </data>
   <data name="Error.Text" xml:space="preserve">
-    <value>An error occurred during the export</value>
+    <value>An error occurred during the import</value>
   </data>
   <data name="Validation.Text" xml:space="preserve">
     <value>You must specify a folder and file for Import</value>
@@ -165,4 +165,4 @@
   <data name="semicolon.Text" xml:space="preserve">
     <value>Semicolon ";"</value>
   </data>
-</root>
+</root>
diff --git a/App_LocalResources/configuration.ascx.resx b/App_LocalResources/configuration.ascx.resx
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Ascending.Text" xml:space="preserve">
     <value>Ascending</value>
@@ -623,7 +623,19 @@
   <data name="DisplaySettings.Text" xml:space="preserve">
     <value>Current View Options </value>
   </data>
-  <data name="noFormSettings.Text" xml:space="preserve">
-    <value>No settings for this configuration</value>
+  <data name="EnableFormTemplate.Text" xml:space="preserve">
+    <value>Enable Form Template</value>
+  </data>
+  <data name="FormTemplate.Text" xml:space="preserve">
+    <value>Form Template</value>
+  </data>
+  <data name="GenerateFormTemplate.Text" xml:space="preserve">
+    <value>Generate Template (optimized for Bootstrap) </value>
+  </data>
+  <data name="EnableFormTemplate.Help" xml:space="preserve">
+    <value>Override the rendering of the form.</value>
+  </data>
+  <data name="FormTemplate.Help" xml:space="preserve">
+    <value>The template is set as html. To insert labels, use the [label-for:Fieldname] token, for the input fields [editor-for:Fieldname], for the captcha use [editor-for:Security Code]</value>
   </data>
 </root>