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

8237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Morten Christensen
7306ddef14 Merge pull request #182 from stocksr/6.2.0-petapoco-refactor 
6.2.0 petapoco refactor - umbraco.cms.businesslogic.language.Item
 2013-11-07 03:37:37 -08:00
Morten Christensen
17bb29eb66 Merge pull request #185 from saciervo/6.2.0 
Use PetaPoco instead of SqlHelper
 2013-11-07 03:35:49 -08:00
Morten Christensen
8bf3de738f Merge pull request #188 from stocksr/6.2.0-petapoco-refactor-umbraco.cms.businesslogic.language.Language 
Refactoring umbraco.cms.businesslogic.language.Language class
 2013-11-07 03:34:08 -08:00
Robert Stocks
2d37502a44 Refactoring umbraco.cms.businesslogic.language.Language class 2013-11-07 11:28:00 +00:00
Ryan Lewis
d5c485205a Whitespace 2013-11-07 11:24:40 +00:00
Ryan Lewis
9533198365 Can open VS solution with only Visual Studio 2013 installed (fixes U4-3445) 2013-11-07 11:23:41 +00:00
Morten Christensen
66f20e3800 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-11-07 12:19:27 +01:00
Sandro Ciervo
9269a98806 Refactored Umbraco.Web.UI.Controls.InsertMacroSplitButton 
- CreateChildControls()
- DoesMacroHaveParameters (Int32)
 2013-11-07 12:15:03 +01:00
mkariti
7c97fddec5 fix U4-1477 2013-11-07 13:08:56 +02:00
Morten Christensen
a567cf2a87 Minor update to the DefaultData so the used PetaPoco db object is consistent 2013-11-07 12:00:45 +01:00
Morten Christensen
1e319d667b Updating the remaining methods in the Notification class so it no longer uses the legacy SqlHelper. 2013-11-07 11:59:59 +01:00
Sebastiaan Janssen
cc039e365d Merge pull request #181 from Attackmonkey/Tim-Payne-Hackathon-U4-2708 
Fixes issue U4-2708
 2013-11-07 02:55:03 -08:00
Morten Christensen
f91ff5dc31 Special commit for a special Lars-Erik 2013-11-07 11:48:25 +01:00
Robert Stocks
9347a2edbb Refactoring umbraco.cms.businesslogic.language.Item class - Fix Update and Delete calls 2013-11-07 10:40:23 +00:00
Robert Stocks
64a73ef528 Refactoring umbraco.cms.businesslogic.language.Item class 2013-11-07 10:20:55 +00:00
Tim Payne
4ea04f5ffe Fixes issue U4-2708 2013-11-07 10:08:11 +00:00
Morten Christensen
6b006e6fd7 Refactoring GetUserNotifications method in the Notification class 2013-11-07 11:00:19 +01:00
Shannon
30fe174601 working on U4-3442 tree sync doesn't work for nodes that are not loaded 2013-11-07 17:53:46 +11:00
Shannon
31448eb987 Fixes: U4-3427 Tree persistence not working 2013-11-07 17:41:44 +11:00
Shannon
29cf9ae46a Changes all references of navigationService.ui.currentTreeNode to be navigationService.ui.currentNode since that was what has existed previously, now suddenly we have 2 references to current tree node - I'm 99% sure that we only want one reference and currentTreeNode seems to have been added later and isn't declared properly on the nav service. 2013-11-07 17:32:06 +11:00
Shannon
01eb7157bd Adds missing moveNode from the legacy tree api 2013-11-07 17:20:01 +11:00
Shannon
bacdcb7abf updates some more logic when saving macro properties to always try to map to the new ones if legacy aliases are used. 2013-11-07 16:07:08 +11:00
Shannon
164b630d5e Fixes: U4-3428 Macro Parameter Types aren't set correctly when a (legacy) package installs them 2013-11-07 16:00:58 +11:00
Shannon
d9abbd4232 Fixes: U4-3437 Deleting a macro with parameters causes YSOD 2013-11-07 15:16:18 +11:00
Shannon
3d6eea9470 Fixes: U4-3350 Content Validation: Can't get rid of DateTime error 2013-11-07 14:58:41 +11:00
Shannon
345b96e253 Moves TreeControllerBase to separate file and moves the CreateTreeNode methods to that controller so they can be used in events handlers. 2013-11-07 13:52:06 +11:00
Shannon
546788761f Fixes merge issue 2013-11-07 12:33:06 +11:00
Shannon
fad84ac0bb Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/members/EditMember.aspx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
 2013-11-07 12:30:28 +11:00
Shannon
fc0654a80f Fixes: U4-2241 Native Multi-node tree picker in Member Types: Saving clears selected items 2013-11-07 12:02:41 +11:00
Sebastiaan Janssen
4717faaf1b Merge pull request #180 from Jeavon/U4-3432 
Fix for U4-3432Rollback Dialog - CreateDate/Creator formatting tweaks
 2013-11-06 09:48:08 -08:00
Jeavon Leopold
e7d587f776 Fix for U4-3432Rollback Dialog - CreateDate/Creator formatting tweaks required 2013-11-06 17:19:18 +00:00
Anders Stentebjerg
ceab957db5 Styling hover state on Page Name 2013-11-05 14:28:57 +01:00
perploug
ac21859587 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 14:28:23 +01:00
perploug
fc6fb4030b re-adds deleted macro container files 2013-11-05 14:28:07 +01:00
Sebastiaan Janssen
039ec7b958 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-11-05 14:27:09 +01:00
Sebastiaan Janssen
5659ab5fc0 Remove promise of image galleries and blogs in installer screen. :) 2013-11-05 14:26:28 +01:00
perploug
f6b2888c26 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 13:56:45 +01:00
perploug
e41e017fa3 fixes dialog iframe auto-expanding 2013-11-05 13:56:20 +01:00
Anders Stentebjerg
63eccb4909 Styling: Error on tabs + hover state 2013-11-05 13:48:46 +01:00
Sebastiaan Janssen
4f9ddfeb7a Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 13:19:38 +01:00
Sebastiaan Janssen
c19a8fa602 U4-3385 Find a better solution for approving members 2013-11-05 13:19:06 +01:00
Anders Stentebjerg
17529b90b6 Aling checkboxes and text 2013-11-05 13:16:43 +01:00
perploug
2371a40a8a Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 12:38:59 +01:00
perploug
d2ae358a3d hide search list on selection 2013-11-05 12:38:45 +01:00
perploug
f30416d20f add border to bottom buttons 2013-11-05 12:38:32 +01:00
perploug
ef16e6c72f history service skip dublicate entries 2013-11-05 12:38:20 +01:00
perploug
51c459d654 Fixes placeholder label overriding name label 2013-11-05 12:38:01 +01:00
Sebastiaan Janssen
01b21dc9eb Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 12:01:15 +01:00
perploug
bcf20f9f3f Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 12:01:00 +01:00
Sebastiaan Janssen
fed8f51de8 Prefixed built in controllers to better avoid conflicts with people's custom code 2013-11-05 12:00:56 +01:00