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

14684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
7e5ffdf0ca Update in case people have 64bit git installed 2015-12-16 13:00:28 +01:00
Sebastiaan Janssen
96b33cb071 Merge branch 'temp-U4-7365' into 7.4.0 2015-12-16 12:59:55 +01:00
Sebastiaan Janssen
c3f309c146 Merge branch '7.4.0' into temp-U4-7365 2015-12-16 10:25:19 +01:00
Sebastiaan Janssen
f00d89616a Merge branch 'temp-U4-7448' into 7.4.0 2015-12-15 17:17:54 +01:00
Sebastiaan Janssen
5b825bdeae Merge branch '7.4.0' into temp-U4-7448 
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/no.xml
 2015-12-15 17:16:15 +01:00
Sebastiaan Janssen
d87dd67c08 Merge branch '7.4.0' of https://github.com/umbraco/Umbraco-CMS into 7.4.0 2015-12-15 17:12:59 +01:00
Sebastiaan Janssen
581027172f Merge branch 'temp-7134' into 7.4.0 2015-12-15 17:12:24 +01:00
Sebastiaan Janssen
f2e37abb22 Merge branch '7.4.0' into temp-7134 2015-12-15 16:47:54 +01:00
Sebastiaan Janssen
46e7112abd Merge pull request #955 from umbraco/temp-U4-7537 
U4-7537 File cleanup for old content type editor
 2015-12-15 16:08:11 +01:00
Sebastiaan Janssen
cdeb82e7cc Merge branch '7.4.0' of https://github.com/umbraco/Umbraco-CMS into 7.4.0 2015-12-15 15:42:50 +01:00
Sebastiaan Janssen
d123967b14 Merge branch 'dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/no.xml
 2015-12-15 15:31:47 +01:00
Shannon
727fd3aa17 U4-7537 File cleanup for old content type editor 2015-12-15 15:12:22 +01:00
Sebastiaan Janssen
bb4994f9fc Merge pull request #935 from torerikk/dev-v7 
Update Norwegian translations
 2015-12-15 15:10:46 +01:00
Mads Rasmussen
9a8273b784 Fixes: U4-7541 umbAutoResize does not work in Microsoft Edge 2015-12-15 14:51:51 +01:00
Claus
c334f94d72 Fixed a few comments. 2015-12-15 14:47:19 +01:00
Claus
ddf525db40 Merge branch 'AffinityID-u4-7522' into dev-v7 2015-12-15 14:43:22 +01:00
Shannon
3fa0f89dd1 U4-7134 New content type editor requires CRUD access to data types 2015-12-15 14:42:48 +01:00
Mads Rasmussen
191f82aaaa Fixes: U4-7448 Grid - Sorting view 2015-12-15 14:34:13 +01:00
Claus
9c7ef46222 Merge pull request #941 from bugsancho/dev-v7 
U4-7508 - IsChildOfListView should be populated for Media items
 2015-12-15 14:18:27 +01:00
Sebastiaan Janssen
c813eccb45 Merge branch 'dev-v7' into 7.4.0 2015-12-15 13:53:50 +01:00
Sebastiaan Janssen
eacc7f7fb3 Whoops, was supposed to be en-US by default 2015-12-15 13:50:19 +01:00
Claus
f1fcb2adec Fixes: U4-7365 Content list view sorting alias is “sort” and media list view sorting alias is “sortOrder”. This gives an ysod when changing sorting in media list views. 
Changed the default list view for media to be created with the correct alias in the database.
Added migration for existing databases to be updated.
 2015-12-15 13:43:52 +01:00
Sebastiaan Janssen
80f597a7eb U4-7424 - Also update all other errors displayed in the frontend 2015-12-15 12:51:45 +01:00
Sebastiaan Janssen
d069da8a4f Make LocalizedTextService fall back to en-GB if the key is not found in the current file 2015-12-15 12:51:03 +01:00
Sebastiaan Janssen
44ebd8d9ea Proper formatting of this file, only whitespace changes 2015-12-15 12:18:23 +01:00
Sebastiaan Janssen
2fd6dc3603 Merge branch 'engern-U4-7424' into dev-v7 2015-12-15 12:14:07 +01:00
Sebastiaan Janssen
0629b49112 Merge branch 'U4-7424' of https://github.com/engern/Umbraco-CMS into engern-U4-7424 2015-12-15 12:13:35 +01:00
Sebastiaan Janssen
198ba0db83 Merge branch 'dev-v7' into 7.4.0 2015-12-15 11:25:09 +01:00
Sebastiaan Janssen
4958c5a59a Merge branch 'jamescoxhead-U4-7503-Disable-X-AspNetMvc-Version-Header' into dev-v7 2015-12-15 11:21:23 +01:00
Sebastiaan Janssen
523501db8c Merge branch 'U4-7503-Disable-X-AspNetMvc-Version-Header' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-U4-7503-Disable-X-AspNetMvc-Version-Header 2015-12-15 11:21:11 +01:00
Sebastiaan Janssen
6ce4354ef3 Merge branch 'dev-v7' into 7.4.0 2015-12-15 11:14:15 +01:00
Sebastiaan Janssen
23cd2b09ca Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-12-15 11:13:22 +01:00
Sebastiaan Janssen
a1ff1d4543 Merge branch 'TimoPerplex-dev-v7' into dev-v7 2015-12-15 11:12:57 +01:00
Sebastiaan Janssen
1bf2a3b1bf Merge branch 'dev-v7' of https://github.com/TimoPerplex/Umbraco-CMS into TimoPerplex-dev-v7 
Conflicts:
	src/Umbraco.Web/Editors/ImagesController.cs
 2015-12-15 11:12:13 +01:00
Shannon Deminick
8ce8455773 Merge pull request #950 from umbraco/temp-U4-7373 
Fixes U4-7373 Error notifications shown are hidden underneath the dialogs
 2015-12-15 10:53:55 +01:00
Shannon
26b70a4a4e Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/umbraco/config/lang/de.xml
 2015-12-15 10:40:52 +01:00
Shannon
8598ab565c Fixes: U4-7536 Sign-out in back office will call all ASP.Net identity middleware sign out methods 
publicises a few things too.
 2015-12-15 10:34:11 +01:00
Simon Busborg
31147fa8d1 missing comma 2015-12-15 10:26:22 +01:00
Simon Busborg
d75f8bf1bd added wrapper to directive 2015-12-15 10:24:38 +01:00
Simon Busborg
ecb6c8e52c Fix for U4-7373 Error notifications shown are hidden underneath the dialogs 
http://issues.umbraco.org/issue/U4-7373
 2015-12-15 10:08:19 +01:00
Claus
3cdd650b66 Merge pull request #940 from umbraco/temp-U4-7445 
Temp u4 7445
 2015-12-14 11:31:02 +01:00
Simon Busborg
8bd3b25a66 Fix for: http://issues.umbraco.org/issue/U4-7518 
New list view (umb-table) misses published/unpublished state
 2015-12-11 14:26:17 +01:00
Andrey Shchekin
b3e21e0827 U4-7522 Removed unnecessary exception from DeepCloneHelper. 2015-12-10 14:33:52 +13:00
Rune Strand
10b828379b Element hinzufügen! 2015-12-09 09:31:38 +01:00
James Coxhead
739ff33ce1 Removed X-AspNet-Version and X-AspNetMvc-Version headers 2015-12-08 21:44:40 +00:00
James Coxhead
f27a726a6e Disabled the X-AspNetMvc-Version header 2015-12-08 21:19:41 +00:00
Alexander Todorov
aed906e682 U4-7508 - IsChildOfListView should be populated for Media items, similarly to Content items 2015-12-08 18:41:59 +02:00
Sebastiaan Janssen
220446afec Adds some more dependencies so we upgrade those properly when necessary 2015-12-08 14:24:52 +01:00
Sebastiaan Janssen
a101367292 This would've stayed here for years and be irrelevant, we can link to twitter profiles in the docs on Our 2015-12-08 14:02:43 +01:00
Sebastiaan Janssen
e90fedb835 Bumps version 2015-12-08 13:54:57 +01:00