Sebastiaan Janssen
22d778ed28
Adds UDI redirect for FollowExternalRedirect
...
Checks if the redirect property exists before trying to get it's value
Simplified conversions by asking for the property value by type
2017-05-20 11:34:03 +02:00
Sebastiaan Janssen
a3a2b6499e
Merge branch 'U4-9872' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-U4-9872
2017-05-20 09:49:12 +02:00
dkoruba
65ed69cf06
add log if request to ScheduledPublishController fails without exception
2017-05-19 22:14:10 +02:00
Shannon
54967e0150
U4-9935 UmbracoHelper doesn't have querying methods for handling UDI
2017-05-19 11:42:58 +10:00
Claus
79844154fb
U4-9919 Updated media files are deleted
2017-05-18 11:30:11 +02:00
Warren Buckley
120cb964a5
Merge pull request #1949 from umbraco/temp-u4-9926
...
U4-9926 - fix partial view macro udis
2017-05-17 13:39:48 +01:00
Stephan
147a1daf6d
U4-9926 - fix partial view macro udis
2017-05-17 12:09:28 +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
9a515de43f
Updated Examine Nuget to latest version 1.8.3
2017-05-16 09:12:50 -07:00
James Coxhead
451826a329
Fixes umbracoInternalRedirectId property to work with UDI IDs
2017-05-14 21:52:45 +01:00
Jason Prothero
b55d065d45
Update to mark some methods as Obsolete and not seen by the VS editor
2017-05-11 09:17:56 -07:00
wanddy
1fb0b95428
Fix translation didn't work in some tree node.
2017-05-11 16:25:02 +08:00
Jason Prothero
fead30db38
Removed commented code for hash algorithm refactoring
2017-05-10 15:49:03 -07: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
AndyButland
dd40dd964c
Ordered media types when returned for create dialog
2017-05-10 17:44:30 +02:00
wanddy
bc51a98cfd
Merge branch 'dev-v7-chnfix' into dev-v7.6-chnfix
...
# Conflicts:
# src/Umbraco.Core/Services/MediaService.cs
# src/Umbraco.Web/Trees/PartialViewMacrosTree.cs
# src/Umbraco.Web/Trees/PartialViewsTree.cs
Fix some menu tree header won't be translated.
This may be caused by the explicit definition of tree node name.
Add missing translation item for en.xml and zh.xml
2017-05-10 23:25:03 +08:00
wanddy
c6bc5ae6aa
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
2017-05-10 22:37:47 +08:00
Shannon Deminick
f84d3b435b
Merge pull request #1898 from DaveLong/U4-9799
...
Fixed Serialization issue in ValidatePasswordResetCodeModel
2017-05-10 14:59:04 +10:00
AndyButland
712cd29fea
Upload checks to utilise whitelist. Refactored check on white and black list to common extension method.
2017-05-09 23:29:30 +02:00
AndyButland
3d21448f89
Validated file uploads using white list if provided, before falling back to blacklist
2017-05-09 18:12:51 +02:00
suedeapple
8c6362d947
automaticly - > automatically
2017-05-09 16:40:59 +01:00
Mikkel Holck Madsen
a2df4c5232
Merge pull request #1933 from umbraco/temp-U4-9864
...
U4-9864 Missing import and xss check in other PermissionEditor.aspx
2017-05-08 10:29:03 +02:00
Claus
3c4b3f44c7
U4-9864 Missing import and xss check in other PermissionEditor.aspx
2017-05-05 14:52:01 +02:00
Claus
e7eaf6959f
U4-9849 Query Builder not working in template editor. Always returns Model.Content.Site().Children()
...
adding missing nullchecks in the endpoint action.
ensuring promise returns before setting init data - the unresolved promise was being used on the query model instead of the actual text string the promise returns - causing the endpoint to fail to bind the model.
2017-05-04 15:08:37 +02:00
wanddy
b807b84466
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
2017-05-02 14:23:36 +08:00
wanddy
ab551b2c96
Fix some menu tree header won't be translated.
...
This may be caused by the explicit definition of tree node name.
Signed-off-by: wanddy <wanddy@163.com >
2017-05-02 14:20:44 +08:00
Shannon
31c965ae42
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6
2017-05-02 13:41:03 +10:00
Shannon Deminick
d91fc6ce60
Merge pull request #1887 from umbraco/temp-U4-9775
...
U4-9775 AlreadyClosedException is thrown when retrieving media if the…
2017-05-02 13:40:28 +10:00
Shannon
d5124e9739
Ensures that an UmbracoContext exist before emitting the cache handler events
2017-05-01 21:10:22 +10:00
Shannon
2479c5a272
updates other nuget refs that shouldnt be there
2017-04-30 23:21:19 +10:00
Shannon
004e00599d
Fixing nuget package issues , semver 2 is only for 452+ which we dont have, we shouldnt be using it and it adds more dependencies that we don't need right now
2017-04-30 23:19:45 +10:00
Shannon Deminick
3509a2c40f
Merge pull request #1908 from umbraco/temp-scope-events-stale-entities
...
POC to normalize all event entities when we track events so that all …
2017-04-30 19:28:19 +10:00
Sebastiaan Janssen
7cb1a497e5
Merge remote-tracking branch 'origin/dev-v7.6' into temp-seb-authevents
...
# Conflicts:
# src/Umbraco.Core/Security/BackOfficeSignInManager.cs
2017-04-30 10:17:07 +02:00
Shannon Deminick
cf8ead62ac
Merge pull request #1904 from jwoods1/patch-2
...
Fixed issue on line 216
2017-04-30 17:11:44 +10:00
Sebastiaan Janssen
311fcfe328
Adds AccountCreated event
2017-04-29 23:17:50 +02:00
Sebastiaan Janssen
33d09b14be
Refactor GetBackofficeUserManager calls
2017-04-29 22:21:42 +02:00
Sebastiaan Janssen
cdab89062e
Make sure to only trigger events on MembershipHelper when we're dealing with backoffice users
2017-04-29 22:10:43 +02:00
Sebastiaan Janssen
38571f2cdd
Wire up LoginSuccess and LoginRequiresVerification
2017-04-29 13:43:51 +02:00
Sebastiaan Janssen
ae17172126
Attempt to raise events from parts of code that don't hit the BackOfficeUserManager directly
2017-04-29 12:49:56 +02:00
Stephan
72eddca3c6
Merge branch 'dev-v7.6' into temp-scope-events-stale-entities
2017-04-28 19:19:36 +02:00
Stephan
244977dc95
packages - trace errors
2017-04-28 13:34:35 +02:00
Sebastiaan Janssen
095a7c0aa7
First attempt at hooking up some events for auditing
2017-04-28 13:20:42 +02:00
Shannon
ec9020f63e
Fixes mappings
2017-04-28 13:34:32 +10:00
Shannon
d24b0aa9eb
oops undeletes a couple files that are still needed for the custom package ascx page
2017-04-28 10:30:47 +10:00
Jason Woods
f737004544
Removed space before svalue
2017-04-27 16:13:41 -06:00
Jason Woods
850e354b11
wrapped all values in double quotes
...
Wrapped image src and crop values in double quotes to keep consistent across all saves and updates.
2017-04-27 16:03:45 -06:00
Shannon
1b27114014
Merge branch 'temp-CON-1267' into dev-v7.6
2017-04-28 07:53:16 +10:00
Shannon Deminick
d8b235ad62
Merge pull request #1906 from umbraco/temp-CON-1267
...
CON-1267 Update Our to not offer v6 to people on < 7.6.0
2017-04-28 07:52:19 +10:00
Shannon
56581478c8
Merge remote-tracking branch 'origin/dev-v7' into temp-CON-1267
2017-04-28 07:48:04 +10:00
Shannon
2be330d237
adds notes, changes to protected
2017-04-28 07:45:01 +10:00
