yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,208 Commits 4 Branches 7 Tags
6f74fcf24a01092dc3ad8aec2499db7d6ba2ab9a
Commit Graph

761 Commits

Author SHA1 Message Date
Shannon
6f74fcf24a Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Umbraco.Web.csproj
 2017-07-18 13:27:03 +10:00
Sebastiaan Janssen
95b0c342bb Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2017-07-17 17:51:39 +02:00
Sebastiaan Janssen
3a5584a1c1 Some updates to description and code style 2017-07-17 17:50:38 +02:00
Sebastiaan Janssen
b403283368 Merge branch 'U4-10088' of https://github.com/srmooney/Umbraco-CMS into srmooney-U4-10088 2017-07-17 17:30:32 +02:00
Sebastiaan Janssen
e1957b895f U4-5672 Properties and Tabs moving/incorrect when Enable list view selected 2017-07-17 09:46:30 +02:00
Claus
0acb0d48a1 Merge pull request #1858 from Jeavon/RelatedLinks-Tweaks 
Tweaks to RelatedLinks
 2017-07-12 15:26:53 +02:00
srmooney
1e6d50a86b Add option for Listview to change the tab name 2017-07-06 10:50:19 -04:00
Shannon
29c6d547db Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-06-30 16:55:04 +10:00
Claus
ef53db52f7 Merge pull request #1850 from pijemcolu/temp-U4-9710 
U4-9710 ImageCropDataSet.HasImage returns wrong value
 2017-06-29 14:07:59 +02:00
Claus
2fdf148610 localizing text https://github.com/umbraco/Umbraco-CMS/pull/1250 2017-06-26 15:41:17 +02:00
Shannon
754dbc9621 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
 2017-06-23 15:15:55 +10:00
Stephan
4cdb30fed0 Merge branch dev-v7 into dev-v7.7 2017-06-20 14:27:25 +02:00
Shannon
d885265818 Changes restart tracking to use code we used to have in there which is an in memory marker for the app domain, this is a little cleaner 2017-06-19 23:40:51 +10:00
Shannon
7920383904 U4-10034 Package install may not wait for app domain restart in all cases 2017-06-19 23:02:06 +10:00
Mikkel Holck Madsen
da4be3be65 Merge pull request #1995 from umbraco/temp-backofficeguids 
Adds hoverstates for metadata(documenttypes, datatypes etc), making it possible to see their guids in the backoffice
 2017-06-14 08:27:41 +02:00
Shannon Deminick
08c4a75af7 Merge pull request #1945 from protherj/U4-9792-fips-support 
U4-9792 -- Update Umbraco to be FIPS compliant
 2017-06-13 15:05:21 +02:00
Claus
160518e977 adding guids to backoffice. 2017-06-12 12:12:14 +02:00
Shannon
e2f9c90dc6 Merge branch 'dev-v7.7' into temp-content-blueprints 2017-06-05 10:23:10 +02:00
Shannon
7d1aedc0d3 fixes unit tests 2017-06-05 10:17:18 +02:00
Stephan
942d010264 Retreat Amazing Nested Content Work 2017-06-05 09:28:52 +02:00
Shannon
b99b9b7a6b adds blueprints dictionary to ContentTypeBasic result 2017-06-04 17:31:31 +02:00
Shannon
765decf3b1 Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Trees/PartialViewMacrosTree.cs
#	src/Umbraco.Web/Trees/PartialViewsTree.cs
 2017-05-17 20:00:29 +10:00
Jason Prothero
d8811d6b46 Refactored code for FIPS compliance support. Added/converted to using a more generic Hash() method instead of directly using MD5. 2017-05-10 13:35:28 -07:00
Shannon
ec9020f63e Fixes mappings 2017-04-28 13:34:32 +10:00
Dave Long
b88e714050 Fixed Serialization issue in Password Reset Validate Model 2017-04-21 08:33:21 +02:00
Shannon
d19bebc404 Merge branch 'dev-v7.6' into temp-U4-7009 2017-04-18 20:10:27 +10:00
Shannon
46dd86c745 Moves logic for checking if the current user (based on the current thread) is an admin and in which case can reset the password to an extension method 2017-04-18 20:09:27 +10:00
Sebastiaan Janssen
e2dc4f36ad U4-9762 ezSearch package complains about pickers in macro parameters 2017-04-12 13:39:38 +02:00
Jeavon
ece73578c8 Tweaks to RelatedLinks - moved Content property from RelatedLinkBase to RelatedLink and populated Content property for non UDI RelatedLink editor 2017-04-04 12:08:10 +01:00
Mike
8d8bb4e237 fix HasImage() 2017-03-31 17:24:18 +02:00
Shannon
cb539e82d0 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Models/Mapping/MediaModelMapper.cs
#	src/UmbracoExamine/UmbracoMemberIndexer.cs
 2017-03-29 18:11:51 +11:00
Shannon
77af16db55 Merge branch 'dev-v7' into temp-u4-9617 
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
 2017-03-29 16:29:18 +11:00
Shannon
a9fe46da0c makes HasContainerInPath public 2017-03-28 15:55:45 +11:00
Stephan
a23c150738 U4-9617 - fix 2017-03-23 17:51:30 +01:00
Stephan
085a678266 U4-9617 - perf for published date 2017-03-23 17:44:07 +01:00
Stephan
fe11d4770d U4-9615 - implement way to find listviews in path fast 2017-03-23 14:07:45 +01:00
Shannon
1bfb63fe86 Adds validation for file names 2017-03-21 18:35:13 +11:00
Stephan
7b506fadc6 U4-9611 - minor fix 2017-03-16 14:35:54 +01:00
Sebastiaan Janssen
e1942d96d0 Incorporate Stephane's feedback: if we already know we're getting list of int or udi, we don't need to cast, or even test for the PropertyEditorAlias 2017-03-15 23:22:53 +01:00
Sebastiaan Janssen
a2ca753dd9 Use RelatedLink class instead of weird extra inline class, convert UDI values 2017-03-14 10:26:13 +01:00
Shannon
05f8870424 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 2017-03-14 17:25:40 +11:00
Søren Gregersen
1b7ce8bcde Removed weird comment 
removed "this" as remark for NewPassword
 2017-03-12 21:20:24 +01:00
Shannon
5291558b23 Further refactoring, using attributes, moving and removing some classes, using DI where necessary. 2017-03-08 14:27:39 +01:00
Shannon
a9c5877e5b Merge branch 'refs/heads/dev-v7.6' into temp-u4-7318 
# Conflicts:
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Umbraco.Web.csproj
 2017-03-01 15:04:00 +01:00
Per Ploug
d3582e2296 An ID is required on all items edited in backoffice editors 
The ID is required when an item is saved, as the routing will
automatically redirect based on this ID - files, does not have an ID -
so the filepath is used in the same as it is used for the tree
 2017-02-22 15:47:36 +00:00
Shannon
b4eb9f333e Gets the member picker working with mini list views, falls back to Examine search for when searching on member types - since the EntityService doesn't support that currently, gets the icon mapped correctly for members, 2017-02-21 13:49:58 +11:00
Shannon
6ae06ad2e0 Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9470 
# Conflicts:
#	src/Umbraco.Web/Editors/EntityController.cs
 2017-02-15 17:41:12 +11:00
Shannon
8387c435d4 Gets mini list view working so that only nodes with children show the arrow, added GetPagedChildren to EntityController 2017-02-15 17:40:10 +11:00
Shannon
e612bcae58 Merge branch 'refs/heads/dev-v7.6' into temp-U4-9310 2017-02-10 10:04:58 +11:00
Shannon
a20cc60c10 Updates new UDI pickers that have start nodes for pre-values to also store UDIs for their prevalues, this has a knock on effect in that we need to be able to inject some server side config for pre-value editors (otherwise we'd have to make diff udi prevalue editors but that isn't very re-usable), so have implemented that and then updated all of the logic to deal with the udi idType. 2017-02-08 16:15:27 +11:00