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

2140 Commits

Author SHA1 Message Date
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
2da3ec27db fixes punycode reference 2015-02-19 14:55:00 +01:00
Shannon
b2399e97cc updates cdf refs 2015-02-18 17:39:33 +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
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
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
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
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
00895ff7a9 Fixes: U4-6096 Links in Translator emails incorrect - germain and danish were still incorrect. 2015-01-12 22:10:15 +11:00
Shannon
dc846e7ff6 Fixes installer email validation. Ensures all validation directives are registered under the correct module: umbraco.directives.validation, then we load this module in the installer so we can use the correct email validation directive. 2015-01-07 15:02:58 +11:00
Shannon
341239648d bumps version 2015-01-07 09:17:22 +11:00
Shannon
ec5ca9087e Removes all references of Microsoft.Web.Helpers - we don't need to ship this, we don't reference it and it has compatibility problems. Also updates the version to 7.3.0 2015-01-06 18:24:27 +11:00
AndyButland
93ca536b14 Added noindex, nofollow to default page to discourage search engines indexing the back-office 2015-01-05 21:20:50 +01:00
Shannon Deminick
dbb70a8646 Merge pull request #607 from gertdc/U4-6060 
Added dutch translations for the grid layout
 2015-01-02 15:49:50 +11:00
Shannon
201464cb44 Fixes: U4-5918 Update Underscore.js and also updates our usage of bower with the correct grunt-bower plugin, this massively simplifies bower usage and paves the way to start using bower for all JS components. 2015-01-02 14:25:11 +11:00
Shannon
2286c0899c reverts UseTempStorage sync from examine settings on dev branch. 2015-01-02 11:55:18 +11:00
gertdc
ae257d0f50 Added dutch translations for the grid layout 2014-12-30 10:18:54 +01:00
Shannon
db087a9e78 pretty much got 5966 working just need to do some more tests. 2014-12-17 17:08:12 +11:00
Shannon
d564866b07 Merge branch 'Aaen-7.2.0' into dev-v7 2014-12-16 14:34:13 +11:00
Shannon
99a45d26ae Merge branch '7.2.0' of https://github.com/Aaen/Umbraco-CMS into Aaen-7.2.0 2014-12-16 14:33:21 +11:00
Shannon Deminick
d9925e3453 Merge pull request #589 from teeto/patch-1 
Update es.xml
 2014-12-16 11:08:16 +11:00
Shannon
e1106a9d67 Merge branch '7.2.1-doctype-fixes' into 7.2.1 
Conflicts:
	src/Umbraco.Core/Models/PropertyGroupCollection.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Services/ContentTypeService.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs
	src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
 2014-12-16 09:47:53 +11:00
Sebastiaan Janssen
84752babc8 Moved both new sections to the bottom so it's easier for upgraders to merge them 2014-12-15 09:04:25 +01:00
Sebastiaan Janssen
a480d7bbe6 U4-5959 Getting YSOD when wanting to create partial view in a subfolder in the backoffie 
#U4-5959 Fixed Due in version 7.2.1
 2014-12-14 17:22:10 +01:00
teeto
45241788b3 Update es.xml 
I have updated the es.xml file adding the values for grid section and the values marked as version="7.2" which were not translated
 2014-12-11 18:16:35 +01:00
Shannon
e1a93e9b3f updates the cdf mvc version to match the one in the nuspec 2014-12-11 19:57:59 +11:00
Shannon
2203db548a updates port 2014-12-11 19:01:32 +11:00
Shannon
8f35c8fb57 Fixes: U4-5996 CDF reference issue 2014-12-11 17:55:53 +11:00
Shannon
49e5493d52 Merge branch '7.2.1' of https://github.com/umbraco/Umbraco-CMS into 7.2.1 2014-12-11 15:59:06 +11:00
Shannon
a700258d92 WIP - updates to latest examine which exposes some methods needed to get this syncing done. This will not build until i put that examine version on nuget (soon). Ensures all readers/writers uses the same deletion policy, ensure segments file is copied across on sync restore. Changes the config to use an enum instead of a boolean which will give us some more flexibility. 2014-12-11 15:58:54 +11:00
Sebastiaan Janssen
da2bc6764b Version also updates in the csproj 2014-12-10 12:59:08 +01:00
Stephan
c8f80453b9 U4-5929 - support IDN in hostnames 2014-12-09 09:34:58 +01:00
Shannon
f08320bd81 Fixes: U4-5976 When no Examine indexes exist they are rebuilt at startup, however the rebuilding happens too soon before any Examine event handlers are actually wired up. 
Updates examine version to facilitate this. Adds ability to tokenize the {machinename} in an examine index path.
 2014-12-09 19:07:14 +11:00