lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,405 Commits 73 Branches 31 Tags 239 MiB
b91d001010
Commit Graph

10405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastien Ros
b91d001010 Updating CREDITS 
#6257
 2016-01-14 16:06:59 -08:00
Sebastien Ros
45e6a7fd51 Adding missing SlowCheetah assembly 2016-01-14 14:57:24 -08:00
Sebastien Ros
163159dfd0 Merge branch '1.9.x' into dev 2016-01-14 13:19:45 -08:00
Sebastien Ros
42923e9642 Fixing msbuild script 2016-01-14 13:18:59 -08:00
Sébastien Ros
40db1e2a84 Merge pull request #6236 from jtkech/patch-3 
[Fixes #6192] Using Lazy IWorkContextStateProvider
 2016-01-14 12:15:24 -08:00
Sébastien Ros
eb6f2f2752 Merge pull request #6249 from OrchardCMS/issue/infoset-nullable-enums 
Added handling of nullable enums.
 2016-01-14 12:14:16 -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
ab89479508 Including msbuild tasks in lib 2016-01-14 12:04:45 -08:00
Sebastien Ros
e98125f245 Restoring tooling packages before msbuild is invoked 2016-01-14 11:51:00 -08:00
Sebastien Ros
182f9fdce3 Using MSBuild.Community.Tasks from nuget 2016-01-14 11:03:50 -08:00
Sebastien Ros
bb5c6e2ed1 Ignoring Rebracer changes 
Line orders would change randomly
 2016-01-14 09:40:26 -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
79337e9e3c Restoring nunit console runner 2016-01-13 18:08:21 -08:00
Sebastien Ros
50018cbc5b Installing SlowCheetah from Nuget on build 2016-01-13 18:07:40 -08:00
Sebastien Ros
387fbb2f32 Restoging nuget packages as part as the build script 2016-01-13 18:07:18 -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
Sebastien Ros
0e6955c624 [Fixes #5762 #4044] Creating new identities on cloning 2016-01-13 16:47:37 -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
Daniel Stolt
6a565a5fd4 Brought Nuget packages also to Orchard.Azure.Web. 2016-01-13 22:14:39 +01:00
Sebastien Ros
a55ba9f06b [Fixes #5951] Fixing NRE when exporting media items 2016-01-13 13:06:39 -08:00
Sebastien Ros
112f13bf39 [Fixes #5969] Listing unlistable types in Contents/List 2016-01-13 13:03:46 -08:00
Daniel Stolt
011d80cdb8 Merge pull request #6270 from armanforghani/patch-1 
Made strings localizable in LayoutEditor.cshtml.
 2016-01-11 18:10:05 +01: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
0156aa8ff7 Merge pull request #6232 from jtkech/patch-2 
WorkContext & HttpContext: Unused registration and last minor refactoring for better clarity
 2016-01-07 12:55:20 -08: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
Sébastien Ros
7ee227b73e Merge pull request #6114 from Codinlab/fixes/6113 
[Fixes #6113] Anchor custom link on homepage produces bad href
 2016-01-07 12:10:03 -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
6a0617b11a Restored MSBuild directory 2016-01-06 10:53:24 +00: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
e04b020132 Add missing IdentityPart (needed for export/import) to ContainerWidget 2016-01-04 19:16:48 +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
Sipke Schoorstra
c642bc0174 Merge pull request #6253 from Codinlab/patches/media-library-picker 
Fix media-library-picker.js
 2015-12-31 14:40:33 +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
Sipke Schoorstra
d21aae3506 Merge pull request #6250 from infofromca/fix6245b 
second time to fix #6245
 2015-12-30 16:10:20 +01:00