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,628 Commits 94 Branches 33 Tags
4a5a5a3b0b6b2d9012d14bb016bc68c99c0747f2
Commit Graph

10628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lombiq
4a5a5a3b0b Orchard.proj: tweaking/fixing NUnit executable discovery 2016-03-28 11:43:27 +02:00
Lombiq
da4ff5277a Orchard.proj: fixing that the "Compile" build target should be a dependency of "Test" 2016-03-28 00:02:43 +02:00
Lombiq
2f85021753 Removing "lib/nunit" 2016-03-28 00:01:24 +02:00
Lombiq
4a2255ddf9 Orchard.proj: modifying the NUnit-related activities to use the restored NuGet package (instead of "lib\nunit") 2016-03-28 00:00:50 +02:00
Lombiq
dd81c3c2bd Upgrading Moq to the latest version (4.0.10827 -> 4.2.1510.2205) in all test projects 2016-03-27 22:33:53 +02:00
Lombiq
075287b958 Orchard.Azure.Tests: adapting test initialization to Azure SDK (according to version 4.2) 2016-03-27 22:03:23 +02:00
Lombiq
4bf21bb177 Orchard.Azure.Tests: standardizing NuGet package usage (Moq, NUnit) 2016-03-27 20:41:56 +02:00
Lombiq
8f59a764a1 Orchard.Azure: fixing that AzureBlobShellSettingsManager should create the container for ShellSettings if it doesn't exist 2016-03-27 20:40:27 +02:00
Lombiq
cfdeb53323 Orchard.Azure.Tests: fixing AzureBlobStroageProvider test case (assigning the default MIME-type) 2016-03-27 20:17:29 +02:00
Lombiq
4ed0f4651e Orchard.Azure.Tests: Code styling in AzureVirtualEnvironmentTest.cs 2016-03-27 20:04:12 +02:00
Lombiq
a6f46d17cd Fixing references to NuGet package dlls (Orchard.Azure, Orchard.Azure.Tests, Orchard.Framework) 2016-03-26 16:16:32 +01: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
Sébastien Ros
b1f0c4bc36 Merge pull request #6634 from SzymonSel/dev 
[Fixes #6410] Moved Notifier extention change to dev branch
 2016-03-24 12:47:28 -07: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
Szymon Seliga
dd37d8693c #6140 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
 2016-03-22 21:16:39 +01:00
Sebastien Ros
24691e8fb8 Merge branch 'master' into dev 2016-03-17 10:05:46 -07:00
Sebastien Ros
6dcbbc2d93 Merge branch '1.10' 1.10 2016-03-17 09:53:07 -07:00
Lombiq
ea45c4f825 Autoroute: fixing T-string syntax in AutoroutePartHandler and updating its text 2016-03-15 19:02:51 +01:00
Benedek Farkas
b4c782a4ad Merge remote-tracking branch 'origin/1.9.3' into 1.10 2016-03-15 18:47:52 +01:00
Lombiq
36df2fe1a1 TheAdmin: updating description in Theme.txt 1.9.3 2016-03-15 18:46:17 +01:00
Benedek Farkas
35ab4117ef Merge remote-tracking branch 'origin/1.9.3' into 1.10 2016-03-14 20:33:24 +01:00
Benedek Farkas
0d9d8d6b2a Merge pull request #6573 from RoyalVeterinaryCollege/6572 
Issue #6572: Add only existing terms for the field.
 2016-03-14 20:32:49 +01:00
Benedek Farkas
4a0230d88c Merge remote-tracking branch 'origin/1.9.3' into 1.10 2016-03-14 19:17:54 +01:00
Lombiq
356e8230ab Taxonomies: fixing that the term admin index page should sort terms. Fixes #6548 2016-03-14 19:17:03 +01:00
Sebastien Ros
3ea1b100d6 Excluding PDBs from deployment packages 2016-03-14 10:54:59 -07:00
Sebastien Ros
d4c03997f6 [Fixes #6577] Exclude nuget packages from artifacts 2016-03-14 10:24:11 -07:00
Jeff
244cb6c6f4 Issue #6572: Add only existing terms for the field. 2016-03-11 11:49:31 +00:00
Lombiq
cbd2ae71e1 Media Library: Removing the forced reinitialization of Recent on page load. Fixes #6490 2016-03-09 18:39:46 +01:00
Sébastien Ros
7fb4740e29 Merge pull request #6554 from jtkech/patch-20 
Fixing TextField default values
 2016-03-08 17:22:34 -08:00
jtkech
cf5ada1d4b Update TextFieldDriver.cs 2016-03-09 01:49:13 +01:00
jtkech
4664416472 Update TextFieldDriver.cs 2016-03-09 01:47:33 +01:00
Sebastien Ros
1def97d9ce [Fixes #6397] Allowing the default tenant settings to be edited 2016-03-08 14:47:46 -08:00
Sébastien Ros
2b12a43385 Merge pull request #6520 from infofromca/fieldduplicated 
[Fixes #6497] 1.10 Field names duplicated in dropdown list,
 2016-03-08 09:39:28 -08:00
andy zheng
a92ef7c4de Fixes 2 little issues in dev around the TextField default values 2016-03-06 21:58:38 -05:00
Sipke Schoorstra
cb0fe9da31 Merge remote-tracking branch 'origin/1.10' into dev 2016-03-06 18:19:19 +01:00
Sébastien Ros
074fa7974a Merge pull request #6525 from kumards/patch-2 
Incorrect data being returned for nonexistent primitive datatypes
 2016-03-03 12:15:50 -08:00
Sébastien Ros
a91b06f1b5 Merge pull request #6528 from dcinzona/razor-view-engine 
[Fixes #6514] Update RazorViewEngineProvider.cs
 2016-03-03 12:12:34 -08:00
Another Developer
008edc46ef Incorrect data being returned for nonexistent primitive datatypes 
default(T) returns non null value for primitive datatypes, this causes CachingExtensions.Get<T> never to call the factory method.
 2016-03-03 09:27:20 -05:00
Sipke Schoorstra
3690968646 Fixed Dynamic Forms Bindings issue. Fixes #6470 
ModelBinding failed due to the "null" key being specified. Instead, the type name of the model should be specified as the key (which happens by default when no key is specified). Not sure how this worked before, since this code has been there from the beginning, and file histories don;t show an obvious change. Perhaps due to the upgrade to newer ASP.NET MVC?
 2016-03-02 23:51:22 +01:00
Lombiq
6c93bf4d69 Merge remote-tracking branch 'origin/1.9.3' into 1.10 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/Parts/MediaLibrary.Navigation.cshtml
 2016-03-01 22:02:06 +01:00
Gustavo Tandeciarz
328c818ce5 Update RazorViewEngineProvider.cs 2016-03-01 15:10:35 -05:00
Sipke Schoorstra
23449d9b32 Merge pull request #6507 from jtkech/patch-15 
ContextState: Attempt to fix specflows on teamcity
 2016-02-29 22:49:13 +01:00
jtkech
77024336f9 Update ContextState.cs 2016-02-29 22:11:01 +01:00
jtkech
9a8a215a98 Update Web.config 2016-02-29 22:06:27 +01:00
jtkech
2351978275 Update Web.config 2016-02-29 22:02:49 +01:00
Sipke Schoorstra
fe25545d50 Merge pull request #6498 from jtkech/patch-14 
ContextState: Attempt to fix cross app domain issues on teamcity
 2016-02-27 22:26:27 +01:00
jtkech
39a01f9103 Update ContextState.cs 2016-02-27 22:20:32 +01:00
Sipke Schoorstra
d010e97b9d Merge pull request #6492 from jtkech/patch-13 
ContextState Compromise
 2016-02-27 00:03:57 +01:00