Robert
a47b5035fe
Merge pull request #2219 from umbraco/temp-U4-10311
...
U4-10311 Wire up angular with backend
2017-09-28 09:10:02 +02:00
Shannon
f6be389f4f
fixes tests
2017-09-28 16:13:50 +10:00
Shannon
252f0fe88e
Fixes up the angular side of things to ensure the right property values are wired together correctly
2017-09-28 15:13:33 +10:00
Shannon
387faca71e
Simplifies the model mapping, uses strongly typed values
2017-09-28 14:54:18 +10:00
Robert
62cda02ded
Some clean up in ContentModelMapper.cs
2017-09-27 16:02:32 +02:00
Mads Rasmussen
3e2a6424bd
wire up audit trail log type colors
2017-09-27 14:08:29 +02:00
Mads Rasmussen
c0f695bcf9
make grunt linter happy
2017-09-27 14:07:47 +02:00
Robert
2e1e2e4325
Properties tab will be removed if it has no properties
2017-09-27 13:58:33 +02:00
Robert
fe97860694
Changed dataFormatter to work with values from the root node instead of values from properties tab
2017-09-27 11:56:11 +02:00
Robert
98b4aa6bae
Cleared more of the not needed code
2017-09-27 10:56:45 +02:00
Robert
eb7f4e74f2
Removed unused code as we dont have those properties in the properties tab anymore
2017-09-27 09:31:31 +02:00
Robert
4a9e326267
Remove the rest of umb properties
2017-09-27 09:28:51 +02:00
Robert
67edc6cf9a
Deleted updateDate, createDate and createdBy from properties tab
2017-09-26 15:57:50 +02:00
Robert
e740838ef7
Moved template and docType from properties tab to root node and linked the values back together in front-end
2017-09-26 15:44:41 +02:00
Robert
dec44b1288
Moved templateConfig to root node
2017-09-26 09:20:38 +02:00
Sebastiaan Janssen
98a0729549
Merge pull request #2202 from umbraco/temp-U4-10382
...
U4-10382 Add end point to get a paginated audit trail
2017-09-25 10:55:09 +02:00
Robert
4c7c6e37d1
Forgot to clean after myself :)
2017-09-19 12:02:29 +02:00
Robert
116e53e07d
Custom serialization attribute added to AuditType property
2017-09-19 11:49:32 +02:00
Robert
a74c4433f7
Mapping the DateStamp and UserName to AuditLog
...
Refactored how the the Username is displayed due to some misunderstanding on my part.
2017-09-19 11:01:07 +02:00
Robert
2ccf74a921
Adding the userName to the audit comment
...
Before the
2017-09-19 09:29:24 +02:00
Robert
f3a81d82be
Merge pull request #2184 from umbraco/temp-U4-10405
...
fixes: U4-10405 When scheduled publishing it set, change the default …
2017-09-18 13:24:47 +02:00
Sebastiaan Janssen
5451d28fe4
Update unit tests to account for the new AuditMapper
2017-09-14 21:29:24 +02:00
Mads Rasmussen
db57268440
add prototype for media properties tab
2017-09-14 21:00:26 +02:00
Mads Rasmussen
ac265067e8
move media node info component to media subfolder
2017-09-14 15:41:47 +02:00
Mads Rasmussen
5330830362
Merge branch 'dev-v7.7' into temp-U4-10309
...
# Conflicts:
# src/Umbraco.Web.UI.Client/bower.json
# src/Umbraco.Web.UI.Client/gruntFile.js
2017-09-14 15:28:21 +02:00
Mads Rasmussen
c013be4f36
add missing language keys for en_us.xml
2017-09-14 14:04:25 +02:00
Shannon
703c3eefe8
Fixes issue with trying to log in as a user that is disabled.
2017-09-14 19:00:59 +10:00
Shannon
4ab67d8cff
fix build
2017-09-14 18:28:02 +10:00
Shannon
f8d165599d
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-14 18:10:59 +10:00
Stephan
9355a81716
comments
2017-09-14 10:08:35 +02:00
Per Ploug
87575e9067
Reverting grid config
2017-09-14 10:04:04 +02:00
Sebastiaan Janssen
a5b31e94b6
Merge pull request #2194 from umbraco/temp-U4-10409
...
temp - vsts troubleshooting
2017-09-14 09:32:04 +02:00
Shannon
3815a6c607
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-14 16:17:44 +10:00
Shannon Deminick
f9e094a00a
Merge pull request #2193 from gunnim/dev-v7
...
U4-9562 - HealthCheckResolver from internal to public
2017-09-14 15:36:13 +10:00
Gunnar Már Óttarsson
053175a5a6
Fix http://issues.umbraco.org/issue/U4-9562
...
Change HealthCheckResolver to public allowing DI
2017-09-13 19:24:46 +00:00
Stephan
ce7488a924
temp - vsts troubleshooting
2017-09-13 18:23:19 +02:00
Sebastiaan Janssen
6cd2a15964
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
...
# Conflicts:
# src/Umbraco.Core/UdiEntityType.cs
2017-09-13 17:34:35 +02:00
Sebastiaan Janssen
f442599633
Merge pull request #2191 from umbraco/temp-U4-10409
...
U4-10409 UDI Parsing should not require scanning assemblies
2017-09-13 17:28:33 +02:00
Sebastiaan Janssen
37b6b42570
Merge branch 'temp-U4-10409' of https://github.com/umbraco/Umbraco-CMS into temp-U4-10409
2017-09-13 17:20:49 +02:00
Stephan
f1149fb826
U4-10409 - revert unwanted files
2017-09-13 17:20:06 +02:00
Sebastiaan Janssen
3f8f96e8c3
Merge branch 'dev-v7' into temp-U4-10409
2017-09-13 17:18:09 +02:00
Sebastiaan Janssen
8ebbfca17d
Merge branch 'dev-v7.7' of https://github.com/umbraco/Umbraco-CMS into dev-v7.7
2017-09-13 13:15:28 +02:00
Sebastiaan Janssen
076a8e0e23
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
...
# Conflicts:
# src/umbraco.sln
2017-09-13 13:09:20 +02:00
Stephan
44da6c9f97
Merge pull request #2188 from umbraco/temp-U4-10401
...
U4-10401 Being able to rename Data Type folders
2017-09-13 13:08:09 +02:00
Sebastiaan Janssen
a75181bd7f
Update sln to not refer to old build scripts any more
2017-09-13 13:07:22 +02:00
Stephan
058ad9f99a
Merge branch 'dev-v7.7' into temp-U4-10401
2017-09-13 12:12:10 +02:00
Sebastiaan Janssen
dd440eb9d5
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
...
# Conflicts:
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
2017-09-13 12:09:17 +02:00
Sebastiaan Janssen
00b469b61b
Easy ps script to just update the Umbraco version without having to do a full build
2017-09-13 12:07:29 +02:00
Sebastiaan Janssen
83f08538c2
U4-10407 We should log unhandled exceptions that occur in webapi controllers and always have detailed errors returned to users even when not in debug mode
...
# Conflicts:
# src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
2017-09-13 12:05:02 +02:00
Sebastiaan Janssen
aafe0e1c6c
Merge pull request #2189 from umbraco/temp-U4-10407
...
U4-10407 We should log unhandled exceptions that occur in webapi controllers and always have detailed errors returned to users even when not in debug mode
2017-09-13 12:04:29 +02:00
