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

15393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Busborg
00a7c97c5e Fixed background and word-break in member type builder 2016-02-03 13:13:56 +01:00
Simon Busborg
eb7fa9528a Merge pull request #1081 from umbraco/temp-U4-7675 
Fixes: U4-7675 Changing doc type icon doesn't set dirty property for form
 2016-02-03 12:55:12 +01:00
Claus
27d2b631a9 Merge pull request #1080 from umbraco/temp-U4-7871 
Fixes: U4-7871 Media picker - add functionality to go to media item w…
 2016-02-03 12:51:08 +01:00
Claus
bf1086ca39 Merge pull request #1089 from umbraco/temp-U4-7884 
Fixes: U4-7884 Prevent new content type editor form from saving when hitting enter from inputs
 2016-02-03 12:44:55 +01:00
Shannon Deminick
36119848e7 Merge pull request #1085 from umbraco/temp-U4-7861 
U4-7861 - fix moving a content type
 2016-02-03 12:13:31 +01:00
Shannon Deminick
8080746004 Merge pull request #1091 from umbraco/temp-U4-7885 
U4-7885 - fix YSOD when saving a member type
 2016-02-03 11:59:24 +01:00
Simon Busborg
ae9fba87b5 Removed white background from member types builder 2016-02-03 11:46:33 +01:00
Claus
076efad616 Merge pull request #1084 from umbraco/temp-U4-7713 
U4-7713 - fix CountPublished
 2016-02-03 11:45:15 +01:00
Stephan
df3aaf43d3 U4-7885 - fix YSOD when saving a member type 2016-02-03 11:33:34 +01:00
Shannon
5d5c6ed33a fixes ysod with media types and member types 2016-02-03 11:21:01 +01:00
Mads Rasmussen
e22c6d9c04 fix member types html indention 2016-02-03 10:16:39 +01:00
Mads Rasmussen
61ba602b4b prevent enter submit in member types 2016-02-03 10:05:01 +01:00
Mads Rasmussen
bd393dffd4 fix media types html indention 2016-02-03 09:59:08 +01:00
Mads Rasmussen
573890b7ce prevent enter submit in media types 2016-02-03 09:56:14 +01:00
Mads Rasmussen
7d4fbe4267 fix document type html indention 2016-02-03 09:50:59 +01:00
Mads Rasmussen
cb978e2fee prevent enter submit in document type editor 2016-02-03 09:44:10 +01:00
Shannon Deminick
ee303957b8 Merge pull request #1078 from dawoe/U4-7872 
Use product name in migration runner instead of Umbraco productname
 2016-02-02 17:04:45 +01:00
Stephan
3f23b06e24 U4-7861 - fix moving a content type 2016-02-02 16:40:01 +01:00
Simon Busborg
a763602aeb Fixes: U4-7072 Grid TinyMce with style_formats throws "Cannot assign to read only property 'name' 2016-02-02 15:38:12 +01:00
Simon Busborg
4812f1d603 Fixes: U4-7725 Backend / Full witdth image / Settings / Set a background image - Is out of focus. 2016-02-02 15:11:50 +01:00
Rune Strand
137de20cef Remove gradient from btnDanger 2016-02-02 14:30:57 +01:00
Rune Hem Strand
8ce8199820 Merge pull request #1072 from umbraco/temp-U4-7851 
fixes U4-7851 Grid layout RTE formats not being applied.
 2016-02-02 14:14:10 +01:00
Simon Busborg
bb52467f90 Fixes: U4-7703 TinyMCE - can't add additional css via custom config (v7.3.4) 
http://issues.umbraco.org/issue/U4-7703
 2016-02-02 14:08:12 +01:00
Stephan
8791f7ee97 U4-7713 - fix CountPublished 2016-02-02 13:52:55 +01:00
Rune Strand
e9af8bfee1 click in grid RTE format dropdown no longer looses focus from the editor 2016-02-02 13:37:52 +01:00
Mads Rasmussen
4360d49531 fix file indention 2016-02-02 11:42:36 +01:00
Mads Rasmussen
ae26a19d4a Fixes: U4-7675 Changing doc type icon doesn't set dirty property for form 2016-02-02 11:41:52 +01:00
Rune Strand
da732359af Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-02 10:18:36 +01:00
Rune Strand
c659e1ff8f Adds button states for hover, focus and active 2016-02-02 10:15:57 +01:00
Simon Busborg
fd92884ce5 Merge pull request #1075 from webprofijt/U4-7687 
Fixes: U4-7687 Create dialog briefly shows 'no allowed document types…
 2016-02-02 08:54:50 +01:00
Mads Rasmussen
b22ae28acc Fixes: U4-7871 Media picker - add functionality to go to media item when an image has been picked 2016-02-01 18:24:30 +01:00
Claus
2718d895fa Merge pull request #1079 from umbraco/temp-U4-7832 
Fixes: U4-7832 double data bindings
 2016-02-01 15:31:53 +01:00
Mads Rasmussen
f4e6913e6e Fixes: U4-7832 double data bindings 2016-02-01 15:14:38 +01:00
Dave Woestenborghs
647fbea066 Use product name in migration runner instead of Umbraco productname 
Fixes http://issues.umbraco.org/issue/U4-7872
 2016-02-01 11:48:32 +01:00
Sebastiaan Janssen
b69bd8617f Merged branch dev-v7 into dev-v7 2016-02-01 09:28:31 +01:00
Sebastiaan Janssen
924d2a0d88 U4-7669 Update Newtonsoft.Json dependency to v8.0.1 from v6.0.5 
#U4-7669 Fixed
 2016-02-01 09:28:20 +01:00
Claus
17fdc7d246 Merge pull request #1077 from abryukhov/patch-3 
Update UI language ru.xml
 2016-01-31 12:26:12 +01:00
Alexander Bryukhov
10fc60def3 Update UI language ru.xml 
Based on keys added in 7.4 nightly build 155
 2016-01-31 12:05:07 +06:00
Arnoud de Vries
b6962296c3 Fixes: U4-7687 Create dialog briefly shows 'no allowed document types' text 2016-01-30 15:51:17 +01:00
Shannon
cf022ca6a4 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-28 19:35:20 +01:00
Shannon
e2bf27e53f U4-7857 Flexible Load Balancing does not sync with the correct timeout threshold 2016-01-28 19:35:11 +01:00
Claus
db6f492aac Merge pull request #1056 from umbraco/temp-U4-7695 
U4-7695 Media items are not updated when a new crop is added to Image…
 2016-01-28 18:30:37 +01:00
Simon Busborg
a1dcd2739b Merge branch 'abryukhov-patch-5' into dev-v7 2016-01-28 15:32:35 +01:00
Simon Busborg
ef4bb3e341 Merge branch 'patch-5' of git://github.com/abryukhov/Umbraco-CMS into abryukhov-patch-5 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
 2016-01-28 15:29:56 +01:00
Shannon Deminick
8c90e2fd58 Merge pull request #1066 from umbraco/temp-U4-7847 
Fixes: U4-7847 Do not allow folders to be created underneath content types (or data types)
 2016-01-28 15:22:03 +01:00
Shannon
a1156472fb Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-28 15:16:37 +01:00
Shannon
d526ff43f2 Merge branch 'temp-RepoCachePerf' into dev-v7 2016-01-28 15:16:02 +01:00
Simon Busborg
dc6c15e150 Merge pull request #1058 from greystate/fix-querybuilder-button 
U4-7842 Query Builder "Sort by" direction button changes case when clicked
 2016-01-28 15:16:01 +01:00
Claus
0bc6b600a5 Merge pull request #1073 from umbraco/temp-U4-7806 
Fixes: U4-7806 Possible to interactive with property editor "preview"…
 2016-01-28 15:10:54 +01:00
Simon Busborg
fb4cf18873 Merge pull request #1053 from abryukhov/patch-7 
Latest update UI language ru.xml
 2016-01-28 15:03:59 +01:00