yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,331 Commits 4 Branches 7 Tags
3094dea5d4b28cb2f8a87639acb4d647e67c5be1
Commit Graph

12331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
de3c836ac1 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 
Conflicts:
	src/Umbraco.Core/Dynamics/ExtensionMethodFinder.cs
	src/Umbraco.Tests/DynamicsAndReflection/ExtensionMethodFinderTests.cs
 2015-02-04 09:58:48 +11:00
Stephan
2cdc89297f U4-6210 - fix failing tests, improve extension methods support on dynamics 2015-02-03 19:38:14 +01:00
Shannon
839a5b13b0 updates extension method finder with tests to better support finding generic equivialents, adds tests for TypeHelper as well. 2015-02-03 20:23:05 +11:00
Shannon
40cc4b90fc updates a test 2015-02-03 14:41:43 +11:00
Shannon
ba54f96efd updates nuspec 2015-02-03 13:16:30 +11:00
Shannon
f4a0bcfc96 updates nuspec 2015-02-03 13:15:15 +11:00
Shannon Deminick
b5696de71e Merge pull request #629 from AndyButland/u4-6183 
U4 6183 - Only allow change document type to types that would allow the existing children to be created under them
 2015-02-02 18:16:37 +11:00
Stephan
a4d4cbd99f U4-6034 - issue when renaming tabs 2015-01-30 15:02:21 +01:00
Stephan
08a2c0d082 U4-6184 - pipeline falls back from example.com:666 to example.com 2015-01-30 14:44:47 +01:00
Shannon
f037f8541c Fixes: U4-6210 ExtensionMethodFinder doesn't work with overloaded extensions - this means overloaded extension methods for dynamic content won't work. and finalizes: U4-6209 GetGridHtml needs to be an extension on HtmlHelper not IPublishedContent so that ViewData and ModelState are inherited 2015-01-30 19:04:39 +11:00
Shannon
10990e50e6 Fixes: U4-6209 GetGridHtml needs to be an extension on HtmlHelper not IPublishedContent so that ViewData and ModelState are inherited 2015-01-30 15:48:55 +11:00
Shannon
9dad4c9573 Fixes: U4-6111 GetGridHtml throws an exception if no grid value is available 2015-01-30 15:42:12 +11:00
Shannon
6318b85449 Fixes: U4-6208 Cannot cancel grid 'Are you sure' button when deleting a cell, U4-5942 Issue with placing cursor in right part of richtext editor in Grid 2015-01-30 15:17:13 +11:00
Shannon Deminick
9d313898d0 Merge pull request #624 from bjarnef/dev-v7-U4-5942 
U4-5942 - change width of grid cell tools
 2015-01-30 11:09:33 +11:00
Shannon
0380b04b03 fixes breadcrumb on content/media, ensures a request to load it doesn't happen if there is no parent, ensures that the full breadcrumb is shown and in the right order and ensures that the breadcrumb class is not added if there isn't one so the margins on the buttons work better. 2015-01-30 11:07:47 +11:00
Shannon
f32e47a363 fixes exception when rendering macros in rte in back office. 2015-01-30 10:59:11 +11:00
Shannon Deminick
3ea7f8a226 Merge pull request #628 from sparkalyn/dev-v7 
Fixes: U4-4565 Add margin to bottom bar
 2015-01-30 10:37:12 +11:00
Shannon
2617016e3b Merge branch 'umbUkFest-U4-4400' of https://github.com/ja0b/Umbraco-CMS into dev-v7 2015-01-30 10:33:07 +11:00
Shannon
90b3bf59e0 Fixes: U4-2038 Violation of PRIMARY KEY constraint 'PK_cmsContentPreviewXml' YSOD occurs when publishing content 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
 2015-01-30 10:32:46 +11:00
Shannon
aadae6334b Fixes: U4-2038 Violation of PRIMARY KEY constraint 'PK_cmsContentPreviewXml' YSOD occurs when publishing content 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
 2015-01-30 10:13:04 +11:00
Shannon
0f7b902bba Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-01-29 17:50:18 +11:00
Shannon
b899ab6557 Fixes: U4-5834 Change password description text is confusing 2015-01-29 17:49:58 +11:00
Shannon Deminick
7c3ff7d746 Fixes: U4-6165 Make Enum<T> public 2015-01-29 17:09:04 +11:00
SorenA
332a95a27a Support for multiple RTE classes 
Added support for multiple RTE classes, "p.someclass.otherclass" would give a paragraph element with the classes "someclass" and "otherclass".
 2015-01-28 11:42:08 +01:00
SorenA
4482879fc6 Added RTE composite block and class formatting 
Added "block.class" and "block#id" formatting to the Rich Text Editor.

Example use include following formats:
"p.lead"
"h1#title"

Without this only "p" or ".lead" will work, not composites.
 2015-01-28 11:38:11 +01:00
AndyButland
199bf0ff6e Minor code tidy of change content type 2015-01-28 09:22:33 +01:00
AndyButland
24915163ff Improved validation label for why a change of document type isn't available for a given node 2015-01-28 09:10:22 +01:00
AndyButland
1289d3255c Presentation improvements for confirmation page of change document type 2015-01-27 22:35:17 +01:00
AndyButland
dc40b73fef When changing document type, added filter on populating list of available document types to include only those types that would permit the existing children to be created under them 2015-01-27 22:34:57 +01:00
Sunshine Lewis
c1cc8a3824 U4-4565 Add margin to bottom bar 2015-01-27 09:57:51 -05:00
mattbrailsford
9c8e6ab864 Add "config" support to the macro grid property editor to allow predefining the macro to use 2015-01-26 12:35:01 +00:00
Stephan
9695ccea0a Merge pull request #623 from zpqrtbnk/dev-v7-6154 
U4-6154 - fix unpublishing a document with changes
 2015-01-21 16:03:33 +01:00
Shannon
bbcca7f3e5 fixes test 2015-01-21 13:26:09 +11:00
Stephan
7b4a82eb8d U4-6154 - bugfix 2015-01-20 19:58:57 +01:00
bjarnef
8393465e8a Ensure first tablerow is header after save too 
After the document type, media type or member type is saved, this will
ensure first tablerow is a tableheader, so sorting is limited to <tbody>
 2015-01-20 02:10:20 +01:00
bjarnef
9ced66f208 U4-4418 - fix issue with tab sorting 
Fixed issue with tab sorting, where you are able to drag the rows above
the table header. Ensured that <thead> / <th> is added, so the class
"ui-sortable" is added to <tbody> and only <tbody> will be the
drag-area.
I also added styling for delete button so it's more consistent with
other "delete"-buttons, e.g. for in settings for dropdown lists,
checkbox lists and radionbutton lists. Furthermore the delete-button is
moved inside the ItemTemplate, so the classes easily could be added to
the button and also make the button stay close to the fields.
 2015-01-19 21:49:27 +01:00
bjarnef
633f56a7aa U4-5942 - change width of grid cell tools 
Change width of grid cell tools, so it doesn't overlap the input
fields/texteditors.
 2015-01-19 16:55:02 +01:00
Stephan
12d51b292c U4-6154 - fix unpublishing a document with changes 
Conflicts:
	src/Umbraco.Core/Services/ContentService.cs
 2015-01-19 14:03:58 +01:00
Shannon Deminick
e85ef38218 Merge pull request #621 from AndyButland/u4-6135 
Fixes U4-6135 (node name disappears in certain situations when tree is synched
 2015-01-19 18:20:47 +11:00
AndyButland
4775b638a4 Reverted previous commit and changed anchor removal to target the correct tag (the elipsis) 2015-01-19 08:05:32 +01:00
Shannon
db3b8a1acd Merge remote-tracking branch 'origin/dev-v6' into dev-v7 
Conflicts:
	src/Umbraco.Tests/TreesAndSections/ApplicationTreeTest.cs
 2015-01-19 12:53:54 +11:00
AndyButland
17906b505d Removed code in tree synchronisation that removes anchor tag containing node name for certain nodes 2015-01-18 21:13:24 +01:00
Sebastiaan Janssen
7a644b6681 U4-6133 Update builtin razor snippets to follow Query Builder conventions 
#U4-6133 Fixed
 2015-01-15 10:38:07 +01:00
Shannon Deminick
48c127fefd Merge pull request #619 from arknu/U4-6103 
U4-6103: Replace style with ng-style (again)
 2015-01-14 19:08:18 +11:00
Asbjørn Riis-Knudsen
778d8e0afa Added missing apostrophes 2015-01-14 09:00:12 +01:00
Sebastiaan Janssen
59aa28bf3b Update Installer.cs 2015-01-13 17:34:40 +01:00
Niels Hartvig
cea002fd61 Typos in regards to previous commit (U4-6115) 2015-01-13 17:19:11 +01:00
Niels Hartvig
f8c1cc684b U4-6115 Add which user installs/uninstalls packages to the audit trail 2015-01-13 17:14:54 +01:00
Shannon
3663fd9f99 Fixes: U4-6106 Threading/Performance issue with MappingResolver and LazyManyObjectsResolverbase/ManyObjectsResolverBase 2015-01-13 19:39:46 +11:00
arknu
f8ed9e60f6 U4-6103: Replace style with ng-style (again) 2015-01-12 22:13:01 +01:00