lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
9,559 Commits 83 Branches 32 Tags
c4ff7a21f33fca8f98da56c224d7ee969eb7e45b
Commit Graph

9559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sébastien Ros
0f6fa5844b Merge pull request #5442 from yw80/1.9.x 
Fixed the items count in media library when modify the item size in css
 2015-07-09 12:18:09 -07:00
Sipke Schoorstra
298b2fb930 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Dashboards/Web.config
 2015-07-09 17:23:13 +01:00
Daniel Stolt
95eecd30b9 Added logging to replace removed recipe journals. 2015-07-09 16:54:13 +01:00
Sipke Schoorstra
537adf9cba #5375: Exporting various items in a predictable order. 
Fixes 5375
 2015-07-09 14:11:34 +01:00
Sipke Schoorstra
85b06375a0 Added assembly binding redirects. 2015-07-09 14:09:40 +01:00
Daniel Stolt
a431bb0cb0 Removed recipe journals. 2015-07-09 14:09:29 +01:00
Sipke Schoorstra
784e1c0961 Added web.config with redirect bindings. 2015-07-09 13:44:02 +01:00
Daniel Stolt
2c10b0df98 Added Log4net configuration for recipes logging. Added logging to replace the removed reports logging. 2015-07-09 12:31:37 +01:00
Sipke Schoorstra
2654a2c47c Merge branch 'dev' into feature/importexport-full-roundtrip 2015-07-09 12:30:09 +01:00
Sipke Schoorstra
ed214246d8 Removed mixed tabs and spaces. 2015-07-09 12:29:23 +01:00
Sipke Schoorstra
76132f2691 #5056: Added Export Features recipe step. 
Fixes #5056
 2015-07-09 12:29:05 +01:00
Sipke Schoorstra
41b245560c Removed unused namespaces and empty folder. 2015-07-09 11:59:25 +01:00
Daniel Stolt
e054a833af Removed Orchard.Reports. 2015-07-09 11:43:04 +01:00
Sipke Schoorstra
9a2eaf7ac9 #5489: Handling potential null value for MediaLibraryPickerField.MediaParts. 
This happens when a content type has both a MediaLibraryPickerField and the LayoutPart attached.
The layout editor renders the field, whose shape template accesses the MediaParts property, which is not initialized for new content items.

Fixes #5489
 2015-07-08 22:45:52 +01:00
Sergio Navarro
d805c7773d Fixed #5141 Retrieve & Store doesn't support char 2015-07-07 19:42:06 +02:00
Gustavo Tandeciarz
18c5b5dfff Fixes #5398 - ShellDescriptorCache in HostComponents 
Added Orchard.Environment.Descriptor.ShellDescriptorCache setting back to HostComponents.config. For some reason, this was removed at some point but I believe it needs to be there for Azure Web Apps deployments (when running with a shared file system and multiple instances)

Original commit by @sebastienros
a2d91796d1
 2015-07-06 10:14:10 -04:00
Lombiq
89c5b2f7de Fixing that Audit Trail summary item edit link was double-encoded 2015-07-06 01:15:12 +02:00
Lombiq
b6db85b8af Untabifying CommentPartDriver 2015-07-05 14:19:37 +02:00
Sipke Schoorstra
4e61c3314d Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Views/EditorTemplates/Parts.Autoroute.Edit.cshtml
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/LayoutEditor.js
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/LayoutEditor.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
 2015-07-04 14:35:41 +02:00
Sipke Schoorstra
b37951e205 Merge branch '1.9.x' into dev 
Conflicts:
 src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
 src/Orchard.Web/Modules/Orchard.Autoroute/Views/EditorTemplates/Parts.Autoroute.Edit.cshtml
 src/Orchard.Web/Modules/Orchard.DynamicForms/Migrations.cs
 src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/ValidationMessage.Design.cshtml
 src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/ValidationSummary.Design.cshtml
 src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config
 src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
 src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
 src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.js
 src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js
 src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.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.min.css
 src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Shape.Design.cshtml
 src/Orchard.Web/Modules/Orchard.Layouts/Web.config
 2015-07-04 14:27:04 +02:00
Sipke Schoorstra
6bce34f379 #5260: Fixed the issue where form validation result gets output cached. 
Fixes #5260
 2015-07-04 13:01:17 +02:00
Sipke Schoorstra
c8f2c27311 Fixed form redirect issue. 
This fixes the issue where you would not stay on the same page after a model validation occurred.
 2015-07-04 12:45:17 +02:00
Sipke Schoorstra
22fa33c06f #5279: Fixed "potentially dangerous request" error. 
Fixes #5279
 2015-07-04 12:25:23 +02:00
Sipke Schoorstra
bbf6700e1a #5099: Improved image element dialog by hiding Save/Cancel buttons. 2015-07-04 11:45:43 +02:00
Sipke Schoorstra
c2b0041e1c Updated usage of correct LazyField class. 
This fixes the "is deprecated" build warning for the Widgets module.
 2015-07-04 11:44:18 +02:00
Sipke Schoorstra
70697b8c5e Removed image references. 
This stylesheet is a copy from the TheAdminTheme theme, but doesn't require the images, so removed these references instead of copying over the images.
 2015-07-04 11:42:50 +02:00
Sipke Schoorstra
504f484b19 Fixed broken Html element view. 2015-07-04 10:32:11 +02:00
Sipke Schoorstra
2508f503b7 #5298: Suppressed input validation on SMPT test form. 
This fixes the issue when you try and use address formats such as "User <user@domain.com>" and adds support for sending HTML as part of the message body.

Fixes #5298
 2015-07-04 09:51:05 +02:00
Sipke Schoorstra
1093e16a81 #5452: Improved ContentItem and Projection elements by rendering an abstract representation instead. 
Fixes #5452
 2015-07-04 09:36:31 +02:00
Sipke Schoorstra
1fe436e05a Fixed incorrect method error. 2015-07-04 09:32:51 +02:00
Sipke Schoorstra
b18f153e6a #5445: Fixed form field binding issues. 
This fixes two issues:
1. Adding a Form element (and selecting the content type to create using the submitted values) and then adding a form element would not cause the Bindings tab to appear.
2. Adding nested containers (such as Grid, Row and Column) to a Form element would prevent the Bindings tab from appearing when adding a form field element such as TextField to a nested container.

Work Item: #5445
 2015-07-04 00:37:14 +02:00
Sébastien Ros
c75ba007e6 Merge pull request #5453 from kumards/patch-1 
Fix for duplicate version number on creating a new draft
 2015-07-02 12:28:36 -07:00
Sébastien Ros
b5b3ffea8e Merge pull request #5425 from jersiovic/patch-1 
Issue #5061 GetImageProfileUrl reprocess images obtained through a dynamic profile on every restart
 2015-07-02 12:18:30 -07:00
Sipke Schoorstra
b05dcf9a56 Fixed default layout data for Form. 2015-07-02 15:40:54 +03:00
Sipke Schoorstra
3c7fffc320 Fixed that default layout data would not be applied. 
This fixes the issue where the default layout data string would not be applied when creating new content items of a content type with the LayoutPart attached.
For example, creating new Form content items would start out with an empty canvas instead of with a default Form element and a submit button.
 2015-07-02 15:34:08 +03:00
Sipke Schoorstra
b580995e4b Added "TypeName" to element data serialization black list. 
Having the "TypeName" as part of the element's data field is redundant.
 2015-07-02 15:30:20 +03:00
Sipke Schoorstra
2873eb8991 #5337: Fixed homepage becoming lost after publishing layout template being used by the homepage. 
Work Item: 5337
 2015-07-02 13:37:20 +03:00
Sipke Schoorstra
eebe29fec3 #5467: Fixes the issue where the "Set as homepage" setting is not retained when saving, 
The issue was that when you save a content item (without publishing it) while checking the "Set as homepage" checkbox, it would lose its checked status after save.
With this change, the checkbox is again rendered but in a checked status, so that when you do publish, it will become the homepage.

Fixes #5467
 2015-07-02 13:01:49 +03:00
qt1
7bbad86eb4 Support CreateColumn<Guid>() 2015-07-01 21:53:05 +03:00
adeveloper
aaef6d8810 Adding a test case for DraftRequired version option building new version of the content 2015-07-01 14:31:31 -04:00
adeveloper
379ae61e34 Code clean up 
Removed the commented lines in method BuildNewVersion.
 2015-07-01 11:38:49 -04:00
Sébastien Ros
dbba4e2787 Merge pull request #5458 from dcinzona/patch-1 
Update web.config MVC bindings for Azure Cloud Service
 2015-07-01 07:46:39 -07:00
Sébastien Ros
27365a71d9 Merge pull request #5460 from dcinzona/patch-3 
Web.Config: Orchard Layouts Updating MVC reference to 5.2.3
 2015-07-01 07:46:20 -07:00
Sébastien Ros
6a5028b80a Merge pull request #5461 from dcinzona/patch-4 
Web.config - Dynamic Forms: MVC reference updated to 5.2.3
 2015-07-01 07:46:00 -07:00
Gustavo Tandeciarz
e021218b3c Updated bindings in azure cloud service web.config 
Updated bindings for system.web.http and system.net.http.formatting to 5.2.3
 2015-06-30 19:48:05 -04:00
Gustavo Tandeciarz
993e6a1e43 Web.config: MVC reference updated to 5.2.3 
Was still referencing 5.1.0.0
 2015-06-30 17:54:18 -04:00
Gustavo Tandeciarz
0318db4c53 Web.Config: Updating MVC reference to 5.2.3 
web.config was still referencing 5.1.0.0
 2015-06-30 17:53:13 -04:00
Sebastien Ros
7758eb66f2 Fixing build 2015-06-30 14:47:22 -07:00
Sebastien Ros
e7ceb732b1 Merge branch '1.9.x' into dev 2015-06-30 14:39:06 -07:00
Sebastien Ros
03a193b6c2 Fixing compilation 2015-06-30 14:38:12 -07:00