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
10,415 Commits 83 Branches 32 Tags
80a9cc73b8e43b25b41f17472ffc89568c0cb34e
Commit Graph

5685 Commits

Author SHA1 Message Date
Daniel Stolt
80a9cc73b8 Untabified module manifests according to #6072. 2016-01-22 20:46:45 +01:00
Daniel Stolt
16c687d8b1 Cleaned up and reformatted all Web.config files according to #6072. 2016-01-22 20:38:34 +01:00
Sebastien Ros
f47ce2a5f0 Using case insensitive route values comparison 2016-01-15 09:15:34 -08:00
Sebastien Ros
567756b697 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Taxonomies/Views/Admin/Index.cshtml
 2016-01-15 09:01:39 -08:00
Sebastien Ros
eb7574df0b [Fixes #6248] Prevent users from renaming their root folder 2016-01-15 08:55:32 -08:00
jtkech
7237437c14 Update FrontEndCultureSelector.cshtml 2016-01-15 03:13:20 +01:00
Sebastien Ros
f17f2c3a93 [Fixes #6279] Adding confirmation for deleting taxonomies 2016-01-14 17:52:07 -08:00
Sebastien Ros
ec0b4b1a4b Fixing homepage service 
Fixes #6263
Fixes #6273
 2016-01-14 17:35:15 -08:00
Sébastien Ros
c6b9d36c41 Merge pull request #6268 from leventesen/update/contentpicker-edit-link 
[Fixes #6267] Use admin link for ContentPicker
 2016-01-14 12:10:58 -08:00
Sebastien Ros
2d4c87d1d7 Fixing unit tests 2016-01-14 09:39:51 -08:00
Sebastien Ros
a0c61c0328 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj
 2016-01-14 08:50:24 -08:00
Sebastien Ros
e510ec2998 Removing unknown binaries 2016-01-13 17:58:11 -08:00
Sebastien Ros
e587a48e75 White-listing packages.config as None target in projects 2016-01-13 17:34:29 -08:00
Daniel Stolt
dec68d454c Updated code base to target .NET Framework 4.5.2. Fixes #5700. 2016-01-14 01:06:32 +01:00
Daniel Stolt
c59b761c3a Enabled Roslyn compilation (C# 6 syntax support) for Razor views. 
- Added Roslyn CodeDom Nuget packages to Orchard.Web and Orchard.Azure.Web.
- Added the necessary Web.config section to all modules/themes to make the VS editor recognize C# 6 syntax.
- Added a sample/proof use in BadgeOfHonor.cshtml.
 2016-01-14 00:48:22 +01:00
Sebastien Ros
fe121a81f1 [Fixes #5728] Adding default grid system to TheThemeMachine 
Breaking change: Existing themes relying on Layout and TheThemeMachine
will need to add a reference to this css.
 2016-01-13 15:47:39 -08:00
Sebastien Ros
e907334b6c Fixing object dumper unit tests 2016-01-13 15:31:03 -08:00
Daniel Stolt
bfb01a31d5 Fixed compiler errors in Razor views in modules and themes. 
A handful of compiler errors would appear in most modules while having Razor views open in Visual Studio 2015. Adding a reference to System.Core in Web.config of modules fixes this.
 2016-01-14 00:09:15 +01:00
Sebastien Ros
a55ba9f06b [Fixes #5951] Fixing NRE when exporting media items 2016-01-13 13:06:39 -08:00
armanforghani
ee54d4237f Update LayoutEditor.cshtml. 
Wrapped strings in T delegate.
Fixes #6269
 2016-01-11 16:03:35 +03:30
Levent Esen
2d2b4a0563 Update ContentPicker.Edit.cshtml link 
Update for issue #6267
 2016-01-11 02:22:35 +02:00
Sébastien Ros
76e55c3d16 Merge pull request #6217 from gcsuk/replace-lib-with-nuget 
[Fixes #6148] Replace lib with nuget
 2016-01-07 12:53:42 -08:00
Sébastien Ros
2d42c74395 Merge pull request #6207 from Codinlab/features/2027 
[Fixes #2027] Add role rule  in Orchard.Widgets module
 2016-01-07 12:35:31 -08:00
Sébastien Ros
050b3e2acf Merge pull request #6187 from PaulDevenney/Bug/FixImportExportCommand 
[Fixes #6181] Fixed bad assumption about HttpContext
 2016-01-07 12:30:44 -08:00
Sébastien Ros
7578daa510 Merge pull request #6131 from sebastienros/sebros/cachemonitor 
Improving monitors usage for output cache
 2016-01-07 12:14:52 -08:00
Sébastien Ros
5dd54b6d55 Merge pull request #6125 from neTp9c/issue/6107 
[Fixes #6107] Fixing content permissions part
 2016-01-07 12:12:26 -08:00
Rob King
f440ebd03f Updated CodeGen templates 2016-01-07 16:11:00 +00:00
Rob King
bc51f86582 Consolidate Iesi.Collections and commit binding redirects 2016-01-07 15:27:00 +00:00
Lombiq
79b0b809ca Fixing that when editing blog posts permissions were mistakenly checked for the blog instead of the post 2016-01-06 14:49:57 +01:00
Rob King
93ec5ea543 Merge branch 'dev' of https://github.com/OrchardCMS/Orchard into replace-lib-with-nuget 2016-01-06 10:36:08 +00:00
Lombiq
7fa4783b1d Fixing leftover MVC references by changing them to also use packages 2016-01-06 01:04:40 +01:00
Lombiq
aaced541e3 Adding WithIdentity() content metadata helper to add IdentityPart in migrations and changing affected code to use this 2016-01-04 19:09:00 +01:00
Thierry Fleury
1a7eae5dc1 Fix media-library-picker.js 2015-12-31 14:10:25 +01:00
Sipke Schoorstra
fde4c32aff Fixed activity toolbox filtering. 
Due to a bug in the orchard-workflows.js script, the activity toolbox filter was broken.
 2015-12-30 17:52:46 +01:00
Sipke Schoorstra
c8b5664d26 Fixed a bug in HomeAliasService 
The bug would cause a null reference exception in case there is no alias with an empty string (the home alias).
 2015-12-30 17:28:23 +01:00
andy zheng
0a8fa5b99a second time to fix #6245 2015-12-30 09:56:59 -05:00
Sipke Schoorstra
bd1a1eb6e6 Merge pull request #6191 from Codinlab/fixes/6189 
Fixes #6189 : TextAreaElement throwing on null ProcessedValue
 2015-12-28 16:25:39 +01:00
Sipke Schoorstra
d1fd7cd271 Improved class attribute logic. 
This change fixes that the `"class"` attribute would be added to the tag even if there are no css classes to assign. This in turn has the effect that the root `Canvas` element is not rendering its outer tags needlessly by default (only if it has at least one attribute).
 2015-12-28 16:05:54 +01:00
Thierry Fleury
66963d1845 Remove duplicate Logger assignation 2015-12-28 10:27:36 +01:00
Sipke Schoorstra
49317ec33f Giving back Classes to the Shapes. 
This fixes a limitation where the Classes property on an element shape would be ignored when rendering tags using attributes returned from the TagBuilderExtensions.GetCommonElementAttributes method.
 2015-12-25 14:43:43 +01:00
Sipke Schoorstra
8ee37a6de0 Merge pull request #6218 from paynecrl97/patch-3 
Use Display Name to show validation messages
 2015-12-22 22:24:24 +01:00
Lombiq
37b97eaa26 Move Mono DLL from the Orchard.Scripting.CSharp module to the root lib folder 2015-12-22 21:57:25 +01:00
Sipke Schoorstra
4418bcdc19 Fixed a bug in LayoutModelMapper. 
If the root Canvas is manually instantiated, it will not have a valid ElementDescriptor.
 2015-12-22 20:21:28 +01:00
Chris Payne
28e2e8f695 Use Display Name to show validation messages 2015-12-22 16:44:24 +00:00
Rob King
9ee7715386 Moved WindowsAzure.Diagnostics to Orchard NuGet Feed 2015-12-22 11:39:28 +00:00
Rob King
75161221ee Moved WindowsAzure.ServiceRuntime to Orchard NuGet Feed 2015-12-22 11:37:14 +00: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
Sipke Schoorstra
a492f89ea0 Further Layouts client-side scripting improvements. 
- Pushed the editElement function further down from Content to Element, which means even less code for custom container elements.
- Fixed a bug where client-side element editor state would not be applied after editing that element.
- Pushed down the toObject function from Content to Element, which means less code is necessary for custom container elements.
-
 2015-12-21 20:59:47 +01:00
Sipke Schoorstra
d1c0f98010 Updated Layouts to simplify custom container elements. 
These changes simplifies the requirements for implementing custom container elements by minimizing the amount of code necessary to tie things together.
 2015-12-21 19:48:59 +01:00
Thierry Fleury
c45da04455 Close #2027 : Add role rule in Orchard.Widgets module 2015-12-20 19:54:21 +01:00