yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,471 Commits 4 Branches 7 Tags
70da51113c2b940742ebfd1e516d351b480997cf
Commit Graph

1816 Commits

Author SHA1 Message Date
Shannon
fa625d72f9 updates some comments 2014-02-10 14:12:44 +11:00
Shannon
3b8d6dc2c7 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0 2014-02-10 13:50:43 +11:00
Shannon
1faeb76c27 Removes the need for duplicate templates for partial views. Of course we can have partial view only templates if necessary but currently we just borrow them from the partial view macros and update the header 2014-02-10 13:50:31 +11:00
perploug
2850c3c3de Improved caching in debug mode by adding global yepnope filter 2014-02-07 15:45:52 +01:00
Sebastiaan Janssen
3a513668fd U4-4185 Log fails to show unicode (cyrillic) characters 2014-02-05 15:52:20 +01:00
Sebastiaan Janssen
b3f6a8c71b Merge branch '7.0.3' into 7.1.0 
Conflicts:
	.gitignore
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
 2014-02-03 11:52:36 +01:00
Sebastiaan Janssen
98684e6292 Add 100 to the ClientDependency.config version to avoid conflicts with older caches 2014-02-03 10:23:13 +01:00
Shannon
c2f34cefb5 Merge branch '7.0.2' of https://github.com/rsoeteman/Umbraco-CMS into rsoeteman-7.0.2 2014-01-29 11:26:05 +11:00
Shannon
68b4a493c6 updates versions and port 2014-01-29 09:46:25 +11:00
Shannon
cfd0973f00 Moves the registration logic to the MembershipHelper, fixes up the views to keep the indexes so props save. 2014-01-28 21:42:30 +11:00
Shannon
1bfdd83ba7 Cleans up more of the membership controllers and snippets to be using the membership helper and fixes up a few issues 2014-01-28 19:41:21 +11:00
Shannon
6fefcacc61 Adds more methods to the MembershipHelper, updates the RegisterModel and obsoletes the standard ctor so biz logic is not happening in the model, updates the snippets to use the correct way. Fixes an issue in the membership repo for persisting new members when the member type doesn't contain all the built-in props. 2014-01-28 18:59:27 +11:00
Shannon
e4e76eb0bf Backports commit: Prefixed built in controllers to better avoid conflicts with people's custom code 
Conflicts:
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
	src/Umbraco.Web/Controllers/UmbLoginController.cs
	src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
	src/Umbraco.Web/Controllers/UmbProfileController.cs
	src/Umbraco.Web/Controllers/UmbRegisterController.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-01-28 13:47:16 +11:00
Shannon
23d9944a61 Merge branch '7.0.2' of https://github.com/kalletoxic/Umbraco-CMS into kalletoxic-7.0.2 2014-01-28 08:47:09 +11:00
Shannon
43c426b46c Update booting.aspx 
Throw the exception immediately if the parameter is not there or empty.

If the parameter is not there it's defaulted to the current url, and this will redirect to itself and create an endless loop here.
 2014-01-24 12:36:02 +11:00
Shannon
0714aaa457 Merge remote-tracking branch 'origin/7.0.2' into 7.1.0 2014-01-24 12:34:40 +11:00
Shandem
81dac97917 Merge pull request #284 from markvantilburg/patch-1 
Update booting.aspx
 2014-01-23 17:33:22 -08:00
Shannon
e2ac82abca Gets most of the User and UserType legacy objects wrapping the new services, yay! Now just need to sort out all the caching stuff which I have tasks for. 2014-01-23 18:44:41 +11:00
Shannon
64d1a484bd Fixes User Id issues with HasIdentity, wraps legacy UserType to the new service, fixes the uninstalling db schema to not throw exceptions and clog up the unit test log. 2014-01-23 17:11:58 +11:00
Shannon
2956aee4e3 Fixes: U4-4108 The backoffice should not be accessible when the app is not configured, it should redirect to the installer and U4-4106 Set the new membership providers to be shipped as default. 2014-01-22 15:26:45 +11:00
Sebastiaan Janssen
ead837f654 U4-4095 Missing Keys in English US Language File 2014-01-20 19:15:50 +01:00
Shannon
e91b297cc2 updates user task creation for release 2014-01-20 16:04:49 +11:00
Shannon
ed83fb8216 updates user task creation for release 2014-01-20 16:00:19 +11:00
Shannon
eb44480fdf fixes package installer path redirect when installing from the repo 2014-01-20 11:58:52 +11:00
Shannon
1ad05fbfc9 Clears the auth cookie after install if there is one which forces the login screen to display so that the csrf tokens are created - this is required if you are upgrading from a previous version and are logged in but don't have a version with csrf tokens. 2014-01-20 10:53:14 +11:00
Shannon
4842be01cd Ensures app domain restarted after db upgrade to clear PetaPoco's mapping cache. 2014-01-20 10:36:37 +11:00
Sebastiaan Janssen
171a472966 Split out the Belle build and integrate it in the build of the Web.UI project 2014-01-17 18:56:04 +01:00
Sebastiaan Janssen
c2ee3303a5 U4-4059 Update MNTP snippets for string of id's rather than old xml fragment 2014-01-16 19:49:57 +01:00
Shannon
4fd3725c51 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.cs
	src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx
	src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx.cs
 2014-01-16 20:09:18 +11:00
Shannon
2b1a43b40a Finally got somewhere with U4-4011 Package installation will require either a full app refresh or we will need to re-lazy load in all of the assets - took ages to get this going, now to get it working when packages have custom screens. 2014-01-16 18:33:31 +11:00
Sebastiaan Janssen
f56cb2c3ac Hardcoded empty snippets need to be updated as well.. 2014-01-15 21:11:35 +01:00
Sebastiaan Janssen
ae83b0fbaf Hardcoded empty snippets need to be updated as well.. 2014-01-15 21:07:24 +01:00
Sebastiaan Janssen
fb7b65cf3b Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-15 20:57:42 +01:00
Sebastiaan Janssen
168abddacf U4-2737 Snippets that are available when creating new MacroScripts should also be available for Partial Views 2014-01-15 20:57:27 +01:00
Sebastiaan Janssen
99e91a1053 U4-2737 Snippets that are available when creating new MacroScripts should also be available for Partial Views 2014-01-15 20:55:17 +01:00
Sebastiaan Janssen
bad118ac6b U4-4046 Rename "empty template" to "empty" 2014-01-15 10:17:46 +01:00
Shannon
f334c3d74a playing a bit more with re-initializing the app, but think we're def gonna have to do a full browser refresh. To do that we'll have to figure out how to gen a deep link url to the installer complete screen which could include a custom screen from a package. 2014-01-15 17:47:46 +11:00
Shannon
0e6c199a7e working on U4-4011 Package installation will require either a full app refresh or we will need to re-lazy load in all of the assets but unfortunately we cannot lazy load in things like directives as angular doesn't like that, we have to re-load the browser. 2014-01-15 17:18:23 +11:00
Shannon
0bc39afdab fixes language drop down styles - was too big to fit 2014-01-15 15:39:35 +11:00
Shannon
cf3de52249 removes the old language.ascx webforms files 2014-01-15 15:36:28 +11:00
Shannon
84da5f43a2 U4-4045 The "Empty" partial view snippet should have @inherits 2014-01-15 10:41:37 +11:00
Sebastiaan Janssen
0aa72e5026 Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-14 15:21:38 +01:00
Sebastiaan Janssen
14cfd2a8df D'oh .. now properly renamed, in the csproj as well - U4-4046 Rename "empty template" to "empty" 2014-01-14 15:21:20 +01:00
perploug
cf837d783d Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2014-01-14 15:00:05 +01:00
perploug
ba2fa2bff4 Legacy dialogs missing conversion, language + partial view 2014-01-14 14:33:11 +01:00
Sebastiaan Janssen
03090e85fd U4-4046 Rename "empty template" to "empty" 2014-01-14 13:51:08 +01:00
Sebastiaan Janssen
5c55d6a6e3 U4-4045 The "Empty" partial view snippet should have @inherits 2014-01-14 13:49:20 +01:00
Shannon
0632d73e32 fixes view state and err styling for protect page 2014-01-14 16:56:38 +11:00
Shannon
000c2637d6 fixes view state and err msg 2014-01-14 16:54:32 +11:00
Shannon
08c837602f Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Models/MemberType.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
 2014-01-14 16:28:48 +11:00