lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9,708 Commits 94 Branches 33 Tags
412c531027fdeeed7bac94ffbcc1800d9105cd19
Commit Graph

77 Commits

Author SHA1 Message Date
Sipke Schoorstra
412c531027 Merge branch 'dev' into feature/auto-enable-dependencies 
Conflicts:
	src/Orchard/Orchard.Framework.csproj
 2015-08-21 19:45:53 +01:00
Daniel Stolt
9429ad6e63 Merge branch '1.9.x' into dev 2015-08-17 00:03:59 +01:00
Daniel Stolt
75609bf2ce Excluded private locator URLs from JSON serialization in Azure Media Services. Fixes #4686. 2015-08-16 20:13:33 +01:00
Daniel Stolt
3183df5b4a Recreated folder to resolve git case inconsistency. 2015-08-16 16:27:09 +01:00
Daniel Stolt
dfa1ada978 Deleted folder to resolve git case inconsistency. 2015-08-16 16:25:58 +01:00
Daniel Stolt
a6a6cb2d90 Merge branch '1.9.x' into dev 2015-08-16 16:19:59 +01:00
Daniel Stolt
b2c131f516 Refactored watch task in Gulpfile.js. 2015-08-16 16:15:46 +01:00
Sipke Schoorstra
f4a707a281 Merge branch 'dev' into issue/homepage-alias 
Conflicts:
	src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/ImportResult.cshtml
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
 2015-08-04 16:28:07 +01:00
Sipke Schoorstra
2ad324d4e2 Merge branch 'dev' into issue/homepage-alias 
Conflicts:
	src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/ImportResult.cshtml
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
 2015-08-04 16:25:35 +01:00
Sebastien Ros
5fd02aacd9 Merge branch '1.9.x' into dev 
Conflicts:
	README.md
 2015-07-30 15:51:28 -07:00
Sebastien Ros
cc82bfcca0 Fixing duplicate session creation 2015-07-30 15:49:13 -07: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
Sipke Schoorstra
4159584d85 Merge branch 'dev' into issue/homepage-alias 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
 2015-07-24 13:33:36 +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
Sebastien Ros
760e30855c Updating version number 1.9.1 2015-06-23 11:20:06 -07:00
Gustavo Tandeciarz
88ac0d2879 Assembly binding to azure storage 4.3.0 
Retargeting to 1.9.x - updated assembly binding from 3.1.0 to 4.3.0
 2015-06-22 18:55:35 -04:00
Sebastien Ros
0e47295b9f Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Comments/Web.config
	src/Orchard.Web/Modules/Orchard.Fields/Web.config
	src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config
 2015-06-19 11:33:12 -07:00
Sebastien Ros
1180425109 Updating libraries 2015-06-19 10:39:00 -07: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
Sebastien Ros
2c45b9b13e Merge branch 'master' into 1.x 2015-05-05 21:40:02 -07:00
Sipke Schoorstra
3311c9a8a4 Updated web.config files to fix intellisense for Razor view files. 
This fixes the side effect of setting CopyLocal=False on the Orchard.Framework project references where Razor intellisense was broken.
Although not necessary in most cases, I also added Orchard.Core for free, for those rare cases where a service is directly consumed in a Razor view.
 2015-05-02 10:14:29 +02:00
Sebastien Ros
ddfb72faaa Updating version number 2015-04-28 12:14:30 -07:00
Sebastien Ros
d25eb61fe7 Merge branch '1.8.2-int' into 1.9-int 
Conflicts:
	src/Orchard.Profile/Tests/Profiling.feature.cs
	src/Orchard.Web/Modules/Orchard.jQuery/Scripts/jquery-ui-timepicker-addon.js
 2015-04-28 11:44:09 -07:00
Sebastien Ros
8b9c25a0a0 Updating version and license 2015-04-28 11:07:04 -07:00
Wojciech Gadziński
b9973d91d8 Move all usages of LazyField to Orchard.ContentManagement.Utilities.LazyField 
There is one change which have to verify:
Orchard.ContentManagement.Handlers.StorageFilter
Orchard.ContentManagement.Handlers.StorageVersionFilter
because I removed _value parameter from loader delegate - it was pointless and used nowhere except above filters.
 2015-04-26 23:56:04 +02:00
Wojciech Gadziński
fa40f4d8b0 Cleanup formatting and references 2015-04-26 23:21:08 +02:00
Kees Damen
2cfcdfaa8b Fixed project references to Orchard.Core and Orchard.Framework 2015-04-16 16:23:12 +02:00
Daniel Stolt
0d2afe3206 Added a post-build binding to TypeScript gulp task for Task Runner Explorer. 2015-03-18 12:54:10 +01:00
Daniel Stolt
2d4c1c817d #21249: Removed build dependency on TypeScript. 
Instead added a gulpfile to enable compilation of TypeScript files when needed.

Work Item: 21249
 2015-03-18 12:34:29 +01:00
Daniel Stolt
8e81de333f Removed more source map files and disabled source map generation for TypeScript. 2015-03-04 02:22:19 +01:00
Daniel Stolt
1a8ebf2548 Fixed version conflict build warnings and cleaned up all Web.config files. 2015-03-04 02:06:09 +01:00
Sipke Schoorstra
43eafcbb1e Prevent .map files from being requested by the browser. 
Requests to .map files are responded to with 404 - not found.
 2015-03-01 21:03:46 +01:00
Daniel Stolt
d32accb089 #21213: Improved layout popup keyboard handling. 
Work Item: 21213

Fixed space key issue when popup input field has focus. Also added ESC as a keyboard shortcut to close the popup. Also set focus to the first input when popup is opened.
 2015-02-24 12:47:57 +01:00
Daniel Stolt
caa50ad440 Updated TypeScript to version 1.4. 
Download from here: https://visualstudiogallery.msdn.microsoft.com/2d42d8dc-e085-45eb-a30b-3f7d50d55304
 2015-02-23 15:23:15 +01:00
Daniel Stolt
8911365242 Removed some residual JS source map references. 2015-02-20 12:46:18 +01:00
Daniel Stolt
4b11d08ccd Merged 'feature/layouteditor' into 1.x. 2015-02-19 22:14:55 +01:00
Daniel Stolt
005ec51115 Prevented IIS site from being started for Orchard.Azure.MediaServices when running from VS. 2014-10-26 16:29:23 +01:00
Sebastien Ros
8dfd9048b3 Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Indexing/Settings/EditorEvents.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Fields/MediaLibraryPicker.Edit.cshtml
 2014-09-19 10:19:29 -07:00
Sebastien Ros
a0e8fda8a2 Clearing IContentManagerSession in SessionLocator 2014-09-18 15:38:42 -07:00
Sebastien Ros
84993f3a4e Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Alias/Implementation/Updater/AliasHolderUpdater.cs
	src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj
	src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
 2014-09-18 10:53:40 -07:00
Daniel Stolt
5965f02b02 Added support for custom encoding presets to Orchard.Azure.MediaServices. 2014-09-08 19:07:23 +02:00
Sebastien Ros
eccea78185 Applying the RequireNew pattern correctly 2014-08-28 13:58:44 -07:00
Sebastien Ros
288d1cb8ad More config files updates 2014-08-20 14:01:35 -07:00
Sebastien Ros
c816d8e24f Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
 2014-08-15 13:52:08 -07:00
Sebastien Ros
9550146acc Fixing build warnings 2014-08-15 13:42:52 -07:00
Sebastien Ros
221197f314 Upgrading to .NET Framework 4.5.1 2014-08-13 14:07:45 -07:00
Sebastien Ros
841c7d6d44 Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
	src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs
 2014-08-13 11:24:02 -07:00