Shannon
|
de2660cfb2
|
Merge branch '4.11.7---ITask-updates' into 7.0.0
Conflicts:
.gitignore
.hgtags
src/Umbraco.Core/XmlExtensions.cs
src/Umbraco.Tests/Umbraco.Tests.csproj
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/MediaTypeTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/XsltTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/content.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/contentTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/dialogHandler_temp.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/mediaTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/templateTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx.cs
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
|
2013-07-12 11:30:06 +10:00 |
|
Shannon
|
9e0dec89b1
|
updated ignore, we don't want to commit anything to App_Plugins, if you want stuff there you'll need to add them explicitly.
|
2013-07-12 09:20:25 +10:00 |
|
Shannon
|
c81cd0fd1d
|
Merge branch '6.1.2' into 7.0.0
Conflicts:
.gitignore
src/Umbraco.Web.UI/config/ClientDependency.config
|
2013-06-21 15:49:40 +10:00 |
|
Shannon
|
b2c604f7b3
|
updated ignore
|
2013-06-21 11:26:23 +10:00 |
|
Per Ploug
|
03b9a91458
|
merge
|
2013-06-18 11:09:16 +02:00 |
|
Per Ploug
|
e501e7fb98
|
chore Clean up the build/belle directory
|
2013-06-18 10:58:04 +02:00 |
|
Per Ploug
|
4b68d1950c
|
Replaces require.js with jepnope
Gets rid of the AMD pattern, adds scriptLoader service, work on security
service started
|
2013-06-18 10:51:26 +02:00 |
|
Shannon
|
d3780848dc
|
updated ignore file with correct case sensitivity
|
2013-06-18 14:20:50 +10:00 |
|
Shannon
|
a7b546527c
|
Added more methods to User Repo/Service to get an IUser by id. Upgraded to angular 1.5.5 to fix an animation bug. Got authorization working nicely now. Fixed up the animation.less files with 1.5.5's breaking animation changes. Fixed up WebSecurity class to always have an instance of HttpContextBase (still requires much more fixing though).
|
2013-06-17 16:03:27 +10:00 |
|
Shannon
|
c52e51b2d8
|
Fixed up external templated directives to use the templateUrl property which i didn't previously know about, this ensures that a new scope is not created for these elements which was causing issues. updated ignore file some more, removed committed files that shouldn't be there
|
2013-06-17 04:51:59 +02:00 |
|
Shannon
|
c9c3623457
|
updated ignore
Signed-off-by: Shannon <sdeminick@gmail.com>
|
2013-06-17 02:59:00 +02:00 |
|
Per Ploug
|
a8cf9b1a44
|
merge
|
2013-06-11 18:15:17 +02:00 |
|
Per Ploug
|
0ace3a1f74
|
utill.service.js update to support icons
|
2013-06-11 18:06:52 +02:00 |
|
Shannon
|
750b5fcaa3
|
updates ignore
|
2013-06-11 16:44:43 +02:00 |
|
Shannon
|
141e78064b
|
updated ignore
|
2013-06-11 16:39:46 +02:00 |
|
Shannon
|
017987f16d
|
updated gitignore to latest
|
2013-06-11 15:43:33 +02:00 |
|
Shannon
|
5dee0208f5
|
Fixed content title saving
|
2013-06-11 15:04:23 +02:00 |
|
Per Ploug Krogslund
|
20bac8085e
|
Update manifest to support textstring, area, boolean and content picker
|
2013-06-11 13:19:58 +02:00 |
|
Shannon
|
a656911061
|
Updating media picker to work and look properly
|
2013-06-11 12:16:37 +02:00 |
|
Shannon
|
da146891ef
|
Updated ignore file and ignored all Belle build files.
|
2013-06-11 09:32:51 +02:00 |
|
Sebastiaan Janssen
|
ca4f5a39da
|
Add missing files
|
2013-06-11 00:49:19 +02:00 |
|
Sebastiaan Janssen
|
33ff82e766
|
Add missing files
|
2013-06-11 00:47:44 +02:00 |
|