yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,426 Commits 4 Branches 7 Tags
8ded6fff935bcdc2e9f199ebaa491e42cdc96005
Commit Graph

10426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
8ded6fff93 adds vs task to grunt 2014-06-18 17:15:09 +10:00
Shannon
56111be82d Properly fixes: U4-4893 Inconsistent display of file extensions in the UI 2014-06-18 17:11:47 +10:00
Shannon
f25463babe Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 2014-06-17 19:05:22 +10:00
Shannon
b8575ef158 Started writing test implementation to mimic what developers might test in their controllers to expose the pitfalls of umbraco testing so we can make this simpler - identifying what needs to be public and how to re-strcuture some objects constructors, etc... to simplify and make this possible. 2014-06-17 18:53:23 +10:00
Shannon
1c23940b0b Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 
Conflicts:
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config
 2014-06-17 16:09:29 +10:00
Shannon
d3bb750f98 Updated to latest Examine with lock fixes 2014-06-17 16:07:08 +10:00
Shandem
1f161b2b9c Merge pull request #395 from Excommunicated/7.1.5 
Close user dialog on logout
 2014-06-17 14:07:45 +10:00
Morten Christensen
6f27f839e0 Related to U4-4199 lets get rid of all these Console.WriteLine's 2014-06-16 16:29:15 +02:00
Sebastiaan Janssen
e59768dda0 Capitalize Caturday 2014-06-09 20:57:15 +02:00
Sebastiaan Janssen
0b114c88f0 Merge pull request #397 from lesleyauk/7.1.5 
Correct English days of the week on login screen
 2014-06-09 20:55:31 +02:00
Stephan
d9374c34d1 Add IPropertyValueConverterMeta interface 
Conflicts:
	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
	src/Umbraco.Core/Umbraco.Core.csproj
 2014-06-09 15:31:35 +02:00
Sebastiaan Janssen
2b7526ab2e Merge pull request #409 from JimBobSquarePants/7.1.5 
Improving grammar in installer facts.
 2014-06-09 15:30:46 +02:00
Shannon
2fde10494c Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-06-09 15:32:52 +02:00
Shannon
0da4879400 downgrades mini profiler to what it used to be 2014-06-09 15:32:44 +02:00
Sebastiaan Janssen
07172067ab Merge pull request #408 from BatJan/7.1.5-wording-fix-4382 
Fix of U4-4382
 2014-06-09 15:28:36 +02:00
James South
681a3e3046 Improving grammar in installer facts. 2014-06-09 15:20:28 +02:00
Sebastiaan Janssen
e5dea8e4be Merge pull request #407 from BatJan/7.1.5-translation-fix-4538 
Fix of U4-4538
 2014-06-09 14:09:19 +02:00
Sebastiaan Janssen
087dd1fe9e Merge pull request #404 from BatJan/7.1.5-installer-fix-4416 
Fix of U4-4416
 2014-06-09 13:58:08 +02:00
Sebastiaan Janssen
37afe6dd29 Merge pull request #406 from BatJan/7.1.5-spelling-fix-5007 
Fix of  issue U4-5007
 2014-06-09 13:51:57 +02:00
Sebastiaan Janssen
338a125eaa Merge pull request #405 from JimBobSquarePants/7.1.5 
Fixing broken preview dialog U4-4977
 2014-06-09 13:49:45 +02:00
Jan Skovgaard
18fc6ccc99 Fix of U4-4382 2014-06-09 13:23:01 +02:00
Stephan
8a1db41fc4 Implement content.FirstChild 2014-06-09 13:04:40 +02:00
James South
d2119c17c1 Fixing broken preview dialog U4-4977 2014-06-09 13:01:00 +02:00
Jan Skovgaard
9d4afbd007 Fix of U4-4538 2014-06-09 12:44:07 +02:00
Jan Skovgaard
c4f764d5fc Fix of issue U4-5007 2014-06-09 12:28:29 +02:00
Sebastiaan Janssen
db3d86aeca Merge pull request #402 from leekelleher/U4-3596 
U4-3596 Recycle bin, use the listview on the recycle bin instead of showing the deleted items as children
 2014-06-09 10:56:24 +02:00
Sebastiaan Janssen
c17e60f709 Merge pull request #401 from leekelleher/U4-5066 
U4-5066 Display message on empty list-view.
 2014-06-09 10:45:13 +02:00
Sebastiaan Janssen
68860b6c54 Update Umbraco version everywhere 2014-06-09 10:32:09 +02:00
Sebastiaan Janssen
5834757476 Merge pull request #403 from BatJan/7.1.5-installer-fix-5040 
Fix of U4-5040
 2014-06-09 10:15:06 +02:00
leekelleher
91ddbff990 U4-5066 Display message on empty list-view. 2014-06-08 18:18:50 +01:00
Niels Hartvig
5fd1d7c9e5 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-06-08 19:18:43 +02:00
Niels Hartvig
32cfdbe968 Fixes: U4-4892 Inconsistent (lack of) instructions regarding file extensions in the UI 2014-06-08 19:18:37 +02:00
Shannon
a754cecaf7 Allows any Controller to use PreRenderViewActionFilterAttribute 2014-06-08 19:12:40 +02:00
leekelleher
8ccb06c91d Tidied up the "Recycle Bin" headers for both content/media 2014-06-08 18:09:07 +01:00
Shannon
d8e35ffc08 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-06-08 19:05:54 +02:00
Shannon
34dcde645c Half completes: U4-2462 Does the app_plugins manager monitor file changes? 2014-06-08 19:05:48 +02:00
Jan Skovgaard
0474605d36 Fix of U4-4416 
http://issues.umbraco.org/issue/U4-4416
 2014-06-08 18:47:07 +02:00
Sebastiaan Janssen
4dd3f2f8ac Merge pull request #399 from leekelleher/U4-3575 
U4-3575 Get Started Dashboard does not changes when changing sections using Left Menu icons
 2014-06-08 18:38:43 +02:00
Jan Skovgaard
d7a0447e2e Fix of U4-5040 2014-06-08 18:31:50 +02:00
Sebastiaan Janssen
cbe23663e3 Merge pull request #400 from BatJan/7.1.5-installer-fix-4874 
7.1.5 installer fix 4874
 2014-06-08 18:23:21 +02:00
Niels Hartvig
bff415a4c6 Fixes: U4-4893 Inconsistent display of file extensions in the UI 2014-06-08 17:55:05 +02:00
leekelleher
caa59f2c80 Updated recycle-bin dashboard controller to handle both content and media items. 2014-06-08 16:46:04 +01:00
leekelleher
2ff1c973e0 Set the listview row item to 'inactive' if the item isTrashed. 
(As media items do not have a published state.)
 2014-06-08 16:45:22 +01:00
leekelleher
f056d3fae7 Modified MediaTypeController.GetAllowedChildren to return an empty collection if the "node ID" is the content/media recycle-bin. 
Removed the media recycle-bin node ID from the `ContentTypeController.GetAllowedChildren `.
 2014-06-08 16:43:55 +01:00
leekelleher
41a455c9ac Added treeHeaders_mediaRecycleBin to the localization mocks 2014-06-08 16:28:13 +01:00
Shannon
f834155763 updated version to 7.1.5 2014-06-08 17:26:23 +02:00
leekelleher
15cc3d19c1 Modified ContentTypeController.GetAllowedChildren to return an empty collection if the "node ID" is the content/media recycle-bin. 2014-06-08 16:18:33 +01:00
leekelleher
3bb563ec55 Modified the 'listview' view + controller - added isTrashed property/state 2014-06-08 16:17:16 +01:00
Shannon
b5282244f0 Umbraco MVC style routes now implemented. 2014-06-08 17:16:28 +02:00
Shannon
aa5b5708b2 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-06-08 17:15:58 +02:00