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

5659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
90cfd004cb Merge branch 'wip-u4-1949' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-1949 2013-07-19 15:41:15 +02:00
Sebastiaan Janssen
7e24af9daf Merge branch '6.1.3' of github.com:umbraco/Umbraco-CMS into 6.1.3 2013-07-19 15:19:27 +02:00
Sebastiaan Janssen
7518b514a7 Merge pull request #51 from kipusoep/master 
Updated the download link
 2013-07-19 15:19:01 +02:00
Sebastiaan Janssen
96c38f50e4 Merge pull request #49 from lars-erik/6.1.3 
Prettifying norwegian translation
 2013-07-19 06:17:48 -07:00
Sebastiaan Janssen
e723f1169f Merge pull request #48 from marc303/patch-1 
Updated DE to 6.1.2
 2013-07-19 06:16:48 -07:00
Sebastiaan Janssen
914005b2b6 Merge pull request #46 from michielvoo/u4-2417 
U4-2417 Could the preview thumbnail link to the full image
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx.cs
	src/umbraco.editorControls/mediapicker/mediaChooser.cs
 2013-07-19 15:09:07 +02:00
Sebastiaan Janssen
972b903f52 Merge pull request #32 from AndyButland/wip-u4-1285 
Fix for U4-1285: Apostrophes in member groups cause exceptions
 2013-07-19 14:40:28 +02:00
Sebastiaan Janssen
61d072c8d6 Fix merge issue 2013-07-19 13:32:24 +02:00
Sebastiaan Janssen
8740848aac Merge pull request #42 from michielvoo/u4-232 
Enabled support for integrated security for SQL Server to the installer.
Conflicts:
	src/Umbraco.Web.UI/install/steps/database.ascx
 2013-07-19 13:29:07 +02:00
Sebastiaan Janssen
6766aa9732 Merge pull request #41 from michielvoo/u4-667 
U4-667
 2013-07-19 13:19:30 +02:00
Sebastiaan Janssen
a57334d1f7 Merge pull request #40 from michielvoo/u4-663 
U4-663
 2013-07-19 12:55:16 +02:00
Sebastiaan Janssen
3dea16fad1 U4-2309 BackOffice / ExamineMngr : "Optimize index" don't ends correctly when website has not members. 2013-07-19 12:39:50 +02:00
Shannon
1bf4121796 Fixes a null check in UmbracoTemplatePage 2013-07-19 12:36:02 +10:00
Shannon
93bebdd50b Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-19 12:27:59 +10:00
Shannon
6a9532f10a Fixes: U4-1599 [MVC] ChangeContentType doesn't work in macros rendered from a View -> We need to manually reset the ContentType after we execute a webforms based macro because Server.Execute resets the ContentType back to the default. 2013-07-19 12:27:37 +10:00
Sebastiaan Janssen
d88494e90e U4-638 Bug (and fix/solution): Saving inline base64 image (or any attribute value with equal sign at the end) 2013-07-18 17:09:26 +02:00
Sebastiaan Janssen
e48f08b657 When using Public Access > Single User Protection the email of the member is empty, this caused errors because the result of GetMembersFromEmail is null 2013-07-18 16:07:39 +02:00
Sebastiaan Janssen
a79e349f3d U4-2467 v4.11.1: Membership search does not search on email address anymore 2013-07-18 11:00:56 +02:00
Shannon
1c70570078 Fixes : U4-2055 Unpublish Date Bug in Umbraco 6.0.3 -> with unit test to ensure that all dates are formatted as ISO date standards when used in SQL 2013-07-17 14:16:38 +10:00
Shannon
d8aad718d5 Fixed broken unit test 2013-07-17 11:28:46 +10:00
Sebastiaan Janssen
1d7bfc2781 U4-2465 "Login Name already exists" when creating a new member that existed before 2013-07-16 13:33:52 +02:00
Sebastiaan Janssen
8063717e4c U4-2511 Locallink:NODEID not working 2013-07-16 13:21:27 +02:00
Lars-Erik Aabech
3900b7ebc8 Remove WebForms from nuspec file 
Not just WebForms anymore. :)
 2013-07-16 13:09:53 +02:00
Shannon
0296c646cb Fixes up a small code issue for U4-2505 2013-07-16 11:45:28 +10:00
Sebastiaan Janssen
1cd2dc8a42 Fixes U4-2436 Editing an existing property changes its alias 2013-07-15 16:52:23 +02:00
Sebastiaan Janssen
60867af1a7 Fixes U4-2444 Missing image - /umbraco/images/pinnedIcons/umb.ico 
Also fixes casing of folder names
 2013-07-15 16:31:19 +02:00
Sebastiaan Janssen
1e129bcc4d Fixes U4-2505 umbraco 6.1.2 throws System.NullReferenceException on the first publish after site compilation 2013-07-15 16:16:39 +02:00
Sebastiaan Janssen
e5c758bbc1 Fixes U4-1838 uGoLive Success/Failure Images not showing 2013-07-15 16:07:42 +02:00
Shannon
25780663a6 Fixes: U4-1304 Umbraco.Field not replacing localLink when recursive:true . 2013-07-15 15:26:18 +10:00
Sebastiaan Janssen
aa327696fe Fixes U4-2354 MiniProfiler - Show SQL parameter values and more stacktrace info 
Refactored duplicate code
 2013-07-10 12:35:21 +02:00
Lars-Erik Aabech
1272a7c74b Prettifying norwegian translation 
Removed obsolete, translated new, removed incorrect spacing and
hyphenation, misc. improvements in term usage. Ref.
http://i18n.skulelinux.no/nb/Fellesordl.eng-no.html.
 2013-07-09 12:56:13 +02:00
esn303
dcbe6726b0 Updated DE to 6.1.2 
Markup encoded instead of CDATA blocks
 2013-07-09 10:30:20 +02:00
Shannon
ba68da5736 Makes Domain.GetDomains public (#U4-2483) 2013-07-09 11:55:29 +10:00
Shannon
fdabd945dc Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-09 11:48:03 +10:00
Shannon
868edee5e6 Fixes: #U4-2161 - permissions inheritance. Fixes up how user permissions cache is invalidated and looked up (it is now lazy and not forced). User permissions are also cached as a low priority for now and only for 20 mins based on #U4-2474. 2013-07-09 11:47:46 +10:00
Shannon
b91d0bb117 Updates ContentRepository to bulk insert all parent permissions at once (overload to the AssignEntityPermissions method) 2013-07-09 10:08:31 +10:00
Shannon
90b94f6ffb Fixes: #U4-2476 2013-07-08 18:58:38 +10:00
Shannon
3c4cf56309 Fixes: #U4-2475 2013-07-08 18:47:53 +10:00
Shannon
b7f6195791 Started adding base PermissionsRepository for sub classes to use for assigning permissions, created a BulkImport extension methods for PetaPoco with tests since we'll be needing that for assigning permissions in a nice way. Wrote unit tests for all sql gen for permissions and assigning permissions. This all starts fixing #U4-2161 but there's still a bit more work to do. 2013-07-08 17:29:26 +10:00
Morten Christensen
42eb82e6ca Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-05 10:55:12 +02:00
Morten Christensen
93def731ef Fixes #U4-2466 2013-07-05 10:51:19 +02:00
Shannon
60805f91d6 bit of code cleaning. 2013-07-05 16:58:51 +10:00
Shannon
048480d5be Fixes: #U4-2460 - UmbracoHelper.RenderTemplate will now execute the complete MVC cycle when rendering MVC templates whereas before it would only execute the view which means any actionfilters, etc... applied would never have fired (as well as other things) 2013-07-05 14:12:31 +10:00
Morten Christensen
173d388c12 Fixes #U4-2450 2013-07-04 12:31:31 +02:00
Morten Christensen
b1285fa7e3 Add missing id to unique naming overload 2013-07-04 12:31:10 +02:00
Morten Christensen
e34c857f6c A bit of refactoring around unique naming, and implementing it for media as well 2013-07-04 11:22:59 +02:00
Morten Christensen
7ff0e6cd4b Fixes #U4-2458 2013-07-04 10:50:02 +02:00
Shannon
0683094f84 oops, overwrote previous changes to CmsNode, now merged them back in properly. 2013-07-04 12:20:25 +10:00
Shannon
983b7a85e1 Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-04 12:13:24 +10:00
Shannon
d015780b9f Fixes: #U4-2447 - non thread safe icon lookup 2013-07-04 12:13:02 +10:00