yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,898 Commits 4 Branches 7 Tags
f26d759c8444cf7f49e82f82f2c1cd3ca2e236fc
Commit Graph

5898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
f26d759c84 Moved controllers and models as per Shannon's suggestion 
Added LoginStatus and updated Register
Updated to use CDF instead of <script> tags
 2013-08-28 13:36:04 +02:00
Sebastiaan Janssen
8274883fa5 Bump version number to 6.2.0 2013-08-28 09:09:21 +02:00
Sebastiaan Janssen
12b3d50717 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-08-27 19:29:43 +02:00
Sebastiaan Janssen
86276206d5 Add register member partial view macro template 2013-08-27 19:29:15 +02:00
Stephan
da719377df U4-2691 - fix issue with alt template and internal redirects 2013-08-27 18:06:53 +02:00
Sebastiaan Janssen
53b6fb7b56 Add login template to partial view macros 2013-08-27 11:37:20 +02:00
Sebastiaan Janssen
6bbc2de43e Update failing unit test due to added action for changing the document type on a node 2013-08-27 09:37:00 +02:00
Sebastiaan Janssen
91590c824f Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-08-26 17:28:31 +02:00
Sebastiaan Janssen
d17b2cf884 Added ability to have predefined templates for Partial View Macros 2013-08-26 17:28:15 +02:00
Morten Christensen
aed017641d Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-08-26 17:01:05 +02:00
Morten Christensen
2b82e74b90 Adding test fixture for the MemberRepository 2013-08-26 17:00:12 +02:00
Morten Christensen
37d190c97d Implementing read-only DTOs for improved reading of Members from db. 
Started implementation of Member, MemberType and MemberGroup repositories.
 2013-08-26 16:59:41 +02:00
Morten Christensen
f1818aae1b Updating the Profile and Member classes 2013-08-26 16:58:08 +02:00
Sebastiaan Janssen
ee4312b7f2 U4-2464 Single user protection, password not changeable! 2013-08-26 13:56:22 +02:00
Sebastiaan Janssen
2345a5e133 U4-2477 Member editing - Indicate which box is active and which is inactive 2013-08-26 13:45:09 +02:00
Sebastiaan Janssen
cbe8f15007 U4-2636 Allow at root property are outside of view in backoffice 2013-08-26 12:11:07 +02:00
Sebastiaan Janssen
dd59038369 Fixes U4-2686 Error when trying to delete member group with ampersand in name. 2013-08-26 10:29:30 +02:00
Sebastiaan Janssen
c9942d7ca5 Merge pull request #106 from pynej/code-mirror-search 
Added plugin to all code area editors to suppressed normal browser Find ...
 2013-08-25 08:37:08 -07:00
Sebastiaan Janssen
ab8e6b8f33 Merge branch 'wip-dragdrop2' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-dragdrop2 2013-08-25 17:26:08 +02:00
Sebastiaan Janssen
d21f10ec1e Db migration to allow admins to change the document type 2013-08-25 17:14:01 +02:00
Sebastiaan Janssen
76d0ffb797 Merge branch 'wip-changedoctypeui' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-changedoctypeui 
Conflicts:
	.gitignore
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-08-25 15:50:07 +02:00
Sebastiaan Janssen
6437179a83 Merge pull request #112 from dampee/6.1.3 
U4-2638 Developer/Packages/Install Starterkit give 500 server error
 2013-08-25 05:36:49 -07:00
Sebastiaan Janssen
cc45bbeca6 Fix unit tests that failed because UmbracoSettings.config was being cleaned up 2013-08-23 16:22:26 +02:00
Sebastiaan Janssen
8cd9266ea6 Updated obsolete msg after feedback here: 2b532f72c3 (commitcomment-3899011) 2013-08-23 14:17:40 +02:00
Sebastiaan Janssen
ad44feb6dd Don't throw exception when node has no template and asking for GetTemplateAlias (return string.Empty instead) 2013-08-23 14:08:13 +02:00
Sebastiaan Janssen
16ed85ecc9 Merge branch '4.11.10' into 6.2.0 
Conflicts:
	.gitignore
	build/Build.bat
	src/Umbraco.Core/Configuration/GlobalSettings.cs
 2013-08-23 13:48:38 +02:00
Sebastiaan Janssen
9d45b10ee5 Merge pull request #104 from umbraco/6.0.7 
6.0.7
 2013-08-23 04:46:41 -07:00
Sebastiaan Janssen
e9f8cf25b9 Merge branch '6.0.0-PetaPocoExtension' into 6.2.0 
Conflicts:
	.hgignore
 2013-08-23 13:42:26 +02:00
Sebastiaan Janssen
19a3b8809e Merge branch '4.11.9' into 6.2.0 
Conflicts:
	.hgtags
 2013-08-23 12:18:25 +02:00
Sebastiaan Janssen
96e40b8b4f Merge pull request #101 from umbraco/4.11.8 
Closing branch 4.11.9 as that version number was used for the emergency ...
 2013-08-23 03:17:46 -07:00
Sebastiaan Janssen
53aeb59eb4 Merge pull request #100 from umbraco/6.0.5 
Closing branch 6.0.5 as that version number was used for the emergency s...
 2013-08-23 03:17:29 -07:00
Sebastiaan Janssen
befb42cd68 Merge pull request #99 from umbraco/4.11.7---cmsContentXml-fixes 
Close 4.11.7 - cmsContentXml fixes branch
 2013-08-23 03:17:06 -07:00
Sebastiaan Janssen
15bab05e18 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-08-23 12:15:37 +02:00
Sebastiaan Janssen
7d2e408363 Merge branch '4.11.5' into 6.2.0 
Conflicts:
	.hgtags
 2013-08-23 12:15:28 +02:00
Sebastiaan Janssen
c1cc62543d Merge pull request #97 from umbraco/6.1.0-public 
Close 6.1.0-public branch, merged.
 2013-08-23 03:13:19 -07:00
Sebastiaan Janssen
6d61c93f62 Merge pull request #96 from umbraco/6.0.0-LegacyApi-Refactor 
Close 6.0.0-LegacyApi-Refactor branch
 2013-08-23 03:12:29 -07:00
Sebastiaan Janssen
38c8860e92 Merge pull request #95 from umbraco/6.0.0-Repository-Resolvers-refactor 
Closing branch after having merged the changes to events to the main 6.0...
 2013-08-23 03:12:08 -07:00
Sebastiaan Janssen
4719bfb4ad Merge pull request #94 from umbraco/4.10.1 
Close 4.10.1 branch
 2013-08-23 03:11:49 -07:00
Sebastiaan Janssen
b5719ab103 Merge pull request #93 from umbraco/4.6.1 
Closing branch
 2013-08-23 03:10:24 -07:00
Sebastiaan Janssen
c82573a697 Merge pull request #92 from umbraco/4.7.1 
Closing branch
 2013-08-23 03:10:03 -07:00
Sebastiaan Janssen
6448554343 Merge pull request #91 from umbraco/4.7.2 
Closing branch
 2013-08-23 03:09:40 -07:00
Sebastiaan Janssen
c0b9e803d9 Merge pull request #90 from umbraco/4.8-apptreexml-wip 
Closing branch
 2013-08-23 03:08:55 -07:00
Sebastiaan Janssen
ab06a22272 Merge pull request #89 from umbraco/4.8-tinymce-wip 
Closing old branch
 2013-08-23 03:08:31 -07:00
Sebastiaan Janssen
eac56eba47 Merge pull request #88 from umbraco/4.8-solutioncleanup-wip 
Close 4.8-solutioncleanup-wip branch
 2013-08-23 03:07:25 -07:00
Sebastiaan Janssen
0e822bdc81 Merge pull request #87 from umbraco/4.6.0 
Closing branch
 2013-08-23 02:52:25 -07:00
Shannon
ec4f6de631 Fixes: U4-2701 The media creation process needs to be optimized, there's far too much IO occuring 2013-08-23 13:41:16 +10:00
Shannon
3bb61294e9 Ensures all IDisposables are in a using clause for all processes involved with the media uploader, there were also a few streams not being closed or disposed either! 
U4-2699 The media upload process doesn't dispose all resources
 2013-08-23 11:46:55 +10:00
Shannon
c477da95fd Ensures all IDisposables are in a using clause for all processes involved with the media uploader, there were also a few streams not being closed or disposed either! 2013-08-23 11:20:00 +10:00
Sebastiaan Janssen
adb059e0da Revert U4-2511 Locallink:NODEID not working as it was breaking expectations of people running site without this fix 2013-08-22 13:13:32 +02:00
Morten Christensen
4337976887 Merge branch '6.1.4' of https://github.com/umbraco/Umbraco-CMS into 6.1.4 2013-08-22 12:59:08 +02:00