lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-27 04:19:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11,147 Commits 84 Branches 32 Tags
f7ddd1eb949e97833884c53fdc148d3307c68df3
Commit Graph

10451 Commits

Author SHA1 Message Date
Sebastien Ros
2bfd3448a2 Using Nuget version of NUnit 2016-03-31 11:43:10 -07:00
Sebastien Ros
01500bc7a5 Adding missing dependency to Orchard.Resources 
Fixes #6674
 2016-03-30 16:52:02 -07:00
Sebastien Ros
d7682123a7 Fixing versions of manifests 2016-03-30 16:50:31 -07:00
Sebastien Ros
dad2714852 Fixing exception during command line setup with snippets 
Fixes #6597
 2016-03-30 16:13:22 -07:00
Sebastien Ros
3568db209c Moving Shape snippet to Content group 
Fixes #6624
 2016-03-30 15:55:29 -07:00
Sebastien Ros
2ee299eb6c Adding missing dependency in Orchard.Layouts 
Fixes #6654
 2016-03-30 15:42:16 -07:00
Sébastien Ros
5af991e516 Merge pull request #6640 from Codinlab/issue/6639 
Azure Media Storage doesn't recognize its own URLs

Fixes #6639
 2016-03-30 15:29:41 -07:00
Sébastien Ros
564327ed58 Merge pull request #6645 from Codinlab/issue/6644 
Codegen don't creates Themes/Modules in right Solution directory

Fixes #6644
 2016-03-30 15:12:17 -07:00
Sebastien Ros
7e45c5a339 Fixing references to deprecated modules 
Fixes #6622
 2016-03-30 14:39:31 -07:00
Sebastien Ros
db780bb2ba Using Markdown Nuget package 
Fixes #6380
 2016-03-30 14:18:53 -07:00
Daniel Stolt
9d8272fdd5 Improved formatting of layout JSON data in exported recipe files using CDATA. Fixes #5822. 2016-03-30 19:52:33 +02:00
Daniel Stolt
bbca767be2 Merge remote-tracking branch 'origin/1.10.x' into dev 
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Link.Edit.cshtml
#	src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Numeric.Edit.cshtml
 2016-03-30 18:17:06 +02:00
jtkech
1c0b73949e Added Specflows 2016-03-30 06:50:53 +02:00
jtkech
2c5ed16cd6 Update AdminMenu.cs 2016-03-30 04:19:16 +02:00
Jasmin Savard
3694444ff3 Fixing Media Library clone function. 
Fixing refresh of list after cloning a media item.
Adding MimeType and FolderPath to the media item.
Reformating code to K&R.
 2016-03-29 19:20:22 -04:00
Sébastien Ros
07b6a44426 Merge pull request #6618 from jtkech/num-field 
Removing required attribute if default value is set (NumericField)
 2016-03-29 08:54:40 -07:00
jtkech
ac418cf28c Added specflows 2016-03-29 03:52:57 +02:00
Sébastien Ros
bdde332b49 Merge pull request #6619 from jtkech/other-fields 
Removing required attribute if default value set (input + link + date fields)

Fixes #6550
 2016-03-28 18:32:14 -07:00
jtkech
960d486b3c Squash 2016-03-29 03:02:01 +02:00
Sébastien Ros
bfcc304a26 Merge pull request #6626 from jtkech/more-fields 
Removing required attribute for default enum and boolean fields

Fixes #6550
 2016-03-28 17:17:55 -07:00
jtkech
5100009ff2 Add Specflows 2016-03-28 23:47:39 +02:00
Sebastien Ros
2a545d992a Merge branch '1.10.x' into dev 
Conflicts:
	ClickToBuildAzurePackage.cmd
	Orchard.proj
	src/Orchard.Azure/Orchard.Azure.sln
	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
	src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
 2016-03-28 09:19:21 -07:00
Sébastien Ros
ba134bb868 Merge pull request #6660 from infofromca/warning 
Removing unused namespace usings
 2016-03-28 08:54:43 -07:00
Sébastien Ros
80f7661e43 Merge pull request #6661 from infofromca/fix6655 
Fixing some minified resource declarations

Fixes #6655
 2016-03-28 08:54:19 -07:00
Lombiq
a6f46d17cd Fixing references to NuGet package dlls (Orchard.Azure, Orchard.Azure.Tests, Orchard.Framework) 2016-03-26 16:16:32 +01:00
andy zheng
19954f1b4b deleted a duplicated Newtonsoft.Json declared 2016-03-25 20:08:37 -04:00
andy zheng
69b312362c fixed min and debug css menifest 2016-03-25 19:59:02 -04:00
andy zheng
464bdb07f6 fixed compile warning 2016-03-25 19:28:58 -04:00
Sébastien Ros
7e11509182 Merge pull request #6611 from OrchardCMS/issue/4569 
Block requests to tenant while it's being restarted
 2016-03-25 10:49:31 -07:00
Daniel Stolt
c6c667d180 Removed Azure cloud service support. 
Removed cloud service things from build and deployment scripts.
Removed Orchard.Azure.sln.
Removed Orchard.Azure.CloudService and Orchard.Azure.Web projects.
Removed Azure Diagnostics support.
Removed cloud service machine name provider.
Removed Azure Cache support.
Updated Orchard.Azure.Tests and moved into main solution.
Removed Orchard.Azure.Tests.sln.
 2016-03-25 17:20:51 +01:00
Lombiq
9f4b842df2 Orchard.Azure.sln: syncing Deprecated modules with Orchard.sln. Fixes #6629 2016-03-25 11:22:46 +01:00
Thierry Fleury
de8c084c53 Replace IsNullOrWhiteSpace with IsNullOrEmpty. 2016-03-25 08:32:52 +01:00
jtkech
2d294fe421 Squash 2016-03-25 04:13:41 +01:00
jtkech
f2ec191259 Squash 2016-03-25 04:03:03 +01:00
jtkech
c1107b37bd Squash 2016-03-25 03:42:33 +01:00
jtkech
b9aaa90ec8 Squash 2016-03-25 03:29:19 +01:00
jtkech
ee223f3641 Squash 2016-03-24 23:54:40 +01:00
jtkech
dc192bf9cb AliasHolderUpdater Refresh() is called 2 times 2016-03-24 22:07:56 +01:00
Sébastien Ros
336cda8c34 Merge pull request #6604 from infofromca/timerNull 
Fixed Timer activity throws NRE

Fixes 6240
Fixes 6445
 2016-03-24 13:06:10 -07:00
Sébastien Ros
f660c101cc Merge pull request #6605 from jtkech/patch-2 
Checkboxes issues in form elements editors

Fixes #6302
Fixes #6527
 2016-03-24 13:04:56 -07:00
Sébastien Ros
1f768c8768 Merge pull request #6609 from yw80/1.10.x 
Delete the CamelFriendly function call to DisplayName.
 2016-03-24 13:01:01 -07:00
Sébastien Ros
9736f12bcc Merge pull request #6614 from jtkech/patch-3 
[Fixes #6542] Content picker multi-selection issue
 2016-03-24 12:56:29 -07:00
Sébastien Ros
d9e59eada6 Merge pull request #6617 from jtkech/patch-6 
Fixes Layout OnIndexing when using a snippet element
 2016-03-24 12:55:32 -07:00
Sébastien Ros
8f3eadb2ae Merge pull request #6637 from jbuck79/master 
Fixing jQuery-UI resources
 2016-03-24 12:46:27 -07:00
Thierry Fleury
724afd53e0 Fixes #6644 : Codegen don't creates Themes/Modules in right Solution directory 2016-03-24 20:37:45 +01:00
Thierry Fleury
9a1d047154 Rename uri to uriBuilder 2016-03-23 14:36:36 +01:00
Thierry Fleury
74a5672f90 Fixes #6639 : Azure Media Storage don't recognizes its own URLs 
Compares url to default endpoint hostname and public hostname.
 2016-03-23 12:38:33 +01:00
Thierry Fleury
8b66c9530f Return clean PublicUrl without port number when default is used. 2016-03-23 12:31:24 +01:00
Szymon Seliga
694aeb5062 #6410 Added NotifyType.Success and replaced most usages of NotifyType.Information with it. Added appropriate styles in css files. 
Some minor fixes - wrong notification types.

Conflicts:
	src/Orchard.Web/Modules/Orchard.ImportExport/Controllers/AdminController.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
	src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs

Contained in branches: dev#gitext://gotobranch/dev
Contained in no tag
 2016-03-22 21:19:50 +01:00
Szymon Seliga
4cda6672f9 Revert "#6140 Added NotifyType.Success and replaced most usages of NotifyType.Information with it. Added appropriate styles in css files." 
This reverts commit dd37d8693c.
 2016-03-22 21:19:09 +01:00