lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 12:03:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10,662 Commits 84 Branches 32 Tags
38bf36075a400a076f8238001ef11419f562c4e9
Commit Graph

333 Commits

Author SHA1 Message Date
Sipke Schoorstra
56032dd815 Merge branch '1.9.x' into dev 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
	src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs
	src/Orchard/Mvc/HttpContextAccessor.cs
	src/Orchard/Mvc/IHttpContextAccessor.cs
	src/Orchard/Orchard.Framework.csproj
	src/Orchard/Tasks/BackgroundService.cs
 2015-06-07 00:46:14 +02:00
Sipke Schoorstra
e810d885a0 #5270: Fixed Shape type not found error. 2015-06-07 00:25:58 +02:00
Sipke Schoorstra
ce630f980c #5305: Fixing the issue where httpcontext would be resolved from the wrong lifetime scope container in certain cases. 
This changeset fixes a number of issues:
- Fixes the Autofac.Core.DependencyResolutionException: A delegate registered to create instances of 'System.Web.HttpContextBase' returned null error in VS 2015.
- Fixes indexing of layout part. The issue was that elements being rendered from a background task context and an element template uses an HTML helper, that would cause an exception since HttpContext.Current would normally be null.
- Replaces the need for injecting HttpContextBase with injecting IHttpContextAccessor (actually one should never inject HttpContextBase anymore - use IHttpContextAccessor instead).
 2015-06-04 02:06:24 +02: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
Sipke Schoorstra
cb7a52b25c Merge branch 'dev' into feature/dashboard 2015-05-20 23:47:19 +02:00
Sipke Schoorstra
22b961f7d4 Improved TokensFilter. 
Since null is an allowed value anyway.
 2015-05-20 18:56:19 +02:00
Sipke Schoorstra
74a71321de Incremental work on Dashboards. 2015-05-07 00:08:06 +02:00
Sebastien Ros
2c45b9b13e Merge branch 'master' into 1.x 2015-05-05 21:40:02 -07:00
Sipke Schoorstra
3311c9a8a4 Updated web.config files to fix intellisense for Razor view files. 
This fixes the side effect of setting CopyLocal=False on the Orchard.Framework project references where Razor intellisense was broken.
Although not necessary in most cases, I also added Orchard.Core for free, for those rare cases where a service is directly consumed in a Razor view.
 2015-05-02 10:14:29 +02:00
Gustavo Tandeciarz
7689fe7394 Fix for issue OrchardCMS/Orchard#5228 2015-05-02 02:08:43 -04:00
Sipke Schoorstra
ce6876eacf Revived default layout data initialization. 2015-04-30 18:09:26 +02:00
Sipke Schoorstra
a919aab936 Layout Canvas reusability improvements. 
This enables child canvas elements to be moved around and removed.
 2015-04-30 17:35:03 +02:00
Sebastien Ros
ddfb72faaa Updating version number 2015-04-28 12:14:30 -07:00
Sipke Schoorstra
8dbd003f61 Implemented import/export for element definitions. 2015-04-28 18:10:45 +02:00
Sipke Schoorstra
c9d30d6cc2 Merge branch '1.9-int' into 1.x 2015-04-25 10:31:55 +02:00
Sipke Schoorstra
28f6cb27d9 #5153: Fixed *elementEditorModel* deserialization issue. 2015-04-22 17:26:43 +02:00
Sipke Schoorstra
c32d4f485b Merge branch 'feature/layoutzones' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsPartHandler.cs
 2015-04-22 13:09:36 +02:00
Sipke Schoorstra
b639d893c0 Work on selectable container elements. 2015-04-21 23:08:29 +02:00
Sipke Schoorstra
5dabbf7aec Merge branch '1.9-int' into 1.x 2015-04-21 15:00:42 +02:00
Sipke Schoorstra
54c53b7a12 Incremental work on selectable elements. 2015-04-20 23:07:27 +02:00
Sipke Schoorstra
dd34d87ac9 Relaxed focus targets to allow pasting of elements into templated containers. 2015-04-19 22:18:43 +02:00
Sipke Schoorstra
dacdbdffb2 Canvas everywhere. 2015-04-19 22:13:09 +02:00
Sipke Schoorstra
f5e4ef8fe5 Merged Rules with Properties. 2015-04-19 21:42:39 +02:00
Sipke Schoorstra
b239a492b4 Improved design view of Menu and Breadcrumbs elements. 2015-04-19 21:38:02 +02:00
Sipke Schoorstra
195d8711f9 Removed Zones integration. 2015-04-19 21:18:31 +02:00
Sipke Schoorstra
7be9428fac Implemented Menu and Breadcrumbs elements. 2015-04-19 21:12:28 +02:00
Sipke Schoorstra
df9eb83a6c Restored broken collapsible implementation. 2015-04-19 20:51:15 +02:00
Sipke Schoorstra
73ee4d1e37 Fixed Notifications issue by handling null HTTP contexts. 2015-04-19 19:33:10 +02:00
Sipke Schoorstra
8f84a011b6 Fixed popup CSS. 2015-04-19 19:30:43 +02:00
Sipke Schoorstra
a9df078ce3 Fixed a Notifications design display bug. 2015-04-19 18:45:53 +02:00
Sipke Schoorstra
838cd0a99a Added Notifications element. 2015-04-19 18:43:27 +02:00
Sipke Schoorstra
eb6285012a Added CreatingDisplay event to ElementDriver. 2015-04-19 18:43:05 +02:00
Sipke Schoorstra
bfa6f1326e Updated Snippet design shape template. 2015-04-19 17:26:02 +02:00
Sipke Schoorstra
1a889594d9 Improved UI element style. 2015-04-19 17:23:08 +02:00
Sipke Schoorstra
6727e61f6c Merge branch '1.9-int' into feature/layoutzones 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Column.cshtml
	src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsPartHandler.cs
 2015-04-19 14:33:40 +02:00
Sipke Schoorstra
c525bda388 Added rule editor to other element types. 2015-04-19 11:40:13 +02:00
Sipke Schoorstra
d5f75a242d Implemented element rules. 2015-04-19 11:31:53 +02:00
Sipke Schoorstra
24776bf9ee Fixed copy/paste issue with Html element. 2015-04-18 20:48:50 +02:00
Sipke Schoorstra
b3b75b3d74 Fixed copy/paste issue with Html element. 2015-04-18 20:48:16 +02:00
Sipke Schoorstra
3e6043b6d7 Merge branch '1.9-int' into 1.x 
Conflicts:
	src/Orchard.Web/Modules/Orchard.MediaLibrary/MediaFileName/MediaFileNameEditorSettings.cs
	src/Orchard.Web/Modules/Orchard.Search/Handlers/SearchSettingsPartHandler.cs
 2015-04-17 15:12:28 +02:00
Sipke Schoorstra
dea42e518b Cleaned up element views. 2015-04-17 14:34:00 +02:00
Kees Damen
ee1b7a5088 Merge branch '1.x' of https://github.com/keesd/Orchard into 1.x 2015-04-16 16:29:42 +02:00
Kees Damen
2cfcdfaa8b Fixed project references to Orchard.Core and Orchard.Framework 2015-04-16 16:23:12 +02:00
Sipke Schoorstra
840aea5ff0 #21391: Fixed layout and shape rendering from background processes. 2015-04-13 15:44:40 +02:00
Sipke Schoorstra
1f3c5cc1a4 Simplified URL encoding/decoding of layout editor data. 
This also fixes an issue with certain rendered HTML as part of he element editor model object.
 2015-04-10 17:38:48 +02:00
Sipke Schoorstra
1a02d106a8 Added unique zone name validation. 2015-04-05 13:49:39 +02:00
Sipke Schoorstra
c044118b3f Implemented blended positioned rendering. 2015-04-05 12:10:51 +02:00
Sipke Schoorstra
11dc9309f0 Implemented collapsible columns. 2015-04-04 17:22:17 +02:00
Sipke Schoorstra
42d7eeec18 Implemented layout zones caching and changed zone harvesting to collect zones from all layouts. 2015-04-04 15:08:29 +02:00