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,484 Commits 94 Branches 33 Tags
a8d4b18f72e834965b3f707c513aa000b40d64a1
Commit Graph

175 Commits

Author SHA1 Message Date
Sebastien Ros
e907334b6c Fixing object dumper unit tests 2016-01-13 15:31:03 -08:00
Lombiq
5406b17601 Converting all files stored as CRLF in git to be stored as LF 
LF is the git default and all new files are stored as such. Old files from the hg to git conversion however were moved over as CRLF.
 2015-12-13 22:21:02 +01:00
Thierry Fleury
044bb2fdaf Fixes #4622 : ShapeTracingFactory Should Not be Activable without HttpContext 2015-11-29 16:24:02 +01:00
Sebastien Ros
1724be5c72 Bumping version number 2015-09-23 17:23:54 -07:00
yw80
e72d226263 Delete redundant text in file ShapeTracingTemplates.cshtml 2015-07-17 03:17:59 +08:00
Sebastien Ros
760e30855c Updating version number 1.9.1 2015-06-23 11:20:06 -07:00
Sebastien Ros
1180425109 Updating libraries 2015-06-19 10:39:00 -07:00
Sebastien Ros
cd49d2ccf2 Updating ruleset location for all projects 2015-06-16 16:22:04 -07: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
Sebastien Ros
5ff2ad509b Merge branch '1.8.x' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/MediaLibraryService.cs
	src/Orchard.Web/Modules/Orchard.Modules/styles/orchard-modules-admin.css
	src/Orchard.Web/Modules/Orchard.Taxonomies/Services/TaxonomyService.cs
	src/Orchard.Web/Modules/Orchard.Widgets/Filters/WidgetFilter.cs
	src/Orchard/Mvc/Routes/RoutePublisher.cs
 2015-03-05 12:15:00 -08:00
Daniel Stolt
0f7d385350 Made casing of Web.config file names consistent. 2015-03-04 02:33:18 +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
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
Stanley Goldman
e1bb92e709 Bugfix FormatJsonValue moved to ObjectDumper 2014-10-25 18:59:10 -04:00
Stanley Goldman
6796c71d5e #21034: Preventing recursive dump of ObjectDumper 
WorkItem: 21034
 2014-10-25 18:33:52 -04:00
Stanley Goldman
43bcded513 Moving ConvertToJson to ObjectDumper 2014-10-25 17:43:21 -04:00
Nicholas Mayne
1d0b574c5e Cleaning up references in Orchard.DesignerTools 2014-10-12 16:46:19 +01:00
Lombiq
1fe8acf615 Removing old, orphaned files 2014-09-19 20:35:53 +02: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
Stanley Goldman
600dda4a2a #20668: Fixing Shape Tracing out of memory exception 
Work Item: 20668
 2014-09-11 10:14:33 -07:00
Sebastien Ros
288d1cb8ad More config files updates 2014-08-20 14:01:35 -07:00
Sebastien Ros
221197f314 Upgrading to .NET Framework 4.5.1 2014-08-13 14:07:45 -07:00
Piotr Szmyd
7cb97fdd7c Revert "Fixing build warnings. Added binding redirects for JSON.NET 6.0" 
It's a tooling issue, not Orchard - warnings are caused by Azure VS Tools 2.3 (http://connect.microsoft.com/VisualStudio/feedback/details/850425/windows-azure-vs-tools-breaking-msbuild-for-web-projects)
 2014-07-15 21:57:59 +02:00
Piotr Szmyd
eb38abcc31 Fixing build warnings. Added binding redirects for JSON.NET 6.0 2014-07-15 14:23:43 +02:00
Sebastien Ros
2fc1bc53a3 Updating version numbers 2014-05-16 13:13:32 -07:00
Sebastien Ros
37f5685065 Updating version numbers 2014-03-28 11:11:45 -07:00
Sebastien Ros
57d0dde156 Upgrading to ASP.NET MVC 5.1 2014-01-21 18:12:22 -08:00
Erik Oppedijk
ef7318fa58 remove webpages:enabled from scripts and content folders 2013-12-04 11:55:57 -08:00
Erik Oppedijk
3061412961 Delete views/web.config and update webpages to 3.0 2013-12-04 11:55:54 -08:00
Erik Oppedijk
5805f0ad9b Repair intellisense, update references 2013-12-04 11:54:34 -08:00
Sebastien Ros
6c0b85ad74 Merge branch 'master' into 1.x 
Conflicts:
	ClickToBuildAzurePackage.cmd
	src/Orchard.Azure/Orchard.Azure.Web/Web.config
	src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs
	src/Orchard.Web/Modules/SysCache/Web.config
	src/Orchard.Web/Orchard.Web.csproj
 2013-11-11 18:11:53 -08:00
Sebastien Ros
7afb052e7c Updating version numbers 2013-11-08 16:53:03 -08:00
Sebastien Ros
ffdeec733a Reverting shape wrappers 2013-11-08 12:08:23 -08:00
Piotr Szmyd
ff67e7917d #20261: Fixing URL and widget shape alternates. All wrappers for those shapes also get similar alternates. 
Work Item: 20261
 2013-11-08 04:43:35 +01:00
Sebastien Ros
f6f6a56c24 Merge branch 'feature/fw45' into 1.x 
Conflicts:
	src/Orchard.Azure/Orchard.Azure.Web/Web.config
	src/Orchard.Azure/Orchard.Azure.csproj
	src/Orchard.Web/Modules/Orchard.Autoroute/Specs/App.config
	src/Orchard.Web/Modules/Orchard.Autoroute/Specs/Orchard.Autoroute.Specs.csproj
	src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
	src/Orchard.Web/Modules/Orchard.Azure/Web.config
	src/Orchard.Web/Modules/Orchard.Fields/Specs/App.config
	src/Orchard.Web/Modules/Orchard.Fields/Specs/Orchard.Fields.Specs.csproj
	src/Orchard.Web/Modules/Orchard.OutputCache/Scripts/Web.config
	src/Orchard.Web/Modules/Orchard.Taxonomies/Styles/Web.config
	src/Orchard.Web/Orchard.Web.csproj
	src/Orchard.Web/Web.config
 2013-10-11 16:40:44 -07:00
Sebastien Ros
f0851bb5fb Updating version numbers 2013-09-10 14:08:05 -07:00
Erik Oppedijk
26c45498df Remove unused assemblybinding redirect (mvc 2 to 3 redirect) from views folder 2013-08-27 22:07:42 +02:00
Erik Oppedijk
8e84bd57e7 Upgrade projects and web.config to 4.5 FW 2013-08-23 15:16:14 +02:00
Erik Oppedijk
65eb63d29d Update all MVC references to 4.0 and Razor to 2.0 2013-08-20 10:39:13 +02:00
Erik Oppedijk
b49b65636f remove IIS6 settings 2013-08-15 17:14:39 -07:00
Sipke Schoorstra
aaa0bd7592 #19895: Removing dependency on non-existent feature for DesignerTools. 
Work Item: 19895

--HG--
branch : 1.x
extra : amend_source : c5f21212ac1544da73ba5ac4694087fae32027b6
 2013-07-13 12:22:36 +02:00
Sebastien Ros
181780cb6d #19734: Fixing Url Alternates creation order 
The drawback is that Shape Tracer doesn't reflect which alternate is used
in the case on a url.

Work Item: 19734

--HG--
branch : 1.x
 2013-07-11 17:29:48 -07:00
Sebastien Ros
506be4a9d0 Updating manifest files 
--HG--
branch : 1.x
 2013-06-26 18:19:23 -07:00
Sebastien Ros
db547fd7a9 #19351: Fixing UrlAlternates functionality 
Work Item: 19351

--HG--
branch : 1.x
 2013-05-20 12:44:14 -07:00
jasperd
132810129f #19612: jQuery.scrollTo depends on jQuery.browser 
Updated jQuery.scrollTo to 1.4.4
Work Item: 19612

--HG--
branch : 1.x
 2013-04-15 23:44:17 +02:00
Sebastien Ros
a9f1312b88 Removing clay usage in favor or pre-configured dynamic objects 
--HG--
branch : clayless
extra : rebase_source : fe1f730585d0df763d4dd4215b11bace48bcd944
 2012-11-20 17:21:52 -08:00
Sebastien Ros
779bb49478 #19176: Fixing placement encoding in Shape Tracing 
Work Item: 19176

--HG--
branch : 1.x
 2012-10-23 17:35:40 -07:00