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

7599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
d9c42e2aca Fixes initial part with legacy trees and legacy actions - now a modal window can launch - but now we need to get the legacy umb client manager js tree stuff hooked in. 2013-10-14 18:47:34 +11:00
Shannon
df25edfaf6 Fixes: U4-2928 Packages tree shows context menu for items that shouldn't have one + other issues with legacy trees and menus 2013-10-14 15:36:17 +11:00
Sebastiaan Janssen
d41188598a Merge pull request #165 from parnar/7.0.0 
translated some keys in he.xml language file
 2013-10-13 02:57:07 -07:00
parnar
2ed7fc06ea translated some keys in he.xml language file 2013-10-11 19:35:34 +02:00
perploug
5f1c69bc13 Stops tinymce from converting absolute urls 2013-10-11 13:12:21 +02:00
Stephan
4740e5f0c7 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-10-11 12:28:56 +02:00
Stephan
4b36dcc13b Fix bug after merge 2013-10-11 12:28:31 +02:00
perploug
b92f5c4719 ui.xml file changes 2013-10-11 12:19:39 +02:00
perploug
11441fb1b1 ui.xml release files 2013-10-11 12:16:24 +02:00
perploug
377879d081 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-11 12:13:29 +02:00
perploug
738cc81439 fixes membersearch returning no results 2013-10-11 12:12:29 +02:00
Sebastiaan Janssen
14ba484fc1 Don't include release configs in final package 2013-10-11 12:11:47 +02:00
Stephan
0f894da7a6 Merge remote-tracking branch 'origin/7.0.0-pubcontent' into 7.0.0 2013-10-11 12:07:26 +02:00
Stephan
52640a94ee Fix tests after merge 2013-10-11 12:05:52 +02:00
perploug
133e2fdba7 tree config updates 2013-10-11 11:48:26 +02:00
perploug
e6ef1c2506 header error message 2013-10-11 11:43:57 +02:00
Stephan
7718adfca1 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Core/Models/DataTypeDefinition.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
 2013-10-11 11:11:18 +02:00
perploug
afe3ace32e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-11 10:54:50 +02:00
perploug
9a0679d41c docs update 2013-10-11 10:54:39 +02:00
Sebastiaan Janssen
a54b2297c7 Changed version to beta 2013-10-11 10:51:12 +02:00
Stephan
871e390c5e U4-3094 - Fix GetPropertyValue returned type in DynamicPublishedContent 2013-10-11 10:28:16 +02:00
Stephan
34875855db U4-3095 - Fix IPublishedContent navigation axes 2013-10-11 10:27:49 +02:00
Tim Geyssens
6c0fb765f0 Related links prop editor: fixes issue in view 2013-10-11 10:25:11 +02:00
Stephan
69367e0cda Merge remote-tracking branch 'origin/6.2.0-pubcontent' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Core/Models/DataTypeDefinition.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Properties/AssemblyInfo.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
	src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
 2013-10-11 10:24:24 +02:00
Stephan
15bbe1b829 PublishedContentModel - keep it internal for now 2013-10-11 10:10:19 +02:00
perploug
f95ec4d8f4 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-11 09:47:57 +02:00
perploug
4a6f0a791e Multinode treepicker now supports media,content,members + search 2013-10-11 09:47:36 +02:00
Tim Geyssens
3779ba38cb Related links prop editor: make sure value is saved 2013-10-11 09:47:11 +02:00
Shannon
2c6eeb7193 changes order of migrations 2013-10-11 18:40:54 +11:00
Shannon
6c5849cca9 adds new db indexes 2013-10-11 18:40:37 +11:00
Stephan
671b94dd06 PublishedContentModel - keep it internal for now 2013-10-11 09:24:26 +02:00
Stephan
bc9dc911ed Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent 2013-10-11 09:24:06 +02:00
Stephan
cc8298d83c U4-2606 - List registered types in a ManyObject resolver 2013-10-11 09:22:48 +02:00
Shannon
42dd48a3d1 removed editmember.aspx 2013-10-11 17:32:04 +11:00
Shannon
d97a98f45d Updates the macro tag parser to not care about the class - if it ever gets stripped again it won't matter on the server side. 2013-10-11 17:28:50 +11:00
Shannon
8d892bd099 Fixes: U4-3093 RTE doesnt pre-render macros 2013-10-11 17:18:14 +11:00
Shannon
886ab32f27 Streamlines both insert macro and change password forms. 2013-10-11 16:20:10 +11:00
Shannon
937b308444 Streamlines form and form validation with new val-form-manager (replaces a couple of other directives). Fixes styling on the umb-content-name, removes the test MyPackage stuff from app-plugins. 2013-10-11 15:44:49 +11:00
Shannon
ee4c0cbfc3 Streamlines how forms (editors) work with a new formHelper, this reduces much of the repetitive code and also ensures that the correct events fire, this will be the start of streamlining how all forms work - even simple ones. 2013-10-11 14:11:25 +11:00
Shannon
3ba9f87d93 Simplifies the editors and file manager service so they don't have to manually clear the files, this is now done automatically on route change. 2013-10-11 13:20:37 +11:00
Shannon
626f21aecd changes controller code to use contentId scope var 2013-10-11 13:08:12 +11:00
Shannon
2f6637dcc4 Removes the editorContextService - there is zero reason to have this and it will also mean that the content item that is being stored is never released from memory. Changes form event names to formSubmitting and formSubmitted 2013-10-11 13:05:09 +11:00
Shannon
21de6dfd00 Fixes the DataTypeDefinition - addition data ctor 2013-10-11 12:43:57 +11:00
Shannon
a3b0714a9d Fixes the tab error styles - ensures all tab styles are in one place - tab errors should *not* show up until form is submitted. 2013-10-11 12:37:58 +11:00
Shannon
b9975ad1f5 Gets password resetting working and displaying the generated one in the UI. 2013-10-11 12:25:10 +11:00
Shannon
b63135771e Got more member reset password working based on the provider config. 2013-10-11 11:44:48 +11:00
Shannon
bc828176d1 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/DataTypeDefinition.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Properties/AssemblyInfo.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
 2013-10-11 11:02:35 +11:00
Shannon
13dcfbbd2b Fixes build - removes .net 4.5 reference of EmailAddressAttribute - we'll leave that in for v7 when targettng 4.5 2013-10-11 10:58:31 +11:00
perploug
3d8138f3ef Added configuration to the multinode picker 2013-10-10 21:15:04 +02:00
perploug
e67f85695c fixes U4-3054 icon picker viewstate 2013-10-10 19:47:12 +02:00