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

1065 Commits

Author SHA1 Message Date
Shannon
751ace1168 Merge branch '6.2.0-membershipprovider' into 6.2.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
 2013-12-13 17:17:24 +11:00
Shannon
34df5009e0 Upgraded installer to do a two part install - first install then if an upgrade is required do the upgrade in a second call - this way we can have the progress bar update since the media xml installer can take some time. 2013-12-13 16:58:21 +11:00
Shannon
ce4b56895e fixes installer login check 2013-12-10 11:51:41 +11:00
Sebastiaan Janssen
14790559cb Merge pull request #140 from pynej/search-node-type 
Add node type to search results
 2013-12-08 07:56:50 -08:00
Chriztian Steinmeier
dc60eb8383 Fix a typo/grammar error in da.xml 2013-12-05 13:06:24 +01:00
Jeavon Leopold
3f1b057f45 Fixes U4-3247 - v6.1.6 RTE view/edit HTML doesn't work with IE 11 by upgrading TinyMce to v3.5.10 2013-12-05 09:06:01 +00:00
Shannon
33aa4e2062 Fixes potential xss 2013-12-04 13:33:24 +11:00
Shannon
1efa75c891 Fixes potential xss 2013-12-04 12:42:40 +11:00
Shannon
d4514844f8 Fixes a few other potential xss entry points 2013-12-03 17:58:42 +11:00
Shannon
6b7a495d19 Fixes a few other potential xss entry points and cleans up some legacy webforms files 2013-12-03 16:38:58 +11:00
Shannon
601eb0bf38 Fixes a few other potential xss entry points and cleans up some legacy webforms files 2013-12-03 16:28:51 +11:00
Shannon
a7e32e97e3 Fixes xss issue 2013-12-03 15:40:12 +11:00
esunxray
cacf87be2d Update zh.xml 
update Chinese file for 6.2, this can be merged into V7.
 2013-11-29 21:26:16 +08:00
Shannon
250276bbd4 Merge branch '6.1.6-U4-3619' into 6.2.0 2013-11-29 11:26:01 +11:00
Shannon
af29f61478 Fixes csrf issue 2013-11-29 11:10:25 +11:00
Marc Stöcker
376fe0bf55 changed wording to correct one in context of content 
wording was wrong until today, needed a completely different meaning in the context of the content section; ironically it's just "Alias" now ;)
 2013-11-14 22:22:25 +01:00
Marc Stöcker
282da69d61 Fixed minor typos 2013-11-13 13:27:56 +01:00
yawka
e0a10080b1 Add UI validation for regular expression property 2013-11-07 18:39:27 +02:00
Sebastiaan Janssen
0dc3920309 Merge pull request #191 from dipeshhirani/U4-2756 
Fixed the issue below: U4-2756
 2013-11-07 08:38:44 -08:00
dipunm
a5782a40af Missing languages in RTE insert link dialog. 
Also included files in csproj file to ensure proper build.
 2013-11-07 14:59:00 +00:00
mattbrailsford
7cd01fc50b Added ValidateRequest="false" on package installer page to allow user controls which postback html / code. 2013-11-07 14:35:44 +00:00
Simon Dingley
e9d12ae0d8 Revert "Group jQueryTree script files" 
This reverts commit baed01518c.
 2013-11-07 14:23:53 +00:00
Simon Dingley
baed01518c Group jQueryTree script files 2013-11-07 13:21:01 +00:00
Simon Dingley
e0da5a9cb2 Groups jQuery dependencies using the ClientDependency Group property 2013-11-07 12:45:35 +00:00
mkariti
451d5eb484 U4-415 2013-11-07 14:40:26 +02:00
dipeshhirani
3f2be3342a Fixed the issue below: 
The "Unpublish" button (under Properties tab) is bad translated to Italian.
The used word is "Non pubblicato". This phrase is mean "It is not published".
A best translation is "Non pubblicare" (unpublish).

Did not do any of the others as they are either already done or the requesters change seems incorrect/irrelevent
 2013-11-07 11:42:08 +00: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
Tim Payne
4ea04f5ffe Fixes issue U4-2708 2013-11-07 10:08:11 +00: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
Jeavon Leopold
e7d587f776 Fix for U4-3432Rollback Dialog - CreateDate/Creator formatting tweaks required 2013-11-06 17:19:18 +00:00
Shannon
ae32968efd Updates the legacy membership providers and WebSecurity/Password changer to stay backwards compatible with their previous settings whilst still keeping all of the provider fixes. 2013-10-23 10:19:43 +11:00
Shannon
680a4b9570 Fixes a lot - 
U4-3208 Ensure all membership provider properties exist on the default Member type shipped with Umbraco
U4-3158 user back office password policies doesn't adhere to membership provider rules
and even more fixes to the membership provider like actually integrating the last locked out date and last pword change date. Fixes member creation to actually use the membership provider - this means that the password is created properly based on the provider config. Fixes the provider to have default fields specified so people don't actually have to specify in config.
 2013-10-22 13:41:04 +11:00
Shannon
a87e699f8d Updates the web.config template to allow password reset 2013-10-18 09:54:34 +11:00
Shannon
5d5f7a4516 Updated edit member with correct usage of password changer. 2013-10-18 08:52:46 +11:00
Shannon
61ef83c748 Gets the password changer working - on the edit user page. reset/change password wth validation 2013-10-18 00:37:51 +11:00
Shannon
f82329b371 More updates the password changer and edit user 2013-10-17 22:52:37 +11:00
Shannon
0fee434ac2 Working on the password changer control to present the correct inputs based on the membership provider given.... nearly there. 2013-10-17 22:40:38 +11:00
Jan Skovgaard
3abd4df8bd Enabled lists plugin in tinymce by default 
Fixes http://issues.umbraco.org/issue/U4-3023
 2013-10-16 16:01:17 +02:00
Jan Skovgaard
ea239e6122 Missing languages in RTE insert link dialogue 
Fixes this issue: http://issues.umbraco.org/issue/U4-2551
 2013-10-16 15:53:56 +02:00
Sebastiaan Janssen
76c86daf24 Update da.xml 2013-10-16 11:50:12 +02:00
Lars-Erik Aabech
607a52883a Change doctype - default suggestion none when no matching alias. 2013-10-15 13:21:30 +02:00
Sebastiaan Janssen
12b7a9d874 Argh, didn't save csproj file before committing. 2013-10-07 13:20:34 +02:00
Sebastiaan Janssen
fd5de171c9 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-10-06 16:45:31 +02:00
Sebastiaan Janssen
45ad51b8df U4-2737 Snippets that are available when creating new MacroScripts should also be available for Partial Views 2013-10-06 16:45:21 +02:00
Sebastiaan Janssen
9f3784aaed U4-1242 Template editor sometimes stops editing. 2013-10-05 19:26:01 +02:00
Sebastiaan Janssen
2ab2a5a9f3 Fix bug where Right ALT+S would save in Firefox instead of inserting the correct character 2013-10-05 19:23:57 +02:00
Sebastiaan Janssen
2d83ba06a5 Fix small styling issues in installer 2013-10-05 19:18:11 +02:00
bjawnie
20ab14beb4 Made two minor corrections to the texts. 
"Content>alias" changed to "Alternativ link" from "Alias", so it makes more sense.

"defaultdialogs>treepicker" changed to "Vælg" from "Vælg punkt", so it fits in the button.
 2013-10-03 20:43:42 +02:00
Shannon
86430f1b01 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-10-03 12:46:01 +10:00
Shannon
55247fe31d Finally got around to changing all calls to umbraco.IO to Umbraco.Core.IO - that'll clear up several hundreds of warnings :) 2013-10-03 12:45:40 +10:00