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
8,969 Commits 94 Branches 33 Tags
f13c9d47c7335b6aec35b294f61bad4c91fb8ed0
Commit Graph
8969 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
paynecrl97 f13c9d47c7 Adds more detail to itemDescriptor 2015-06-17 16:05:53 +01:00
paynecrl97 1a8b17d04e Defers output cache key creation until we know we need it 2015-06-17 14:02:05 +01:00
Sipke Schoorstra e810d885a0 #5270: Fixed Shape type not found error. 2015-06-07 00:25:58 +02:00
Lombiq 0c7b52e1be #5355: Fixing that the selected terms in a TaxonomyField were cleared out when updating an editor group the field isn't displayed in 2015-06-06 00:34:55 +02:00
Lombiq 30411b6be5 #5348: Splitting ItemDisplayText in two (fixing the fix) 2015-06-06 00:32:29 +02:00
Sébastien Ros c3379489d7 #5348: Splitting ItemDisplayText in two 2015-06-04 12:51:58 -07:00
Sébastien Ros 5c5ce99083 Merge pull request #5338 from qt1/IBN-Labs/Schemabuilder.TableDbName 
Provide full table name prefix for migrations
 2015-06-04 12:32:30 -07:00
Sébastien Ros e709593197 Merge pull request #5321 from Xeevis/1.9.x 
#5109: Email field shouldn't specify email type in design mode
 2015-06-04 12:23:18 -07:00
Sébastien Ros 1b8e00a9c6 Merge pull request #5256 from jtkech/patch-4 
#5235: Awaiting activities not cleared on saving
 2015-06-04 12:04:31 -07:00
qt1 5b468b0ce0 remove fix for automatic addition of is null (maybe a different PR) 2015-06-01 03:33:14 +03:00
qt1 6e94264df2 Provide full table name prefix for migrations 2015-06-01 02:07:42 +03:00
Lombiq 917fd8425f Fixing ComponentNotRegisteredException during setup, fixes #4159 
Added fix by jtkech.
 2015-05-31 18:15:29 +02:00
Lombiq ee0bd03c04 Fixing that Output Cache storage providers could fail with an ObjectDisposedException due to a deferred delegate execution causing the usage of dependencies from a disposed lifetime scope. 2015-05-30 01:37:31 +02:00
Sébastien Ros 3d25ca42c9 #5327: Fixing Orchard.Roles web.config file 2015-05-28 12:50:07 -07:00
jtkech c2d18f216a Update AdminController.cs 2015-05-28 21:33:08 +02:00
Sébastien Ros 7b6e7deea7 Merge pull request #5314 from Skrypt/Fixing-#4963 
Fixing #4963
 2015-05-28 12:20:17 -07:00
Sébastien Ros 52038c677e Merge pull request #5313 from Skrypt/fixed-#5281 
Fixing #5281
 2015-05-28 12:19:48 -07:00
Sipke Schoorstra 53e58f60fe #5306: Minor refactoring of background http context factory. 2015-05-27 16:36:51 +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
Xeevis 3b5de0679f #5109: Email field shouldn't specify email type in design mode 
When email type is specified on an input it triggers browser validation on that field which prevents administrator from inserting tokens like {User.Email}.
 2015-05-25 01:08:59 +02:00
Sipke Schoorstra ef2abe14cb #5306: Implemented a background HttpContext factory. 
This change instantiates an actual HttpContext object during background sweeps so that Razor templates using Html Helpers (that require HttpContext.Current to be not-null) won't fai lwhen being rendered.
 2015-05-22 15:37:51 +02:00
Skrypt 754114c8e6 Rebase on 1.9.x since this is a bug fix 
Fixing #4963
 2015-05-21 16:23:27 -04:00
Skrypt 6eb9e0d457 Fixing #5281 2015-05-21 16:10:09 -04:00
Sébastien Ros 3e55c1649e Merge pull request #5273 from Xeevis/1.9.x 
#5224: Fix for missing charset in response header for cached output
 2015-05-21 12:21:59 -07:00
Sipke Schoorstra ce36e115d0 Removed unnecessary field. 2015-05-21 17:25:50 +02:00
Sipke Schoorstra 4d242e83df #5306: Injecting HttpContextBase directly. 
This will ensure that an actual HttpContext object will be available in case of background task operations thanks to the way HttpContextBase is registered (providing a placeholder object in case of background operations).
 2015-05-21 17:24:45 +02:00
Sébastien Ros 475feb923d Merge pull request #5278 from mvarblow/1.9.x 
Fix for Issue #5274 - Faulty import in SslSettingsPartDriver
 2015-05-14 12:58:40 -07:00
mvarblow ce728380a1 Merge pull request #1 from mvarblow/mvarblow-patch-5274 
Update SslSettingsPartDriver.cs
 2015-05-14 15:49:45 -04:00
Sébastien Ros d53d7346ee Merge pull request #5276 from mvarblow/mvarblow-patch-5275 
Mvarblow patch 5275
 2015-05-14 12:42:12 -07:00
Sipke Schoorstra f8c6feea86 #5216: Added call to *InitHelpers*. 
This will cause various helpers to be initialized, such as the *Html* property.
 2015-05-14 10:24:04 -07:00
Lombiq b98d35305a Revert "Indexing task creation now happens gradually in a background task, preventing timeout/out of memory when editing a content type with many items. Fixes #4729." 
Commit moved to dev branch as it's not a completely safe change.

This reverts commit 40243f2224.
 2015-05-14 12:54:02 +02:00
mvarblow fa7bf025b9 Update MediaItems.cshtml 2015-05-13 16:57:10 -04:00
mvarblow f5862bd628 Update MediaController.cs 
Fix for issue https://github.com/OrchardCMS/Orchard/issues/5275.  The fix is to return the FolderPath element in the response to the media search request so that the folderPath check in the javascript code succeeds.
 2015-05-13 16:54:23 -04:00
mvarblow 2339bdc966 Update SslSettingsPartDriver.cs 
Fixed issue 5274
 2015-05-13 16:45:55 -04:00
Xeevis 7cdb984f4f #5224: Fix for missing charset in response header for cached output 2015-05-13 15:24:46 +02:00
Lombiq 40243f2224 Indexing task creation now happens gradually in a background task, preventing timeout/out of memory when editing a content type with many items. Fixes #4729. 2015-05-11 23:17:58 +02:00
Lombiq 91e040e684 Fixing that the technical names of widgets couldn't contain hyphens, see #4981 2015-05-11 16:52:54 +02:00
jtkech ae18e0b817 #5235: Awaiting activities not cleared on saving 2015-05-07 21:37:04 +02:00
Sébastien Ros 73336e19ba Merge pull request #5255 from jtkech/patch-3 
#5234 Duplicate lines in WorkflowManager
 2015-05-07 12:30:58 -07:00
jtkech 61b8f82fd7 #5234 Duplicate lines in WorkflowManager 2015-05-07 21:24:08 +02:00
Sebastien Ros a35cc754a4 Merge branch 'master' of https://github.com/OrchardCMS/Orchard 2015-05-05 21:51:13 -07:00
Daniel Stolt 12a95c0335 Fixed missing assembly binding redirects for Azure Storage. 1.9 2015-05-02 22:48:23 +02:00
Sebastien Ros 72534d632d Adding more detailed message on failing tests 2015-04-29 15:15:43 -07:00
Sebastien Ros d941ea1509 Fixing failing culture based test on CI 2015-04-29 15:15:20 -07:00
Sebastien Ros 6ff69e27fd Fixing specflow tests 2015-04-29 13:04:19 -07:00
Sebastien Ros dd8d793a40 Adding unsafeUrl support in specflow tests 2015-04-29 13:04:08 -07:00
Sebastien Ros 6164729808 Fixing some specflow tests 2015-04-28 18:32:59 -07:00
Sebastien Ros ddfb72faaa Updating version number 2015-04-28 12:14:30 -07:00
Sebastien Ros d25eb61fe7 Merge branch '1.8.2-int' into 1.9-int 
Conflicts:
	src/Orchard.Profile/Tests/Profiling.feature.cs
	src/Orchard.Web/Modules/Orchard.jQuery/Scripts/jquery-ui-timepicker-addon.js
 2015-04-28 11:44:09 -07:00