Shannon Deminick
|
46922dd259
|
Merge pull request #1664 from umbraco/temp-U4-9328
Fixes: U4-9328 UI: It shouldn’t be possible to select the current tem…
|
2017-01-03 14:41:28 +11:00 |
|
Shannon Deminick
|
e2adb25da0
|
Merge pull request #1665 from umbraco/temp-U4-9325
fixes: U4-9325 New template editor stays in a $dirty state if you cha…
|
2017-01-03 14:38:30 +11:00 |
|
Mads Rasmussen
|
5146658e0f
|
fixes: U4-9325 New template editor stays in a $dirty state if you change and then save
|
2017-01-02 13:03:15 +01:00 |
|
Mads Rasmussen
|
dece680221
|
Fixes: U4-9328 UI: It shouldn’t be possible to select the current template or the selected master template in the master template picker.
|
2016-12-30 11:36:20 +01:00 |
|
Mads Rasmussen
|
48ee9d6b0e
|
Merge pull request #1663 from umbraco/temp-U4-9274
fixes: U4-9274 Master template is not saved
|
2016-12-30 10:53:10 +01:00 |
|
Shannon
|
3e82a48f4d
|
Fixes tree syncing and fixes server side code to reset the master template if it's cleared
|
2016-12-30 11:38:27 +11:00 |
|
Shannon
|
bd448ef05a
|
U4-9326 Removing a master template from a Template does not update the Template's path correctly
|
2016-12-30 11:27:55 +11:00 |
|
Mads Rasmussen
|
82efa14b7a
|
add UI to remove master template
|
2016-12-29 13:50:57 +01:00 |
|
Mads Rasmussen
|
61f25edafc
|
sync tree
|
2016-12-29 13:50:11 +01:00 |
|
Shannon
|
436875e8ec
|
fixes null check with setting master template
|
2016-12-29 14:02:15 +11:00 |
|
Shannon
|
ac087a87d3
|
Merge branch 'refs/heads/dev-v7.6' into temp-template-editor
|
2016-12-29 13:58:14 +11:00 |
|
Shannon
|
903ce09426
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
|
2016-12-29 13:57:55 +11:00 |
|
Shannon
|
02dc510078
|
Merge branch 'refs/heads/dev-v7.6' into temp-template-editor
|
2016-12-29 13:56:11 +11:00 |
|
Shannon
|
ffefe417db
|
bumps version
|
2016-12-29 12:23:30 +11:00 |
|
Per Ploug
|
00adffc8b3
|
Merge remote-tracking branch 'origin/temp-template-editor' into temp-template-editor
# Conflicts:
# src/Umbraco.Web/Editors/TemplateQueryController.cs
# src/Umbraco.Web/Models/TemplateQuery/QueryCondition.cs
|
2016-12-29 02:16:58 +01:00 |
|
Per Ploug
|
2ec3278637
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into temp-template-editor
|
2016-12-29 01:51:10 +01:00 |
|
Per Ploug
|
1f52a0c186
|
Changes the querybuilder to use the correct Where syntax
|
2016-12-29 01:50:43 +01:00 |
|
Shannon
|
40f7d820a6
|
publicizes a few APIs and adds more API docs
|
2016-12-29 11:36:39 +11:00 |
|
mikkelhm
|
19f7e6bd88
|
When Querying we need to use the Alias to search for, in stead of the name, this is due to names like "Created Date" and "Last Updated Date", who has aliases like "CreateDate", and "UpdateDate"
|
2016-12-28 14:07:22 +01:00 |
|
mikkelhm
|
dea3553885
|
Change back to using CurrentPage.Site() when queuing with the Query Builder, as Model.Content.Site(), doesnt support the queries the Query Builder creates
|
2016-12-28 14:04:40 +01:00 |
|
Shannon
|
d83d23803a
|
fixes build
|
2016-12-28 19:11:45 +11:00 |
|
Shannon
|
fae5dd517e
|
bumps version to next alpha
|
2016-12-28 18:57:25 +11:00 |
|
Shannon
|
247c96ac6e
|
makes public the MigrationBase.Context property
|
2016-12-28 17:22:36 +11:00 |
|
Shannon Deminick
|
360e06bbc5
|
Merge pull request #1660 from umbraco/deploy-157
deploy-157 - simplify tables creation in migrations
|
2016-12-28 15:51:04 +11:00 |
|
Mikkel Holck Madsen
|
2d94ac7a19
|
Merge pull request #1658 from umbraco/temp-U4-9199
Fixes: U4-9199 Grid RTE (rich text editor/ tinyMCE) does not have a m…
|
2016-12-27 14:45:42 +01:00 |
|
Stephan
|
ef48baf7ae
|
deploy-157 - simplify tables creation in migrations
|
2016-12-23 10:31:14 +01:00 |
|
Shannon
|
8e06a88a2c
|
bumps version, publicizes method
|
2016-12-23 14:52:18 +11:00 |
|
Shannon Deminick
|
6898d9b270
|
Merge pull request #1657 from umbraco/temp-u4-9250
U4-9250 - Guid all the Macros
|
2016-12-23 10:24:12 +11:00 |
|
Shannon
|
0aa8a5c243
|
more whitespace fixing
|
2016-12-23 09:41:23 +11:00 |
|
Shannon
|
c5326fc5c9
|
fixes whitespace in version file
|
2016-12-23 09:31:54 +11:00 |
|
Mads Rasmussen
|
4c97c689e9
|
Fixes: U4-9199 Grid RTE (rich text editor/ tinyMCE) does not have a max height, causing the user to have to scroll up to see RTE menu buttons
|
2016-12-22 14:06:23 +01:00 |
|
Stephan
|
9431e878f3
|
Version 7.6.0-alpha035
|
2016-12-22 11:34:33 +01:00 |
|
Stephan
|
3ac71a37e8
|
U4-9250 - add more tests
|
2016-12-22 11:24:01 +01:00 |
|
Stephan
|
0ac5e0daf4
|
U4-9250 - rename GetAllAll method - yea that was bad
|
2016-12-22 11:14:09 +01:00 |
|
Stephan
|
f3a7ada586
|
U4-9250 - add keys to ctors
|
2016-12-22 11:10:45 +01:00 |
|
Mads Rasmussen
|
d835008c67
|
Fixes: U4-9275 Show correct render section in “Sections” dialog
|
2016-12-22 10:57:07 +01:00 |
|
Shannon
|
bd4f3ad0d9
|
bumps umb version so the build works.
|
2016-12-22 18:44:47 +11:00 |
|
Shannon
|
8083edddb9
|
Adds check to DetermineInstalledVersion to detect if it's 7.6 based on the new DB changes
|
2016-12-22 16:36:25 +11:00 |
|
Shannon
|
886942c4e8
|
Updated MacroServiceTests to include testing for the Key
|
2016-12-22 15:24:54 +11:00 |
|
Stephan
|
7576c8138e
|
U4-9250 - fix tests
|
2016-12-21 16:47:32 +01:00 |
|
Mads Rasmussen
|
296adf70b4
|
remove lorem ipsum
|
2016-12-21 16:15:26 +01:00 |
|
Stephan
|
b3a6c70ae7
|
U4-9250 - revert some changes
|
2016-12-21 15:34:17 +01:00 |
|
Stephan
|
ef28173511
|
U4-9250 - fixes
|
2016-12-21 15:23:23 +01:00 |
|
Stephan
|
b25cb9995f
|
U4-9250 - Guid the IMacroService
|
2016-12-21 15:23:22 +01:00 |
|
Stephan
|
38e8e1cf9c
|
U4-9250 - fix migration
|
2016-12-21 15:23:22 +01:00 |
|
Stephan
|
f25641b2a7
|
U4-9250 - Guid all the Macros
|
2016-12-21 15:23:22 +01:00 |
|
Sebastiaan Janssen
|
c88ee55e8d
|
Merge pull request #1656 from umbraco/temp-u4-9240
U4-9240 - kill umbracoDeployChecksum
|
2016-12-21 09:14:10 +01:00 |
|
Sebastiaan Janssen
|
f2f4c23c80
|
Merge pull request #1652 from umbraco/U4-9301
Updates login controller to not accept non local urls
|
2016-12-20 13:55:31 +01:00 |
|
Stephan
|
01340e0316
|
U4-9240 - kill umbracoDeployChecksum
|
2016-12-20 11:26:34 +01:00 |
|
Claus
|
67ea15706e
|
Merge pull request #1651 from umbraco/temp-U4-9282
U4-9282 Rollback not working
|
2016-12-20 11:24:05 +01:00 |
|