lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-19 09:42:29 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
11,242 Commits 93 Branches 33 Tags
3649844b663a0152a2ee5a0b0c6f517e0aaf8710
Commit Graph

53 Commits

Author SHA1 Message Date
Jay Harris
3649844b66 Update Newtonsoft.Json, Microsoft.Owin, IdentityModel to latest (#8087) 2018-08-09 12:22:42 -07:00
Lombiq
5a6b56cc72 Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/packages.config
 2017-12-22 21:05:17 +01:00
Lombiq
ebc3b86dfd Orchard.DynamicForms: Adding TypeScriptToolsVersion property to csproj to remove build warning 2017-12-22 20:08:47 +01:00
Benedek Farkas
ed0c60c5fd 5408: Dropping static view compilation temporarily to be able support Dynamic Compilation with Roslyn (#7892) 2017-12-21 12:49:53 -08:00
Benedek Farkas
7599a25594 Merge branch '1.10.x' into dev 
# Conflicts:
#	src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
#	src/Orchard.Profile/Orchard.Profile.csproj
#	src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
#	src/Orchard.Tests/Orchard.Framework.Tests.csproj
#	src/Orchard.Web/Core/Navigation/Migrations.cs
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/FolderController.cs
#	src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/XmlRpcHandler.cs
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/Orchard.Web.csproj
#	src/Orchard.Web/Web.config
#	src/Orchard.Web/packages.config
#	src/Orchard/Mvc/MvcModule.cs
#	src/Orchard/Orchard.Framework.csproj
 2017-11-10 00:54:02 +01:00
Benedek Farkas
2904d35d91 Enabling C# 6 for Dynamic Compilation and Razor IntelliSense 
Fixes #5408
 2017-11-09 12:04:12 -08:00
Mohammad Dameer
5ea4a7a397 Add placeholder editor form and attribute for applicable fields (#7820) 2017-08-31 12:18:45 -07:00
Benedek Farkas
cdcec3cd8b #7713: View compilation with MSBuild (#7732) 
Fixes #7713
 2017-06-29 21:10:51 +02:00
Sebastien Ros
eee341696d Merge branch '1.10.2' into dev 
# Conflicts:
#	src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
#	src/Orchard.Web/Modules/Orchard.Users/Views/Items/Content-User.Edit.cshtml
#	src/Orchard/Mvc/Routes/StandardExtensionRouteProvider.cs
 2017-04-03 11:54:43 -07:00
Benedek Farkas
185ad6b1eb Adding LangVersion 5 setting to each csproj's Debug and Release target (#7641) 
Fixes #7639
 2017-04-03 10:38:41 -07:00
Lombiq
d02028df40 Implementing that Dynamic Forms elements' Names are auto-generated from the given Labels, fixes #5287 2017-03-20 01:33:01 +01:00
Hannan Azam Khan
8c1ffe2564 [Fixes #7486] Possibility of exporting individual Form Submissions (#7495) 2017-02-02 12:24:13 -08:00
Arjan Noordende
e962410a72 AssemblyInfo build action Compile instead of Content with CodeGen update 
Fixes #5143
 2016-04-26 10:02:55 -07:00
Daniel Stolt
3f6fc4899e Retargeted NuGet references to targetFramework="net452". Fixes #6406. 2016-02-19 22:49:15 +01:00
Daniel Stolt
dec68d454c Updated code base to target .NET Framework 4.5.2. Fixes #5700. 2016-01-14 01:06:32 +01:00
Rob King
89f0213a78 Merge branch 'dev' of https://github.com/OrchardCMS/Orchard into replace-lib-with-nuget 
Conflicts:
	src/Orchard.Web/Core/Orchard.Core.csproj
	src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj
 2015-12-22 09:48:44 +00:00
Lombiq
2835a0db29 Creating helpers for settings based metadata scenarios to be used in migrations, fixes #4693 2015-12-19 20:01:32 +01:00
Rob King
74d8cf8e9a Line endings resolution 2015-12-15 11:55:23 +00:00
Rob King
181ddd58b2 Merge branch 'dev' of https://github.com/gcsuk/Orchard into use-nuget-instead-of-lib-folder 
Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
 2015-12-08 15:24:38 +00:00
Rob King
3f72249654 Moved System.Web.Mvc to NuGet. Version change: None 2015-12-07 20:46:05 +00:00
Rob King
fe215587b1 Moved Newtonsoft.Json to NuGet. Version change: None 2015-12-04 17:32:50 +00:00
Sipke Schoorstra
8693b68ac7 Fixed a binding issue with FormsElementDriver. 
This fixes the issue where form elements whose drivers inherit from FormsElementDriver would not persist their changes.

Fixes #6100, #6035
 2015-12-03 22:47:29 +01:00
Sipke Schoorstra
bcf4813c3e Merge branch '1.9.x' into dev 
Conflicts:
	README.md
	src/Orchard.Web/Modules/Orchard.Dashboards/Web.config
	src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Compare.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/EmailAddress.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Mandatory.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/OptionRequired.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/RegularExpression.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/Required.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/ValidationRules/StringLength.cs
 2015-11-03 22:44:13 +01:00
Jamie Phillips
a01b7dde23 URL Field for Dynamic Forms 
Created this because I was binding to a content type that had a
URL
field.  Need to do this validation when submitting the dynamic form.
 2015-09-30 21:35:44 -04:00
Sebastien Ros
5fd02aacd9 Merge branch '1.9.x' into dev 
Conflicts:
	README.md
 2015-07-30 15:51:28 -07:00
Thierry Fleury
bc2e0607ef DynamicForms : Mark css & js assets as content 
MsBuild raise errors when ccs or js files have "None" BuildAction
 2015-07-27 13:30:29 +02:00
Daniel Stolt
f023f66d63 Merged branch '1.9.x' into dev. 2015-07-26 01:28:38 +01:00
Daniel Stolt
6da6c5c214 #5450: Implemented generalized Gulp automation. 
Fixes #5446.
 2015-07-26 01:14:14 +01:00
Sébastien Ros
d92fc869bf Merge pull request #5332 from emeraldarcher/issue/5331 
Update Google Recaptcha API

Fixes #5331
 2015-07-23 12:11:06 -07:00
Sipke Schoorstra
2507ef17d3 Refactored Dynamic Forms Submissions import/export step. 2015-07-17 13:21:34 +01:00
Sebastien Ros
1d6cb27d01 Merge branch '1.9.x' into dev 
Conflicts:
	README.md
	src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/FormController.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EnumerationElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs
	src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HeadingElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HtmlElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/MarkdownElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/TextElementDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Filters/TokensFilter.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Html.cshtml
	src/Orchard/Orchard.Framework.csproj
 2015-06-30 11:35:41 -07:00
Sebastien Ros
6b0985a44e Merge branch 'master' into 1.9.x 2015-06-30 11:31:35 -07:00
Sipke Schoorstra
5b40567b6d #5407: Layout elements now evaluate tokens. 2015-06-29 14:01:58 +03:00
Sipke Schoorstra
5c688267fa #5420: Added stub CSS files for various activities to prevent 404 errors. 2015-06-27 18:47:06 +03:00
Sebastien Ros
6d58498b82 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config
	src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard/Localization/Text.cs
 2015-06-18 10:35:06 -07:00
Sebastien Ros
cd49d2ccf2 Updating ruleset location for all projects 2015-06-16 16:22:04 -07:00
Sipke Schoorstra
20fe55a458 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Forms.js
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/Forms.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.css.bundle
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.min.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Editor.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Editor.min.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Popup.css
	src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor/Popup.min.css
	src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Toolbox.cshtml
	src/Orchard/Tasks/BackgroundService.cs
 2015-06-10 23:58:18 +03:00
Daniel Stolt
e8de82b611 Added Gulp build to Orchard.DynamicForms. 2015-06-10 20:43:59 +03:00
Bertrand Le Roy
7a1983b47f Add a fieldset element 2015-06-09 13:08:57 -07:00
EmeraldArcher
0db2a8e6d9 committing the .csproj files since new dependencies/files were added to the projects 2015-05-28 14:59:44 -06:00
Sipke Schoorstra
fa3f1cbc70 Added NumericFieldBinding. 2015-05-06 21:38:41 +02:00
Kees Damen
2cfcdfaa8b Fixed project references to Orchard.Core and Orchard.Framework 2015-04-16 16:23:12 +02:00
Sipke Schoorstra
ce23bb5a3e #21237: Moved IClientIpAddressProvider into Orchard.Framework. 
This changeset also renames the service to IClientAddressAccessor and refactors the settings into being configurable from HostComponents instead of through a site settings part.

Work Item: 21237
 2015-03-06 19:59:52 +01:00
Sipke Schoorstra
31e6219ece #21224: Added validation for Enumeration, Taxonomy and Query form field elements. 
Work Item: 21224
 2015-02-27 23:05:36 +01:00
Daniel Stolt
4b11d08ccd Merged 'feature/layouteditor' into 1.x. 2015-02-19 22:14:55 +01:00
Sipke Schoorstra
d84c5b2566 Adding DynamicForm activities. 
These activities are useful to perform customized form validation.
 2014-11-23 01:00:32 -08:00
Sipke Schoorstra
06ebab41fe Adding TextArea validation. 2014-11-21 17:47:32 -08:00
Sipke Schoorstra
b426fb910d Adding a Form Submission token provider to access posted values. 2014-10-30 15:00:38 -07:00
Sipke Schoorstra
52b518e543 Adding ReCaptcha form element. 2014-10-30 00:42:21 -07:00
Sipke Schoorstra
60f5a112a8 Adding EmailField form element. 2014-10-16 21:54:49 -07:00