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 2 Packages Projects Releases Wiki Activity
10,523 Commits 94 Branches 33 Tags
2f6f020d5d2ed1af12cffbd1ce970d20b308a4ef
Commit Graph
61 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jtkech 1858a1eaf5 Merge branch 'dev' into patch-8 
Conflicts:
	src/Orchard/Environment/State/ContextState.cs
 2016-02-14 04:07:19 +01:00
jtkech 3f11bf1903 Merge branch 'dev' into patch-7 
Conflicts:
	src/Orchard/Mvc/MvcModule.cs
 2016-02-14 03:50:22 +01:00
jtkech d151573cce Merge pull request #5 from OrchardCMS/dev 
Sync from Orchard dev
 2016-02-14 03:30:53 +01:00
jtkech 9e28fbe2a5 Update HttpContextBaseExtensions.cs 2016-02-10 05:10:40 +01:00
jtkech 920d577bb2 Update HttpContextAccessor.cs 2016-02-10 05:08:19 +01:00
jtkech ab2b88676e Update MvcModule.cs 2016-02-09 02:07:50 +01:00
jtkech b126dc4495 Update ContextState.cs 2016-02-05 02:27:37 +01:00
jtkech 1248fcc826 Update MvcModule.cs 2016-02-05 01:07:54 +01:00
jtkech 854c4ef73c Update Index.cshtml 2016-02-05 00:08:35 +01:00
jtkech 0e3e7f0c90 Update OutputCacheFilter.cs 2016-02-05 00:04:20 +01:00
jtkech 7237437c14 Update FrontEndCultureSelector.cshtml 2016-01-15 03:13:20 +01:00
jtkech 45ea8513a2 Update WorkContextImplementation.cs 2015-12-26 23:16:19 +01:00
jtkech 498c4d2c91 Update BackgroundService.cs 2015-12-25 03:53:48 +01:00
jtkech 3e900affb2 Update HttpContextAccessor.cs 2015-12-25 03:35:41 +01:00
jtkech 17a74705ce Update WorkContextExtensions.cs 2015-12-25 03:32:20 +01:00
jtkech 2abd9165b0 Update WorkContextAccessor.cs 2015-12-25 03:29:25 +01:00
jtkech 842e0eda97 Update WorkContextModule.cs 2015-12-25 03:23:50 +01:00
jtkech 433c087136 Update IWorkContextAccessor.cs 2015-12-25 03:21:01 +01:00
jtkech 981c1cb056 Update HttpContextAccessor.cs 2015-12-17 07:08:12 +01:00
jtkech 3e9259ab68 Update DefaultLayerEvaluationService.cs 2015-12-17 03:22:26 +01:00
jtkech 36c5f1070f Update Tokenizer.cs 2015-12-17 00:23:12 +01:00
jtkech 5f65c5101d Merge branch 'dev' into patch-2 
Conflicts:
	src/Orchard.Tests/Environment/DefaultWorkContextAccessorTests.cs
	src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs
	src/Orchard.Tests/Tasks/SweepGeneratorTests.cs
	src/Orchard/Environment/WorkContextAccessor.cs
	src/Orchard/Mvc/MvcModule.cs
 2015-12-15 06:12:42 +01:00
jtkech 9a091b7c01 Merge pull request #4 from OrchardCMS/dev 
Sync dev
 2015-12-15 05:29:21 +01:00
jtkech e72b8c4bed Update SweepGeneratorTests.cs 2015-12-11 01:40:35 +01:00
jtkech e889288687 Update DefaultShellContextFactoryTests.cs 2015-12-11 01:39:35 +01:00
jtkech 095a22eb6e Update DefaultWorkContextAccessorTests.cs 2015-12-11 01:37:58 +01:00
jtkech d34eba4b99 Update HttpContextAccessor.cs 2015-12-11 01:33:19 +01:00
jtkech a7b4d8c6ca Update WorkContextAccessor.cs 2015-12-11 01:31:00 +01:00
jtkech 9593155cb6 Update HttpContextAccessor.cs 2015-12-08 20:56:20 +01:00
jtkech f3b3e0a7fb Update WorkContextAccessor.cs 2015-12-08 20:54:53 +01:00
jtkech a33471183f Update MvcModule.cs 2015-12-06 05:18:48 +01:00
jtkech 9296358cbe Update ImageProfilePartHandler.cs 2015-11-29 02:20:36 +01:00
jtkech 1341133ad5 Merge pull request #1 from OrchardCMS/dev 
Update from original
 2015-11-13 02:30:54 +01:00
jtkech b6adf43b5d Update JobsQueueProcessor.cs 2015-11-03 09:03:58 +01:00
jtkech 348461d41f Update MvcModule.cs 2015-10-29 00:24:44 +01:00
jtkech d2ef174479 Update HttpContextBaseExtensions.cs 2015-10-20 05:59:40 +02:00
jtkech fbd0f878f5 Update MvcModule.cs 2015-10-20 05:56:27 +02:00
jtkech 0384c55011 Update MvcModule.cs 2015-10-20 05:46:40 +02:00
jtkech afd80a8c72 Update HttpContextAccessor.cs 2015-10-20 05:44:28 +02:00
jtkech 9bdf130cc9 Update WorkContextAccessor.cs 2015-10-20 05:40:01 +02:00
jtkech 44a342c4fe Update DefaultCacheStorageProvider.cs 2015-10-02 02:15:08 +02:00
jtkech 850a39bd8b Update OrchardLog4netLogger.cs 2015-10-01 21:22:21 +02:00
jtkech f3902feb35 Update WorkContextAccessor.cs 2015-10-01 21:09:44 +02:00
jtkech 46de0273d5 Update CompositionStrategy.cs 2015-08-29 00:27:09 +02:00
jtkech 1ed973ab88 Update MediaController.cs 2015-08-14 00:29:02 +02:00
jtkech c4d20e3b73 Update ContentPickerController.cs 2015-08-14 00:14:57 +02:00
jtkech 07efdb267a Update Routes.cs 2015-08-13 23:27:40 +02:00
jtkech 93476c321a Update DefaultDataMigrationInterpreter.cs 
Remove incorrect plus characters that break the compilation
 2015-07-24 20:31:25 +02:00
jtkech e8111cef5e Update DynamicContentItemTests.cs 
Adds an unit test for null checking on dynamic ContentItem / ContentPart properties
 2015-07-24 02:54:01 +02:00
jtkech 28643ae7b8 Update ContentPart.cs 2015-07-20 02:23:56 +02:00
jtkech 70ea2df334 Update ContentItem.cs 2015-07-20 02:11:49 +02:00
jtkech 230314d7a1 Update StringLength.cs 2015-07-18 02:26:14 +02:00
jtkech c2d18f216a Update AdminController.cs 2015-05-28 21:33:08 +02:00
jtkech ff9d7aca51 Update Edit.cshtml 2015-05-25 21:42:00 +02:00
jtkech 1c81a77302 Update AdminController.cs 2015-05-25 21:37:37 +02:00
jtkech ae18e0b817 #5235: Awaiting activities not cleared on saving 2015-05-07 21:37:04 +02:00
jtkech 61b8f82fd7 #5234 Duplicate lines in WorkflowManager 2015-05-07 21:24:08 +02:00
jtkech 6615ea961e #5113: SecureSocketsLayerService: Incorrect Hostname when port number is included 
For example, with a hostname = "localhost:44300", the UriBuilder.Host becomes "44300"
 2015-04-25 04:11:16 +02:00
jtkech 009edb8d75 #5148: Default recipe error logged on setup 2015-04-18 01:03:04 +02:00
Jean-Thierry Kéchichian 30c43ad130 #20318: Fixing Custom Forms submission. 
Work Item: 20318
 2013-12-10 18:05:22 +00:00
Jean-Thierry Kéchichian 99bcc5a881 #20318: Fixing Custom Forms submission. 
Work Item: 20318
 2013-12-07 16:34:11 +01:00