yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,848 Commits 4 Branches 7 Tags
79515cdae78ef1e1792b9075ce64f7a52688f6bb
Commit Graph

21848 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
79515cdae7 Merge branch 'martin-blackwell-U4-8927' into dev-v7 2018-04-12 14:36:21 +02:00
Sebastiaan Janssen
99ce7c0736 Throw error when "downgrading" to a higher version, make sure to give the results back in the correct order (newest version first, oldest last). 2018-04-12 14:35:34 +02:00
Sebastiaan Janssen
fe5896c85f Merge branch 'U4-8927' of https://github.com/martin-blackwell/Umbraco-CMS into martin-blackwell-U4-8927 2018-04-12 13:44:38 +02:00
Sebastiaan Janssen
28cbb0a517 Bumps version to 7.11.0 2018-04-12 13:41:56 +02:00
Sebastiaan Janssen
0597b43014 Merge branch 'patch-v7' into dev-v7 2018-04-12 13:39:09 +02:00
Sebastiaan Janssen
a124d77670 Merge remote-tracking branch 'origin/patch-7.9.4' into dev-v7 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
 2018-04-12 13:38:53 +02:00
mikkelhm
6d052aeeac Bump version to 7.9.4 2018-04-10 08:56:50 +02:00
Dave Woestenborghs
354505fde3 U4-11149 fixed error when creating new xslt file (#2540) 
* U4-10659 added create task back for xslt files

* Add fix to UI.Release.xml as well
 2018-04-09 14:47:09 +02:00
Dave Woestenborghs
9b33c8a0e2 U4-11149 fixed error when creating new xslt file (#2540) 
* U4-10659 added create task back for xslt files

* Add fix to UI.Release.xml as well
 2018-04-09 14:45:26 +02:00
Dave Woestenborghs
07fc6753f5 U4-11149 fixed error when creating new xslt file (#2540) 
* U4-10659 added create task back for xslt files

* Add fix to UI.Release.xml as well
 2018-04-09 14:04:02 +02:00
Sebastiaan Janssen
967178cb92 Manually applies U4-11155 fixed error when creating member groups #2545 2018-04-09 11:43:48 +02:00
Warren Buckley
fe44494936 Merge pull request #2550 from dawoe/temp-U4-11161 
U4-11161 fix for adding multiple items in a single content picker
 2018-04-09 11:42:18 +02:00
Shannon Deminick
793c9470c2 Manually applies merge pull request #2556 from dawoe/temp-U4-11167 
U4-11167 Fixes rare syncTree error
 2018-04-09 11:39:07 +02:00
Sebastiaan Janssen
95d40049f5 Bumps version to 7.10.2 2018-04-09 08:30:39 +02:00
Sebastiaan Janssen
f003c3602c Merge pull request #2545 from dawoe/temp-U4-11155 
U4-11155 fixed error when creating member groups
 2018-04-09 08:28:03 +02:00
Sebastiaan Janssen
862fdf27e4 Merge pull request #2545 from dawoe/temp-U4-11155 
U4-11155 fixed error when creating member groups
 2018-04-09 08:10:53 +02:00
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
Dave Woestenborghs
cf871196f2 U4-11155 changed namespace back to previous value so creating member groups works again 2018-03-27 16:11:07 +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