Lombiq
53317d97c5
Revert "Fixing that TinyMCE is encoding special chars"
...
This reverts commit 188fabe233
2015-11-24 20:54:41 +01:00
Daniel Stolt
cee6539430
Fixed the things that someone always forgets. ;)
...
- Fixed build warnings and cleaned up Web.config files of new modules.
- Added missing project dependencies to new modules.
- Added new modules to Azure solution.
2015-11-24 19:35:27 +01:00
Daniel Stolt
b6dc75d4f9
Merge branch '1.9.x' into dev
...
# Conflicts:
# src/Orchard.Web/Orchard.Web.csproj
2015-11-24 19:20:05 +01:00
Daniel Stolt
eb81c20f04
Set UseGlobalApplicationHostFile=True in Orchard.Web.csproj.
...
This prevents VS2015 from creating a local applicationHost.config file in the solution, which in our case is excluded from source control anyway and therefore isn't used as intended.
2015-11-24 19:14:31 +01:00
Lombiq
1c4c64b812
Fixing that widgets with name containing dash can't have named alternates #3379
2015-11-24 17:17:12 +01:00
Lombiq
c5fb96ca4f
Fixing that Workflows activities are not measured in relative coordinates
2015-11-24 14:23:20 +01:00
Lombiq
188fabe233
Fixing that TinyMCE is encoding special chars
2015-11-24 14:13:41 +01:00
Sipke Schoorstra
7b47356152
Merge pull request #6062 from OrchardCMS/feature/resources
...
Orchard.Resources - Consolidate third-party client-side resources into dedicated module
2015-11-24 01:45:40 +01:00
Sipke Schoorstra
a09c2045c5
Consolidated separate features into a single one.
2015-11-24 01:44:49 +01:00
Sébastien Ros
7d689710cc
Merge pull request #6067 from MpDzik/pr/tokens-1.9.x
...
Fix handling braces in tokens
2015-11-23 08:56:36 -08:00
Marek Dzikiewicz
715d557f32
Fix handling braces in tokens
...
This brings Tokenizer changes from changeset
423fec90b3
2015-11-22 18:34:27 +01:00
Sipke Schoorstra
3da3ab8a49
Added Uri.
2015-11-21 15:49:23 +01:00
Sipke Schoorstra
1271539b0a
Added BlockUI and Moment.
2015-11-21 15:42:03 +01:00
Sipke Schoorstra
599624c3b0
Added History and Knockout and updated MediaLibrary.
2015-11-21 15:09:56 +01:00
Sipke Schoorstra
ddddb7407f
Added Bootstrap and FontAwesome.
2015-11-21 14:21:29 +01:00
Sébastien Ros
162ec9410c
Merge pull request #6059 from flew2bits/InvalidateNewMediaProfileCache2
...
[Fixes #6051 ] Invalidate cache when a profile is changed
2015-11-20 14:18:27 -08:00
Sébastien Ros
db1efab940
Merge pull request #6060 from mkinawy/issue/6052
...
[Fixes #6052 ] Href should be no-op when applied on absolute url
2015-11-20 14:17:12 -08:00
mkinawy
d0175e6ccd
reverting file annotations
2015-11-21 00:12:36 +02:00
mkinawy
23d81181ed
fixes #6052 by making Href return the url path as-is if it starts with http or https
2015-11-21 00:07:08 +02:00
flew2bits
cbcffb52d0
Fixed braces
2015-11-20 15:35:52 -05:00
flew2bits
0da9370296
Added signal to invalidate media profile cache when newly published.
2015-11-20 15:20:03 -05:00
Sébastien Ros
def163953c
Merge pull request #6057 from mkinawy/issue/5978
...
[Fixes #5978 ] Move Select button at the top in modal Media Library frame
2015-11-20 12:09:13 -08:00
mkinawy
4db088fb9c
fixes #5978 by moving the select button to the top of the media picker window and hides the save button untill some image is selected
2015-11-20 21:08:10 +02:00
Sipke Schoorstra
8258bb3589
Moved AngularJS and Underscore to Resources.
2015-11-20 18:36:25 +01:00
Sipke Schoorstra
febdc19e81
Created initial version of Orchard.Resources module.
...
- Migrated all jQuery usages from Orchard.jQuery to Orchard.Resources.
- Deprecated Orchard.jQuery.
2015-11-20 00:21:39 +01:00
Sébastien Ros
a02e6e8ab7
Merge pull request #6055 from MpDzik/pr/tokens-1.9.x
...
Fix TextTokens - Format and TrimEnd
2015-11-19 14:40:31 -08:00
Marek Dzikiewicz
b3bf80395a
Fix TextTokens - Format and TrimEnd
...
This fixes the Format and TrimEnd tokens and adds unit tests for
all TextTokens.
2015-11-19 23:01:50 +01:00
Sébastien Ros
0e627f8810
Renaming css selector for comment id
2015-11-19 12:36:38 -08:00
Sébastien Ros
d64bb02783
Merge pull request #6015 from ryandrewburnett/dev
...
Fixed reply button and comment link and added useful CSS class.
2015-11-19 12:35:21 -08:00
Sébastien Ros
2f9a2c0c38
Merge pull request #6041 from sunz7/issue/6000
...
[Fixes 6000] Fixed typo in IndexingCommands.cs
2015-11-19 12:26:20 -08:00
Sébastien Ros
f701482ff9
Merge pull request #6044 from DanielLackenbyBede/daniellackenbybede/bug/6043/listable_content
...
[Fixes #6043 ] Filter out when no contentTypeNames provided
2015-11-19 12:25:05 -08:00
Sébastien Ros
bd00caf5be
Merge pull request #6050 from Codinlab/fixes/6023
...
Fixes #6023 : Ellipsize can spilt an HTML encoded character
2015-11-19 12:19:11 -08:00
Sipke Schoorstra
e5bb771be1
Renamed WithDisplayName to DisplayedAs and removed test view from TheThemeMachine.
2015-11-19 17:56:42 +01:00
Sipke Schoorstra
f7e3f48df1
Added support for configurable snippet elements.
2015-11-19 17:39:52 +01:00
Sipke Schoorstra
a93398eac0
Merge pull request #6030 from OrchardCMS/feature/widget-elements
...
Widgets in Layouts
2015-11-19 14:08:25 +01:00
Sipke Schoorstra
bda0f3d732
Merge branch 'dev' into feature/widget-elements
2015-11-19 14:03:16 +01:00
Sipke Schoorstra
5c18f49fa3
Layouts, Widgets and Conditions.
...
- Moved Rules engine code to new Orchard.Conditions module.
- Refactored Layouts and Widgets to use Conditions.
- Moved Widgets element harvester to the Widgets module as a separate feature.
2015-11-19 14:02:12 +01:00
Lombiq
d42065acb8
Merge branch '1.9.x' into dev
2015-11-19 13:59:15 +01:00
Lombiq
b32fc1b7ba
Adding proper end of line handling when cloning from Mercurial
2015-11-19 13:58:47 +01:00
Thierry Fleury
411e04b56a
Make Excerpt test more accurate
2015-11-19 09:29:35 +01:00
Thierry Fleury
062a786f61
Add new HtmlHelperExtensions tests for Ellipsize and Excerpt methods
2015-11-19 09:00:31 +01:00
Thierry Fleury
5bfb858e3b
Use non-breaking space instead of standard space in Ellipsize.
2015-11-19 08:58:49 +01:00
Thierry Fleury
ccaa47b200
Fixes #6023 : Ellipsize can spilt an HTML encoded character
2015-11-18 19:33:18 +01:00
Daniel Lackenby
c6b1754bd7
Limit Admin Menu for Content
...
Limit the Content Menu item by whether you have the base Permission
EditOwnContent. EditContent implies EditOwnContent so either permission
(which you need at least one of to do any management of content be it
create or edit) will allow this menu item to display.
2015-11-18 16:08:50 +00:00
Daniel Lackenby
4946252f7e
Filter out when no contentTypeNames provided
...
Previously, when no content type names where provided (from a prior
conditional statement, so there is an initialized array but it is empty)
then the filtering steps are skipped and instead of serving "no content
types", as an empty array would state: all content types are served.
When contentTypeNamed.Length == 0, still .Select() as this is safe for
empty collections and will filter out all types in this event.
2015-11-17 15:47:41 +00:00
Zhi Sun
8965750dab
Fixed typo in IndexingCommands.cs
...
Fixes issue #6000
2015-11-16 20:19:06 -08:00
Sipke Schoorstra
db8c11d79b
Added tabbed editor UI support to MenuItem types.
2015-11-16 22:08:59 +01:00
Sipke Schoorstra
3b4b3c578a
Fixed potential widget orphans when deleting layout content.
...
This fixes the scenario where you have a layout with a widget element pointing to a widget content item, and the layout content item is being deleted.
Doing so will now correctly invoke Remove on all elements within the layout content item being deleted.
2015-11-12 21:38:33 +01:00
Sipke Schoorstra
578184f50f
Fixed an audittrail diff bug.
...
The bug caused a YSOD if the diffgram contained a match for a changed attribute being the last node of the diffgram.
2015-11-12 21:06:44 +01:00
Sébastien Ros
4573f65c19
Merge pull request #6006 from paynecrl97/bug/6005/menu_events
...
Fires Updating and Updated events when menu items are re-ordered
2015-11-12 12:05:26 -08:00
