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
10,939 Commits 94 Branches 33 Tags
69eb505e2a3089828300bdad06e10adbfb307feb
Commit Graph
10939 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
armanforghani c24ca00de9 Improved style of Orchard.MediaLibrary for RTL. 2016-04-01 16:16:14 -07:00
Sébastien Ros 9fbe1138d5 Merge pull request #6699 from armanforghani/patch-2 
Adding Priority to Orchard.Resources manifest.

Fixes #6674
 2016-04-01 11:42:56 -07:00
armanforghani a9fef84f87 Adding Priority to Orchard.Resources manifest. 
Fixes #6674
 2016-04-01 23:01:09 +04:30
Sebastien Ros e888b07924 Merge branch '1.10.x' into dev 2016-03-31 16:38:16 -07:00
Sebastien Ros 4d7fd2f5ba Fixing taxonomy autocomplete editor 
Fixes #6659
 2016-03-31 16:31:53 -07:00
Sebastien Ros fbb3047195 Fixing Url.HttpRouteUrl usage 
Fixes #4766
 2016-03-31 16:31:05 -07:00
Sebastien Ros 19b8a853ff Merge branch '1.10.x' into dev 
Conflicts:
	src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml
 2016-03-31 15:33:14 -07:00
Sebastien Ros dfd045005b Reverting dependency on Common 
Fixes #6692
 2016-03-31 15:11:28 -07:00
Sebastien Ros 11454fade9 Ignoring Azure Tests for now 2016-03-31 13:32:21 -07:00
Lombiq a198decc70 Updating Azure Tests 2016-03-31 13:17:20 -07:00
Sébastien Ros a59c1a07c9 Merge pull request #6615 from jtkech/patch-5 
Fixing multi-select for Orchard.Lists

Fixes #6542
 2016-03-31 12:50:54 -07:00
Sébastien Ros 0728793e0e Merge pull request #6616 from jtkech/text-field 
Removing required attribute for default value on TextField
 2016-03-31 12:49:27 -07:00
Sébastien Ros a624080fb2 Merge pull request #6677 from Skrypt/issue/#6512 
Fixing multiple Media Library:clone

Fixes #6512
 2016-03-31 12:45:57 -07:00
Sébastien Ros b36c34bbf4 Merge pull request #6680 from jtkech/patch-6 
Removing dependency on menu.aliases-admin.css
 2016-03-31 12:31:40 -07:00
Sebastien Ros 8f2e9caa8f Merge branch '1.10.x' into dev 2016-03-31 11:45:38 -07:00
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
Sébastien Ros c2ba016abe Merge pull request #6662 from infofromca/fix6656 
Removing duplicated Newtonsoft.Json declaration

Fixes #6656
 2016-03-28 08:53:30 -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 dd59417c4a Merge pull request #6658 from fredyfx/master 
Update README.md
 2016-03-25 13:25:04 -07:00
Fredy Guibert 847364bbd2 Update README.md 
localization link: fixed
 2016-03-25 12:31:46 -07: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
Sébastien Ros 987ea2b005 Merge pull request #6652 from OrchardCMS/feature/nocloud 
Removed Azure cloud service support.
 2016-03-25 10:40:03 -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 783d569434 Orchard.proj and ClickToBuildAzurePackage.cmd: Fixing references related to building the Azure solution. Fixes #6628 2016-03-25 15:31:39 +01:00