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

12947 Commits

Author SHA1 Message Date
Shannon
9e931b84db U4-7925 Add dependency injection to Umbraco.Web.Trees.TreeController* 2016-02-10 10:26:09 +01:00
Shannon
be449a96f7 updates to MB rc2 2016-02-10 10:26:08 +01:00
Sebastiaan Janssen
5e8200ecb2 U4-7909 7.4-rc1 is missing references because it's using portable class libraries now 
#U4-7909 Fixed
 2016-02-09 17:10:43 +01:00
Stephan
b6a9734755 Fix ModelsBuilder integration 2016-02-09 11:46:26 +01:00
Shannon
c4cedaddd2 Merge remote-tracking branch 'origin/master-v7' into dev-v7 2016-02-09 11:00:57 +01:00
Shannon
b5a2b3dbbd U4-7922 Preview is not working 2016-02-09 10:56:15 +01:00
Mads Rasmussen
dc4266852f Fixes: U4-7915 7.4 RC1: Cannot change grid background 2016-02-09 09:57:41 +01:00
Simon Busborg
881e8daafd Merge pull request #1104 from abryukhov/patch-3 
Update UI language ru.xml
 2016-02-08 18:51:20 +01:00
Claus
54c1d25296 Fixes: U4-6407 Change Document Type feature on a node doesn't support compositions 2016-02-08 14:39:16 +01:00
Mads Rasmussen
624d3a9b82 fixes: U4-7905 val-highlight directive not highlighting error fields (red border) in 7.4.0 2016-02-08 13:35:59 +01:00
Mads Rasmussen
d46d23b372 Fixes: U4-7732 Grid changes do not trigger Unsaved Changes notification 2016-02-08 12:07:45 +01:00
Mads Rasmussen
aeba68782c fixes: U4-7903 Using shortcut for "add property" removes "add property"-field for other tabs in document type editor && U4-7904 Add property using shortcut - submit button text is missing 2016-02-08 10:54:58 +01:00
Mads Rasmussen
ac60c63104 Fixes: U4-7900 The new content type editor: If you hit save while it generates an alias, the alias will be generatingAlias 2016-02-08 10:20:09 +01:00
Alexander Bryukhov
0ea15ae22e Update UI language ru.xml 
According new / changed keys of 7.4 nightly build 161
 2016-02-07 11:37:06 +06:00
Asbjørn Riis-Knudsen
54548ffc68 U4-7819: Use correct messages when saving Media and Member types 2016-02-06 17:34:36 +01:00
Kevin Jump
11743ea322 Fix GetContentTypeContainer and GetMediaTypeContainer to use correct guid 
updated to use DocumentTypeContainerGuid,  MediaTypeContainerGuid
contstants in calls.
 2016-02-05 13:20:10 +00:00
Simon Busborg
4d74ec7785 Makes editor types tabs accessible. 2016-02-05 11:49:41 +01:00
Mads Rasmussen
08844ea098 close user dialog when clicking on edit, history links and logout 2016-02-05 11:08:34 +01:00
Claus
3449b1efd3 Toggle password fields after successfully changing the password. 2016-02-05 10:43:37 +01:00
Claus
00d012162f Added a bunch of missing translations in user overlay. 2016-02-05 10:38:15 +01:00
Shannon
25482f53ef updates to MB RC1 2016-02-04 20:23:11 +01:00
Mads Rasmussen
82699a8ac9 Fixes: U4-7898 Validation for locked alias still not working 2016-02-04 20:08:19 +01:00
Shannon
0ea68f4f42 added logic for media and member type angular callbacks that existed for content types - assuming this is important and should be there for all content types. Added alias information to validation message returned from server. 2016-02-04 19:40:29 +01:00
Shannon
2cd4e9aa99 makes media types the same as the other content types 2016-02-04 19:26:16 +01:00
Shannon
8e3454d24f Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-04 19:17:00 +01:00
Shannon
e352c65420 fixes server side validation issue for content types 2016-02-04 19:16:45 +01:00
Sebastiaan Janssen
16caeb96bd Another build warning that can be removed 2016-02-04 18:36:26 +01:00
Sebastiaan Janssen
fbd5bdbd1d Surely nobody on their dev machines has the "trust" node in their web.configs any more, no more need to transform that one (gave warning during build.bat) 2016-02-04 18:35:16 +01:00
Shannon
9978b0d8ea Merge branch 'dev-v7' into temp-U4-3447 2016-02-04 18:30:58 +01:00
Shannon
0d9fef5457 changes to use StripWhitespace to fix tests 2016-02-04 18:09:17 +01:00
Shannon Deminick
7449e3bf1d Merge pull request #1096 from umbraco/temp-U4-7895 
U4-7895 - routing fails when path contains dots
 2016-02-04 17:44:39 +01:00
Shannon Deminick
e6550b543d Merge pull request #1099 from robertjf/dev-v7 
U4-7897 Minor update to MembershipProviderBase.DecryptPassword() to remove code smell
 2016-02-04 17:38:59 +01:00
Shannon Deminick
1552a08b46 Merge pull request #1097 from umbraco/temp-U4-7887 
U4-7887 - default to database connection timeout
 2016-02-04 17:30:02 +01:00
Robert Foster
c9d2d574f8 brought PasswordFormat switch in DecryptPassword in line with other useages. 2016-02-05 03:29:33 +11:00
Sebastiaan Janssen
166429cf68 Fixes the "No license field." error, see: 
https://github.com/npm/npm/issues/4473#issuecomment-103453246
 2016-02-04 16:10:35 +01:00
Mads Rasmussen
48adc259d9 fix content type editor property preview background in firefox 2016-02-04 15:19:20 +01:00
Stephan
42c23dadc9 U4-7887 - default to database connection timeout 2016-02-04 14:51:19 +01:00
Stephan
fb9471359c U4-7895 - routing fails when path contains dots 2016-02-04 13:03:53 +01:00
Mads Rasmussen
4e0b018a8b Merge branch 'AndyButland-u4-7840' into dev-v7 2016-02-04 11:46:15 +01:00
Mads Rasmussen
f94b5cc462 small fixes to U4-7840 2016-02-04 11:45:31 +01:00
Mads Rasmussen
fee98f8144 Merge branch 'u4-7840' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-7840 2016-02-04 11:20:30 +01:00
Shannon Deminick
aa31e293ec Merge pull request #1086 from umbraco/temp-U4-7598 
U4-7598 - fix migrations during 4.7 to 7.4 upgrade
 2016-02-04 11:10:45 +01:00
Shannon
f8045840ee Merge remote-tracking branch 'origin/master-v7' into dev-v7 2016-02-04 11:04:05 +01:00
Shannon
e2985d74e5 U4-7890 XSLT Macro's not working - "Cannot use this obsoleted overload when the current provider" 2016-02-04 11:01:54 +01:00
Mads Rasmussen
7d15b26a8f Fixes: U4-7818 Moved Document Type Reverts to Prior Location on Save 2016-02-04 10:41:06 +01:00
Rune Strand
a77ebb1160 Add max resolution for the Image editor in Grid Layouts to avoid performance hit when using high res images. 2016-02-04 10:25:01 +01:00
Claus
6a1e54b221 Fixes: U4-7691 - refactor 2016-02-03 15:39:18 +01:00
Shannon Deminick
864ca4e40e Merge pull request #1094 from umbraco/temp-U4-7691 
Fixes: U4-7691 7.4 beta - Document composition is not working with me…
 2016-02-03 15:26:43 +01:00
Claus
24d42e6bd1 Fixes: U4-7691 7.4 beta - Document composition is not working with media types 
Media type compositions weren't getting added since it only looked up through the content type service.
 2016-02-03 15:02:44 +01:00
Shannon
65c3f8c513 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-03 14:16:38 +01:00