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

3296 Commits

Author SHA1 Message Date
Stephan
a4eedb9f8b U4-4575 - refactor 2014-04-16 18:51:12 +02:00
Shannon
a3a0f1a0bf adds some logging 2014-04-16 15:38:16 +10:00
Shannon
f69527eac1 Fixes media uploader issue to ensure non-approved file types are not saved 2014-04-16 15:38:01 +10:00
Shannon
4f5cae55c2 Fixes: U4-4654 7.1.1 InsertMacroController unescapes objects to string 2014-04-14 18:32:28 +10:00
Shannon
5990a95d13 Fixes: U4-4610 Unmapped members in Automapper 2014-04-14 15:20:02 +10:00
Sebastiaan Janssen
2a0e3d803f Merge branch '7.1.1' of https://github.com/umbraco/Umbraco-CMS into 7.1.1 2014-04-08 11:37:50 +02:00
Sebastiaan Janssen
670a67225a Upgrade to Json.Net 6.0.2 2014-04-08 11:37:40 +02:00
perploug
13891bb033 Merge branch '7.1.1' of https://github.com/umbraco/Umbraco-CMS into 7.1.1 2014-04-07 16:08:45 +02:00
perploug
a2efd7ab53 Fixes: U4-4619 Make sure installer pings stats 2014-04-07 16:08:34 +02:00
Sebastiaan Janssen
0f5c79afbc Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.1 2014-04-07 13:02:56 +02:00
Sebastiaan Janssen
4a516f7da9 Manually applying PR #347 2014-04-07 13:01:43 +02:00
Sebastiaan Janssen
fcb080658d Reverting 221bfa5f3d so that views are found in partials again 
Tested creating/editing members with custom properties in combination with our snippets and
that seems to work fine now, so not sure what this was supposed to fix.
Fixes U4-4604 Surface Controller functionality changed in 7.1 breaking site
 2014-04-07 12:16:45 +02:00
perploug
200cec0e23 Hardcodes starterkit guid into the installer 
This way we can change it remotely to another package instead of relying
on just getting the first guid in the collection of kits
 2014-04-03 11:51:51 +02:00
Stephan
9940b78a57 U4-4575 - fix 8371105 2014-04-02 17:00:24 +02:00
Stephan
8371105c10 U4-4575 - property converters use wrong source value 2014-04-02 16:00:46 +02:00
Sebastiaan Janssen
3ca5443350 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-04-02 12:02:29 +02:00
Sebastiaan Janssen
f6d56f51d4 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 
Conflicts:
	src/Umbraco.Core/Services/IRelationService.cs
	src/Umbraco.Web/Controllers/UmbRegisterController.cs
 2014-04-02 12:01:55 +02:00
Sebastiaan Janssen
53c0bd6938 Fixes: Password is not saved when using the Register snippet 2014-04-02 11:59:16 +02:00
Sebastiaan Janssen
a768fe5bb3 Ports behaviour from membershiphelper from v7 to 6 to make them the same 2014-04-02 11:42:48 +02:00
Stephan
b6185b847f U4-4575 - property converters use wrong source value 2014-04-02 11:39:53 +02:00
perploug
891810b045 Adds newsletter to installer 
With the good ol' V6 installer code, ahhh the smell of code patina
 2014-04-02 11:20:35 +02:00
Sebastiaan Janssen
3e17201ce7 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-04-01 11:59:26 +02:00
Sebastiaan Janssen
50321e5936 Merge pull request #336 from bjarnef/7.1.0_-_U4-4026 
Fix for U4-4026 Inline styling affect header text
 2014-03-31 17:32:50 +02:00
Shannon
b9088c9ac0 fixes build 2014-03-28 08:51:25 +11:00
Shannon
49cf0f98ce U4-1752 - Add GetPreValueAsString(id) method to the @Umbraco helper 2014-03-28 08:31:21 +11:00
Shandem
22ffa86e18 Merge pull request #301 from Jeavon/U4-1752 
U4-1752 - Add GetPreValueAsString(id) method to the @Umbraco helper
 2014-03-28 08:21:32 +11:00
Shannon
c01211c62d Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs
 2014-03-27 17:28:46 +11:00
Shannon
d8a3e00440 Fixes: U4-2843 Copying Document Type when Selecting Master Doesn't Work (Master ignored), U4-3552 Copy nested document type is failing 2014-03-27 17:26:55 +11:00
Shannon
264c537b50 Fixes: U4-4530 Edit Profile Snippet: Check for null before loop 2014-03-27 16:52:43 +11:00
Shannon
c309e18f13 Fixes: U4-459 Public Access permissions not set on distributed servers 2014-03-27 16:11:34 +11:00
Shannon
dec60885b4 Fixes more thread safety issues with Access.cs 2014-03-27 15:50:56 +11:00
Shannon
eee09ec45b Completes: U4-459 Public Access permissions not set on distributed servers 2014-03-27 14:43:07 +11:00
Shannon
b4daab2856 started fixing: U4-459 Public Access permissions not set on distributed servers but have commented that code out for now because it will cause problem in some LB scenarios. 2014-03-27 14:28:45 +11:00
bjarnef
0c6e766030 Fix for U4-4026 Inline styling affect header text 
Inline styling on container affect header text and dropdown with
text-align:center on language in settings section.
 2014-03-27 02:42:21 +01:00
Shannon
7444363cef adds another null check to the other TranslateItem method 2014-03-27 08:13:05 +11:00
Jeavon Leopold
07934161a4 Fix for U4-4527 U7 - Creating initial Folder in media section causes exception 2014-03-26 10:07:20 +00:00
Nicholas-Westby
fdd025aefd Replaced "retreive" with "retrieve". 2014-03-25 20:44:47 -07:00
Nicholas-Westby
e36d4768e1 Replaced "retreive" with "retrieve". 2014-03-25 20:44:08 -07:00
Nicholas-Westby
388249f500 Replaced "retreive" with "retrieve". 2014-03-25 20:41:32 -07:00
Nicholas-Westby
17b6366ea3 Replaced "retreive" with "retrieve". 2014-03-25 20:37:20 -07:00
Nicholas-Westby
539efcc669 Replaced "retreive" with "retrieve". 2014-03-25 20:25:24 -07:00
Nicholas-Westby
ffa307613c Replaced "retreive" with "retrieve". 2014-03-25 20:23:36 -07:00
Nicholas-Westby
b66253f33e Replaced "retreive" with "retrieve". 2014-03-25 20:19:50 -07:00
Shannon
ad95736eaa Fixes issues relating to adding ability to sort pre-values, had to update all property editors that use the shared sortable pre-values, ensure the list items are an array and then sorted. 2014-03-26 13:01:53 +11:00
Shannon
be8320bb4b fixes some compatibility issues with PR for sortable pre-vals 2014-03-25 14:14:09 +11:00
Shannon
1d4b6178e5 Merge branch 'wip-u4-3951' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-3951 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html
 2014-03-25 13:31:21 +11:00
Shannon
3427f596e3 fixes up a few notes. 2014-03-25 13:07:16 +11:00
Shannon
c31ea7409f Merge branch 'fix-u4-3839' of https://github.com/lars-erik/Umbraco-CMS into lars-erik-fix-u4-3839 2014-03-25 12:47:26 +11:00
Shannon
f88e60bcb5 Fixes: U4-3481 Adding Scripting Files and Partial View Macro File with the same name and 'create macro' selected fails. 2014-03-25 12:16:27 +11:00
Shandem
b8f88e0459 Merge pull request #330 from Jeavon/7.1.0-ImageCropper-JeavonWIP 
7.1.0 image cropper - removal of lots of duplicated code, fixes for various param options and some further unit tests
 2014-03-25 10:47:09 +11:00