lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
10,416 Commits 83 Branches 32 Tags
cce9b3172eac0078549d5877d7468c3e80f15e57
Commit Graph

10416 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lombiq
79b0b809ca Fixing that when editing blog posts permissions were mistakenly checked for the blog instead of the post 2016-01-06 14:49:57 +01:00
Rob King
6a0617b11a Restored MSBuild directory 2016-01-06 10:53:24 +00:00
Rob King
93ec5ea543 Merge branch 'dev' of https://github.com/OrchardCMS/Orchard into replace-lib-with-nuget 2016-01-06 10:36:08 +00:00
Lombiq
7fa4783b1d Fixing leftover MVC references by changing them to also use packages 2016-01-06 01:04:40 +01:00
Lombiq
e04b020132 Add missing IdentityPart (needed for export/import) to ContainerWidget 2016-01-04 19:16:48 +01:00
Lombiq
aaced541e3 Adding WithIdentity() content metadata helper to add IdentityPart in migrations and changing affected code to use this 2016-01-04 19:09:00 +01:00
Sipke Schoorstra
c642bc0174 Merge pull request #6253 from Codinlab/patches/media-library-picker 
Fix media-library-picker.js
 2015-12-31 14:40:33 +01:00
Thierry Fleury
1a7eae5dc1 Fix media-library-picker.js 2015-12-31 14:10:25 +01:00
Sipke Schoorstra
fde4c32aff Fixed activity toolbox filtering. 
Due to a bug in the orchard-workflows.js script, the activity toolbox filter was broken.
 2015-12-30 17:52:46 +01:00
Sipke Schoorstra
c8b5664d26 Fixed a bug in HomeAliasService 
The bug would cause a null reference exception in case there is no alias with an empty string (the home alias).
 2015-12-30 17:28:23 +01:00
Sipke Schoorstra
d21aae3506 Merge pull request #6250 from infofromca/fix6245b 
second time to fix #6245
 2015-12-30 16:10:20 +01:00
andy zheng
0a8fa5b99a second time to fix #6245 2015-12-30 09:56:59 -05:00
Sipke Schoorstra
64d8c1a16f Added handling of nullable enums. 
This enables content parts to use infoset storage with nullable enum types.
Before this change, the NotSupportedException would be thrown.
 2015-12-30 14:20:26 +01:00
Sipke Schoorstra
bd1a1eb6e6 Merge pull request #6191 from Codinlab/fixes/6189 
Fixes #6189 : TextAreaElement throwing on null ProcessedValue
 2015-12-28 16:25:39 +01:00
Sipke Schoorstra
d1fd7cd271 Improved class attribute logic. 
This change fixes that the `"class"` attribute would be added to the tag even if there are no css classes to assign. This in turn has the effect that the root `Canvas` element is not rendering its outer tags needlessly by default (only if it has at least one attribute).
 2015-12-28 16:05:54 +01:00
Nicholas Mayne
d13a467882 Merge pull request #6239 from Codinlab/patches/LuceneLogger 
Remove duplicate Logger assignation
 2015-12-28 10:54:34 +00:00
Thierry Fleury
66963d1845 Remove duplicate Logger assignation 2015-12-28 10:27:36 +01:00
jtkech
45ea8513a2 Update WorkContextImplementation.cs 2015-12-26 23:16:19 +01:00
Sipke Schoorstra
49317ec33f Giving back Classes to the Shapes. 
This fixes a limitation where the Classes property on an element shape would be ignored when rendering tags using attributes returned from the TagBuilderExtensions.GetCommonElementAttributes method.
 2015-12-25 14:43:43 +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
Sipke Schoorstra
8ee37a6de0 Merge pull request #6218 from paynecrl97/patch-3 
Use Display Name to show validation messages
 2015-12-22 22:24:24 +01:00
Lombiq
37b97eaa26 Move Mono DLL from the Orchard.Scripting.CSharp module to the root lib folder 2015-12-22 21:57:25 +01:00
Sipke Schoorstra
4418bcdc19 Fixed a bug in LayoutModelMapper. 
If the root Canvas is manually instantiated, it will not have a valid ElementDescriptor.
 2015-12-22 20:21:28 +01:00
Chris Payne
28e2e8f695 Use Display Name to show validation messages 2015-12-22 16:44:24 +00:00
Rob King
9ee7715386 Moved WindowsAzure.Diagnostics to Orchard NuGet Feed 2015-12-22 11:39:28 +00:00
Rob King
75161221ee Moved WindowsAzure.ServiceRuntime to Orchard NuGet Feed 2015-12-22 11:37:14 +00:00
Rob King
123c53243a Removed FluentPath from lib folder 2015-12-22 10:09:34 +00:00
Rob King
89f0213a78 Merge branch 'dev' of https://github.com/OrchardCMS/Orchard into replace-lib-with-nuget 
Conflicts:
	src/Orchard.Web/Core/Orchard.Core.csproj
	src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj
 2015-12-22 09:48:44 +00:00
Sipke Schoorstra
a492f89ea0 Further Layouts client-side scripting improvements. 
- Pushed the editElement function further down from Content to Element, which means even less code for custom container elements.
- Fixed a bug where client-side element editor state would not be applied after editing that element.
- Pushed down the toObject function from Content to Element, which means less code is necessary for custom container elements.
-
 2015-12-21 20:59:47 +01:00
Sipke Schoorstra
d1c0f98010 Updated Layouts to simplify custom container elements. 
These changes simplifies the requirements for implementing custom container elements by minimizing the amount of code necessary to tie things together.
 2015-12-21 19:48:59 +01:00
Thierry Fleury
c45da04455 Close #2027 : Add role rule in Orchard.Widgets module 2015-12-20 19:54:21 +01:00
Sipke Schoorstra
8eef43f20d Fixed media library picker field script. 
This fixes an issue where the code selecting the 'Save' button would match any button with the 'button.save' class.
The issue became apparent when working with Image element on a layout. The Element Editor Dialog also has a 'Save' button with the 'button save' class, en became hidden when no image was selected.
 2015-12-20 16:37:57 +01:00
Sipke Schoorstra
68c94f4534 Fixed a potential issue with new Container elements. 
Making the ContentModelMap the default mapper for all elements fixes a potential issue when a new Container element is introduced but no model map implementation exists for that container. Letting the ContentModelMap handle the mapping by default would yield best results rather than doing no mapping at all.
 2015-12-20 16:33:34 +01:00
Sipke Schoorstra
9715ee88df Removed unnecessary Html model map. 
The Html model mapping was originally needed to support inline editing of Html elements, but that capability has been removed.
 2015-12-20 16:28:36 +01:00
Lombiq
c216480ca0 Adding the ability to specify tokenized default values for content fields, fixes #5934 
And also fixing build error. *Shame!*
 2015-12-19 20:49:13 +01:00
Lombiq
2835a0db29 Creating helpers for settings based metadata scenarios to be used in migrations, fixes #4693 2015-12-19 20:01:32 +01:00
sfmskywalker
72aa82c048 Merge branch '1.9.x' into dev 
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutDesignerHost.js
 2015-12-18 00:33:56 +01:00
Sébastien Ros
da8898e946 Merge pull request #6178 from Jwheuvel/1.9.x 
All /lib dll files are now correctly taken into account when using git
 2015-12-17 12:32:38 -08:00
Sébastien Ros
2853197117 Merge pull request #6183 from mvarblow/issue-1978 
[Fixes #1978] Extending MarshalByRef object lease
 2015-12-17 12:32:04 -08:00
Sébastien Ros
9bba785d42 Merge pull request #5966 from jtkech/patch-2 
Experimental work on HttpContext, WorkContext and async code in background tasks
 2015-12-17 12:28:44 -08:00
Sébastien Ros
8a065d496d Merge pull request #6194 from jtkech/patch-6 
[Fixes #6193] TokenFilters Cohabitation
 2015-12-17 12:18:40 -08:00
Sébastien Ros
cc1ceec277 Merge pull request #6195 from jtkech/patch-7 
Reverting query hints on layers
 2015-12-17 12:16:10 -08: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