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
9,993 Commits 83 Branches 32 Tags
6a90cdc68178663a51d8f22063be9eb94e7330d6
Commit Graph

31 Commits

Author SHA1 Message Date
Sebastien Ros
d0b364c28e Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Cloud.cscfg
	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
	src/Orchard.Web/Core/Reports/Module.txt
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
	src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureBlobShellSettingsManager.cs
	src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/DefaultPlatformConfigurationAccessor.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Elements/Column.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Module.txt
	src/Orchard.Web/Web.config
 2015-09-30 15:57:34 -07:00
Sebastien Ros
62136eb59f Updating to Azure SDK 2.7 2015-09-30 15:50:05 -07:00
Daniel Stolt
d6f3bfd419 Updated to Newtonsoft.Json 7.0 and Azure SDK 2.7. 2015-08-25 16:17:32 +02: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
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
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
Kees Damen
2cfcdfaa8b Fixed project references to Orchard.Core and Orchard.Framework 2015-04-16 16:23:12 +02: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
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
Daniel Stolt
5965f02b02 Added support for custom encoding presets to Orchard.Azure.MediaServices. 2014-09-08 19:07:23 +02: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
Sebastien Ros
56277f275f Stop processing typescript definition files 2014-08-06 15:57:34 -07:00
Daniel Stolt
4a899e489b Removed orphan file reference in Orchard.Azure.MediaServices.csproj. 2014-07-09 12:45:41 +02:00
Daniel Stolt
300ef6f71b #20761: Improved media upload experience in Orchard.Azure.MediaServices (added ability for user to control the name of the uploaded file). 
Work Item: 20761
 2014-06-28 17:55:07 +02:00
Sebastien Ros
295099c215 Merge branch '1.8.x' into 1.x 2014-05-26 12:08:12 -07:00
Daniel Stolt
fe03101d84 Removed version numbers from references to assemblies in the lib folder in Orchard.Azure.MediaServices.csproj. 2014-05-23 00:30:23 +02:00
Bertrand Le Roy
12230a8312 Fixed None elements in azure media services project. 2014-05-04 15:47:38 -07:00
Sebastien Ros
59b57a4c27 #20591: Including missing assemblies in package 
Work Item: 20591
 2014-05-02 11:06:18 -07:00
Sebastien Ros
6458ad2db6 Removing TypeScript compilation on build 
Introduces some errors preventing Orchard to start.
The errors need to be fixed first.
 2014-04-22 16:39:57 -07:00
Daniel Stolt
871e5c9021 Moved some dependencies to the root "lib" folder and updated Web.config in Orchard.Web and Orchard.Azure.Web. 2014-03-22 17:21:16 +01:00
Daniel Stolt
bddaa8cc60 Added the Orchard.Azure.MediaServices module. 2014-03-22 15:59:41 +01:00