Commit Graph

5923 Commits

Author SHA1 Message Date
Levent Esen
2d2b4a0563 Update ContentPicker.Edit.cshtml link
Update for issue #6267
2016-01-11 02:22:35 +02:00
Sébastien Ros
76e55c3d16 Merge pull request #6217 from gcsuk/replace-lib-with-nuget
[Fixes #6148] Replace lib with nuget
2016-01-07 12:53:42 -08:00
Sébastien Ros
2d42c74395 Merge pull request #6207 from Codinlab/features/2027
[Fixes #2027] Add role rule  in Orchard.Widgets module
2016-01-07 12:35:31 -08:00
Sébastien Ros
050b3e2acf Merge pull request #6187 from PaulDevenney/Bug/FixImportExportCommand
[Fixes #6181] Fixed bad assumption about HttpContext
2016-01-07 12:30:44 -08:00
Sébastien Ros
7578daa510 Merge pull request #6131 from sebastienros/sebros/cachemonitor
Improving monitors usage for output cache
2016-01-07 12:14:52 -08:00
Sébastien Ros
5dd54b6d55 Merge pull request #6125 from neTp9c/issue/6107
[Fixes #6107] Fixing content permissions part
2016-01-07 12:12:26 -08:00
Rob King
f440ebd03f Updated CodeGen templates 2016-01-07 16:11:00 +00:00
Rob King
bc51f86582 Consolidate Iesi.Collections and commit binding redirects 2016-01-07 15:27:00 +00:00
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
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
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
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
andy zheng
0a8fa5b99a second time to fix #6245 2015-12-30 09:56:59 -05: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
Thierry Fleury
66963d1845 Remove duplicate Logger assignation 2015-12-28 10:27:36 +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
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
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
Szymon Seliga
4b47602d32 Merge branch 'dev' of https://github.com/SzymonSel/Orchard into dev
Conflicts:
	src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs
2015-12-18 12:21:35 +01:00
Szymon Seliga
cf6a88c6f7 Fixes #6168: Generating TechnicalName for ContenTypes, ContentFields creates disallowed names
Removed separator
2015-12-18 12:19:02 +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
8a065d496d Merge pull request #6194 from jtkech/patch-6
[Fixes #6193] TokenFilters Cohabitation
2015-12-17 12:18:40 -08: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
Thierry Fleury
ea5ce6c865 Fixes 6189 : TextAreaElement throwing on null ProcessedValue 2015-12-16 18:33:43 +01:00
Rob King
6a2b56e714 Moved NuGet.Core to Orchard NuGet Feed 2015-12-16 16:45:28 +00:00
Piotr Szmyd
83900802b7 #6188: Using correct key when removing Redis cache entry. 2015-12-16 17:05:28 +01:00
PaulDevenney
52de937a21 Fixed bad assumption about HttpContext
HttpContext is not available when running at console
2015-12-16 14:46:30 +00:00
Rob King
74adc571aa Moved MSTranslitTools to Orchard NuGet Feed. 2015-12-16 10:35:30 +00:00
Sipke Schoorstra
e72e6fcb1f Fixed layout editor javascript issue.
As per the comments in https://github.com/OrchardCMS/Orchard/pull/6159, the issue was that the layout designer host has a dependency on the layout editor object, but the former would be created before the latter.
This changeset moves the initialization code together in order to control the order in which what object is created first.
2015-12-15 22:35:29 +01:00
Sebastien Ros
117dd09f8c Improving monitors usage for output cache 2015-12-15 10:36:06 -08:00
Westley Harris
4fb1c18a72 Update TaxonomyField.cshtml
Re-submit of #6160. Fixed a bug in the taxonomy field editor template that allows you to click on "create some terms" for a non-existent taxonomy. This situation occurs when you assign a taxonomy field to a content type but do not specify a taxonomy.
2015-12-15 07:34:32 -05:00
Rob King
74d8cf8e9a Line endings resolution 2015-12-15 11:55:23 +00:00