Shannon
|
8499c01eac
|
Merge remote-tracking branch 'origin/patch-v7' into dev-v7
|
2018-04-06 14:51:14 +10:00 |
|
Shannon Deminick
|
e25d648f44
|
Merge pull request #2556 from dawoe/temp-U4-11167
U4-11167 Fixes rare syncTree error
|
2018-04-06 14:46:23 +10:00 |
|
Warren
|
edb62b740b
|
Merge branch 'patch-v7' into dev-v7
|
2018-04-05 10:42:41 +01:00 |
|
Warren Buckley
|
43e32e66b6
|
Merge pull request #2550 from dawoe/temp-U4-11161
U4-11161 fix for adding multiple items in a single content picker
|
2018-04-05 10:15:39 +01:00 |
|
Shannon
|
11d4189c8d
|
Merge branch 'patch-v7' into dev-v7
|
2018-04-05 17:28:46 +10:00 |
|
Dave Woestenborghs
|
859cb6ce1a
|
U4-11167 removed the time out..only check if the syncTree method exists
|
2018-04-04 09:44:29 +02:00 |
|
Warren
|
ebbd05dc97
|
Adds in missing $scope dependency for Dynamic Dashboard Controller
|
2018-04-04 08:30:33 +01:00 |
|
Warren
|
bdaa70592f
|
Adds in missing $scope dependency for Dynamic Dashboard Controller
|
2018-04-04 08:28:41 +01:00 |
|
Dave Woestenborghs
|
27b19a0a33
|
U4-11167 only wrap in time out when syncTree method is undefined
|
2018-04-03 07:37:37 +02:00 |
|
Shannon
|
047a05cfb3
|
bumps version
|
2018-04-03 11:38:13 +10:00 |
|
Shannon
|
e77ebc0c1c
|
Fixes all references to assetsService.load* that do not pass in a required scope object and changes assets.service to always use the $rootScope of an explicit scope is not passed
|
2018-04-03 11:27:53 +10:00 |
|
Shannon
|
a27ea994b7
|
updates the loadMomentLocaleForCurrentUser to always return a promise
|
2018-04-03 10:59:55 +10:00 |
|
Shannon
|
e019c94207
|
changes back to correct version
|
2018-04-03 10:42:57 +10:00 |
|
Shannon
|
5b7193aa64
|
Merge branch 'temp-U4-11164' of https://github.com/dawoe/Umbraco-CMS into dawoe-temp-U4-11164
|
2018-04-03 10:41:01 +10:00 |
|
Dave Woestenborghs
|
f6263aad5b
|
U4-11167 wrap syncTree method to handle rare occasions where it is not defined yet
|
2018-03-31 15:09:30 +02:00 |
|
Dave Woestenborghs
|
28a0e30315
|
U4-11164 fixed blank screen for about 30 seconds after logging in. Because of q.all we don't need to wait until promise is resolved, because all promises are resolved when this is hit
|
2018-03-30 11:20:41 +02:00 |
|
Dave Woestenborghs
|
d1eb6b1aa8
|
U4-11161 don't show help text when it's not a multipicker
|
2018-03-28 17:07:56 +02:00 |
|
Dave Woestenborghs
|
458d023ff4
|
U4-11161 set min and max number in default config
|
2018-03-28 17:03:35 +02:00 |
|
Shannon
|
89c376f77a
|
adds ValueTuple reference to nuspec
|
2018-03-26 20:08:11 +11:00 |
|
Claus
|
7c264b4da0
|
adding using statement to preview file to prevent missing htmlhelper error.
|
2018-03-23 11:57:29 +01:00 |
|
Claus
|
716020602d
|
adding using statement to preview file to prevent missing htmlhelper error.
|
2018-03-23 11:55:23 +01:00 |
|
Sebastiaan Janssen
|
8c0ec489c2
|
Bump version to 7.11
|
2018-03-23 09:54:11 +01:00 |
|
Sebastiaan Janssen
|
81d380a47e
|
Merge branch 'dev-v7' into master-v7
|
2018-03-22 14:55:52 +01:00 |
|
Sebastiaan Janssen
|
19e5715a84
|
Whoops, that was not supposed to say beta
|
2018-03-22 14:55:02 +01:00 |
|
Sebastiaan Janssen
|
2e2dce170a
|
Merge branch 'dev-v7.10' into master-v7
|
2018-03-22 11:28:48 +01:00 |
|
Sebastiaan Janssen
|
59f9a64e81
|
Merge branch 'dev-v7' into dev-v7.10
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
|
2018-03-22 11:27:26 +01:00 |
|
Sebastiaan Janssen
|
98b7467306
|
Merge branch 'dev-v7' into master-v7
|
2018-03-22 10:53:24 +01:00 |
|
Sebastiaan Janssen
|
4bb75d73dd
|
Bump version to 7.9.3
|
2018-03-22 10:50:12 +01:00 |
|
Shannon Deminick
|
dd8e43d80a
|
Fixes U4-10472 Cannot upgrade to 7.7+ when using MySql (#2493)
* Fixes U4-10472 Cannot upgrade to 7.7+ when using MySql
* Fixes dropping the FK for the AddUserGroupTables migration
|
2018-03-22 10:35:41 +01:00 |
|
Claus
|
c9c9e8352a
|
Merge pull request #2532 from umbraco/temp-U4-11134
redirects preview to login when not authorized
|
2018-03-22 10:22:32 +01:00 |
|
Shannon
|
c4e5ab54d2
|
redirects preview to login when not authorized
|
2018-03-22 19:55:55 +11:00 |
|
Shannon
|
53bfec8a04
|
Merge branch 'dev-v7' into dev-v7.10
|
2018-03-22 19:22:34 +11:00 |
|
Sebastiaan Janssen
|
b4a0dadee9
|
Re-apply the nice C# syntax James provided
|
2018-03-21 19:53:20 +01:00 |
|
Lee Kelleher
|
014ac98d0b
|
U4-11052 - Enabled IntegerValueConverter to handle Int64 source values (#2500)
* Enabled IntegerValueConverter to handle `Int64` source values
|
2018-03-21 19:08:24 +01:00 |
|
Robert
|
35a79a8598
|
Merge pull request #2525 from umbraco/temp-U4-11020
U4-11020 Deleting a member group that is part of a Public Access feat…
|
2018-03-21 13:47:02 +01:00 |
|
Robert
|
3c4f052a27
|
Moved some code around based on feedback
|
2018-03-21 13:45:44 +01:00 |
|
Robert
|
97d7e3db84
|
Forgot add the new namespace
|
2018-03-21 10:46:42 +01:00 |
|
Robert
|
0d2df4de81
|
Some cleanup
|
2018-03-21 10:22:08 +01:00 |
|
Shannon
|
b361cfebb7
|
updates npm build dependencies
|
2018-03-21 13:55:01 +11:00 |
|
Shannon
|
ebea5e8170
|
fixes boolean pre-value editor Html Id
|
2018-03-21 13:53:54 +11:00 |
|
Shannon
|
995f3f38a3
|
Fixes upgrade issue with copying the preview.old directory and updates the link to the the correct public one
|
2018-03-21 12:52:17 +11:00 |
|
Shannon
|
2ad79956d9
|
Re-apply Drop Down Flexible "Merge pull request #2502 from umbraco/temp-U4-11032""
|
2018-03-21 12:37:26 +11:00 |
|
Shannon
|
96c6a17d03
|
Merge branch 'dev-v7' into dev-v7.10
|
2018-03-21 12:36:55 +11:00 |
|
Shannon
|
e2e0dd0c73
|
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
|
2018-03-21 12:34:15 +11:00 |
|
Shannon
|
1a590664e7
|
Revert "Merge pull request #2502 from umbraco/temp-U4-11032"
This reverts commit 2aa0dfb2c5, reversing
changes made to 2c6e7e46c2.
|
2018-03-21 12:32:27 +11:00 |
|
Shannon Deminick
|
64fd6ee7c5
|
Merge pull request #2477 from Shazwazza/U4-10992
U4-10992 (UDUF) TourController Object reference not set to an instance of an…
|
2018-03-21 12:24:50 +11:00 |
|
Shannon Deminick
|
2ed5b6c1ee
|
Merge pull request #2436 from umbraco/temp-U4-10957_2
U4-10957 If RequiredSection is not defined in a tour - backoffice wil…
|
2018-03-21 12:24:10 +11:00 |
|
Shannon Deminick
|
41c4e024de
|
Merge pull request #2505 from umbraco/temp-u4-10756
U4-10756 - id/guid cache
|
2018-03-21 11:42:04 +11:00 |
|
Shannon
|
b46add81f0
|
Merge branch 'dev-v7.10' into temp-u4-10756
|
2018-03-21 11:39:28 +11:00 |
|
Shannon
|
ff31cd9f72
|
Changes Set to Populate, changes Fetch to Query and makes GetById public
|
2018-03-21 11:31:30 +11:00 |
|