Merge remote-tracking branch 'origin/master'

Conflicts: Magicodes.Web.Interfaces/T4/IgnoreParts.cs Magicodes.Web.Interfaces/T4/ReadOnlyTypes.cs Magicodes.Web.Interfaces/T4/T4ODataGridAttribute.cs Magicodes.Web.Interfaces/T4/T4ReadOnlyFieldAttribute.cs Magicodes.Web/Plus/Plugins/Magicodes.Mvc.Default/Plus.config Magicodes.Web/Web.config Plus/Magicodes.Mvc.Default/Areas/Admin/Views/ODataGrid/Roles.cshtml Plus/Magicodes.Mvc.Default/Areas/Admin/Views/ODataGrid/Users.cshtml
wuyinhui · Jan 13, 2015 · 768c360 · 768c360
2 parents a10e17f + bbe10e7
commit 768c360
Show file tree

Hide file tree

Showing 76 changed files with 5,054 additions and 6,738 deletions.
diff --git a/Magicodes.Core.Web/Magicodes.Core.Web.csproj b/Magicodes.Core.Web/Magicodes.Core.Web.csproj
@@ -139,6 +139,7 @@
     <Compile Include="Editor\EditorController.cs" />
     <Compile Include="Controllers\JSONActionResult.cs" />
     <Compile Include="Controllers\AdminControllerBase.cs" />
+    <Compile Include="Controllers\AdminODataControllerBase.cs" />
     <Compile Include="Controllers\Viewer\DocumentViewerController.cs" />
     <Compile Include="Controllers\ODataControllerBase.cs" />
     <Compile Include="Controllers\PlusControllerBase.cs" />