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

2227 Commits

Author SHA1 Message Date
Shannon
f15301a7a0 Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-03-20 08:26:16 +11:00
Sebastiaan Janssen
90fdbb007e Bump version 2015-03-19 14:45:00 +01:00
Sebastiaan Janssen
311d503d8b Updates CDF dependency to latest version 2015-03-19 12:54:00 +01:00
Shannon
d3eff734aa Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Models/Template.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
	src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
	src/Umbraco.Core/Services/LocalizedTextService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Plugins/TypeFinderTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/Models/ContentExtensions.cs
	src/Umbraco.Web/PublishedContentExtensions.cs
	src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-03-19 17:37:00 +11:00
Shannon
e004ad31b5 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
 2015-03-19 11:36:05 +11:00
Shannon
6cf25f0043 Fixes: U4-6428 Grid configuration does not support virtual paths - and therefore is not compatible with virtual directories 2015-03-19 11:35:04 +11:00
Shannon Deminick
8cefe22bee Merge pull request #649 from protherj/grid-rendering-quote-fix 
Changed the surrounding quotes for Grid custom settings/styles to be double quotes
 2015-03-18 19:55:32 +11:00
Stephan
6856f9f341 Merge pull request #654 from umbraco/U4-274-disable-alttemplate 
U4-274 - Adds config option to disable alternative templates
 2015-03-17 14:32:08 +01:00
Sebastiaan Janssen
d24ef3650e U4-274 - Adds config option to disable alternative templates 2015-03-17 13:50:33 +01:00
Stephan
4974e2a2ce U4-6306 - hostname validation issue 2015-03-16 10:52:54 +01:00
Shannon
4544520b66 Fixes: U4-6303 SaveAndPublishWithStatus error - updates to latest Examine with the fix. 2015-03-09 15:06:32 +11:00
Sebastiaan Janssen
97a085d12b Bump version 2015-03-03 20:19:41 +01:00
Shannon
36bed40db0 typo 2015-03-03 17:37:42 +11:00
Shannon
f708a24401 fixes U4-6333, U4-6348 2015-03-03 17:36:53 +11:00
Jason Prothero
32bedfaa6a Changed the surrounding quotes for Grid custom settings/styles to be double quotes 2015-02-27 10:06:45 -08:00
Shannon
0ae1453fb1 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/umbraco.cms/businesslogic/Dictionary.cs
 2015-02-23 13:18:01 +01:00
Shannon
2da3ec27db fixes punycode reference 2015-02-19 14:55:00 +01:00
Shannon
5342d819d9 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
 2015-02-18 17:40:29 +01:00
Shannon
b2399e97cc updates cdf refs 2015-02-18 17:39:33 +01:00
Shannon
4eef90fe25 Merge remote-tracking branch 'origin/dev-v7-7.1.3-BetterXmlCacheFilePersisting' into 7.3.0 2015-02-17 15:15:29 +01:00
Shannon
428df7ae4a Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-02-17 15:11:10 +01:00
Sebastiaan Janssen
25cfceadc0 Merge branch 'dev-v7-upgradablemvc5webapi2' of https://github.com/Shazwazza/Umbraco-CMS into Shazwazza-dev-v7-upgradablemvc5webapi2 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
 2015-02-17 10:46:36 +01:00
Shannon
c7778467e3 Updates to latest examine version which internally supports tokenized paths in config so we don't need to do this in the umbraco core. 2015-02-13 15:34:54 +11:00
Shannon Deminick
c0dd32d1f9 Merge pull request #625 from bjarnef/dev-v7-U4-4418 
U4-4418 - fix issue with tab sorting
 2015-02-13 11:13:46 +11:00
Shannon
cd4c738c04 Moves jquery and blueimp files to be included with bower, removes all unnecessary jquery files that are committed to the repo. Jquery and jquery ui versions remain the same, however the canvas designer was using a jquery ui version one patch version ahead so need to test that it works with the bower version, otherwise we'll have to re-include it. 2015-02-11 18:39:53 +11:00
Nathalie Larsson
788ed68b5b Changes to lang config, notifications area - Sv 2015-02-09 15:47:16 +01:00
Stephan
e12984af4c refactor latched background tasks, now use a task for xml 2015-02-08 16:25:30 +01:00
Stephan
6d08d9b7b0 Merge branch 'dev-v7' into 7.3.0 2015-02-03 20:08:46 +01: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
Shannon
b899ab6557 Fixes: U4-5834 Change password description text is confusing 2015-01-29 17:49:58 +11:00
Shannon
c092d871c1 Fixes: U4-5834 Change password description text is confusing 2015-01-29 17:48:41 +11: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
Shannon
6a4966136d more testing, got the protect page dialog all working now and ensuring the data is going to the right places 2015-01-28 18:24:12 +11: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
Shannon
efab275c99 Fixes: U4-6188 umbracoNode.uniqueId needs to be changed to not allow nulls, U4-6187 umbracoNode.uniqueID needs a Unique index - currently it is a non-unique index, Gets the public access repository built and started testing 2015-01-27 19:47:30 +11:00
Shannon
0f4185b6a5 Gets legacy tasks apis wrapping new apis, added more tests and got the new tasks apis up to speed with all required methods. 2015-01-22 19:19:21 +11:00
Shannon
44257e361a Fixes refs to Microsoft.Net.Http 2015-01-21 10:41:01 +11: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
Shannon
0a0d845173 Merge branch 'dev-v7' into 7.3.0 2015-01-19 13:26:30 +11:00
Shannon
a999fca349 finalizes stylesheet editor, all is working nicely now 2015-01-19 12:50:26 +11:00
Shannon
e88264d0f7 Decouples more LogHelper 2015-01-16 11:08:00 +11: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
8abf6fc2b5 Cleans up legacy stylesheet code to wrap the new APIs better, creates a new OriginalPath property on IFile to track if the path has changed, updates FileRepository to deal with path's changing and automatically deal with renaming files. Adds new methods to IFileService: GetStylesheetsAtPath. Fixes up the stylesheet and stylesheet property editors to use the file names, gets tree syncing working nicely for them both even with files or properties are renamed. Updates stylesheet editors and controllers to use the new APIs 2015-01-15 11:49:32 +11:00
Shannon
5d7902a9a7 Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/PartialViewMacroRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
 2015-01-14 09:10:11 +11:00
Shannon
c41c727e06 WIP - working on getting the legacy StyleSheet business logic class wrapping the new services. 2015-01-13 20:18:02 +11:00
Shannon
00895ff7a9 Fixes: U4-6096 Links in Translator emails incorrect - germain and danish were still incorrect. 2015-01-12 22:10:15 +11:00
Shannon
caf972cd0f Ensures virtual path is set on the template, updates the tree controller to render the correct editor if it's webforms, updates the rest service to return the updated contents if the server changes it and updates the UI 2015-01-09 17:01:38 +11:00