lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
9,410 Commits 83 Branches 32 Tags
0e1cca0fce31195b638c2ee2e0ffceaeb0168d9a
Commit Graph

9410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Hazza
98475f7aa0 fixing placementeditor try/catch block 2015-05-16 16:34:20 +01: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
Bertrand Le Roy
d1fa8d4daf Update Readme to reflect the most recent mission statement. patch-20150519 2015-05-06 10:43:45 -07: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
Sebastien Ros
8b9c25a0a0 Updating version and license 2015-04-28 11:07:04 -07:00
Sebastien Ros
cdd3722009 Forcing POST method on user moderation actions 2015-04-28 10:27:40 -07:00
Sipke Schoorstra
02fbd2e1f2 Merge branch '1.8.x' into 1.9-int 2015-04-27 16:04:17 +02:00
Sipke Schoorstra
e557151b28 Merge branch '1.8.2-int' into 1.8.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
 2015-04-27 16:01:10 +02:00
Sipke Schoorstra
a88d68ee7a Added missing *Types* property to ContentPicker shape. 
This fixes an issue where you could not configure the content picker shape to filter the available content items by types or types with certain parts.
 2015-04-27 14:05:50 +02:00
Sipke Schoorstra
ae17c75a5e Fixed controller for SELECT input controls. 
When using a SELECT input control, that control itself would be initialized with the call to "toggleWhatYouControl" instead of its child OPTION elements.
 2015-04-27 08:36:38 +02:00
Sipke Schoorstra
363ae13ef7 #5137: Fixed homepage being lost when content with empty alias is removed. 2015-04-26 13:58:22 +02:00
Sipke Schoorstra
20adb3bf51 Merge branch '1.8.x' into 1.9-int 2015-04-25 10:24:31 +02:00
Sipke Schoorstra
060720e92c Minor code formatting + cleanup. 2015-04-25 10:20:00 +02:00