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

8014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
perploug
d9e18859e9 Media recyclebin 2013-11-05 12:00:53 +01:00
perploug
ea73ecd9cb merge 2013-11-05 11:44:34 +01:00
Anders Stentebjerg
1c4129fd64 Disable input[submit] styling 2013-11-05 11:36:43 +01:00
Niels Hartvig
5a690bcf33 Add progress status on starter kit install 2013-11-05 11:24:53 +01:00
perploug
4be6e21257 media editor tree sync 2013-11-05 11:18:23 +01:00
perploug
7e36a6b6e1 translation section icon 2013-11-05 11:18:06 +01:00
perploug
aa4bcdd040 color picker feedback 2013-11-05 11:17:58 +01:00
perploug
c9f29a443d member tree sync fixes 2013-11-05 11:17:43 +01:00
perploug
725ef52243 version comment in build 2013-11-05 11:17:04 +01:00
Stephan
6bc41f53ee Fix bogus PublishedContent unit tests 2013-11-05 10:50:12 +01:00
Tim Geyssens
11366558c9 Fixes U4-3335 Create dialogs, use placeholder instead of setting the value to Enter a name... 2013-11-05 10:40:17 +01:00
Sebastiaan Janssen
11c02eba49 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 09:05:56 +01:00
Sebastiaan Janssen
2617124ee8 Bump version to RC 2013-11-05 09:05:41 +01:00
Stephan
74df45a056 U3-3314 - refactor 4895b5a 2013-11-05 09:01:11 +01:00
Shannon
cf342ece45 Fixes: U4-3322 MNTP doesn't work when choosing media or members 2013-11-05 18:17:16 +11:00
Shannon
fbeff81128 Fixes pickers to be backwards compatible - they by default in v6 stored as INT. Fixing MNTP with media/members. 2013-11-05 14:28:25 +11:00
Shannon
787f304de7 Adds GetByKey to entity controller/repository/service, fixes: U4-3263 Member picker isn't working as expected 2013-11-05 13:23:27 +11:00
Shannon
2a52c584f8 Completes: U4-3293 MNTP, Markdown editor, related links should be core property editors in c# - had to hack a bit of the core for the markdown editor JS because we didn't have mapped icons for what they were trying to use. 2013-11-05 12:19:26 +11:00
Shannon
e6cc5a5736 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-11-05 11:36:49 +11:00
Shannon
1c423245e2 Fixes: U4-3320 When creating a new data type the pre-values are not displayed for a given editor unless you change the editor a couple of times 2013-11-05 11:36:32 +11:00