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

10397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Shannon
ec0d6959a9 mini profiler in back office now enabled with query string 2014-06-08 17:15:52 +02:00
leekelleher
320df6706e Modified content tree controller to point the recycle bin node to the dashboard. 2014-06-08 16:15:28 +01:00
leekelleher
519dd8b476 Modified the existing 'recyclebin' dashboard view. 
Added view for media 'recyclebin'
 2014-06-08 16:14:35 +01:00
leekelleher
0434b3e5bd #U4-3575 Get Started Dashboard does not changes when changing sections using Left Menu icons 
Switching sections updates the route/location; thus displays the corresponding dashboard.
 2014-06-08 16:02:18 +01:00
Niels Hartvig
8aafc583de New styling for content / media titles 2014-06-08 16:29:04 +02:00
Jan Skovgaard
d6b0ed2d40 Fix for U4-4874 
Added id's to the input fields, so labels are connected properly.
 2014-06-08 16:09:06 +02:00
BatJan
ff42a1b79c Fix of http://issues.umbraco.org/issue/U4-5025 2014-06-08 16:32:03 +02:00
BatJan
4e433becd6 Fix of http://issues.umbraco.org/issue/U4-5025 2014-06-08 16:29:10 +02:00
Shannon
ebbbd80bb3 Fixes: U4-5065 Add event to modify the model on front-end for IRenderMvcControllers 2014-06-08 14:14:12 +02:00
Shannon
7b33eca014 disables dist call 2014-06-08 13:14:27 +02:00
Shannon
f8e06e54de Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-06-08 13:09:37 +02:00
Shannon
23d9ef624b Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 
Conflicts:
	build/Build.bat
	build/NuSpecs/build/UmbracoCms.targets
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-06-08 13:09:31 +02:00
Morten Christensen
cdb5b0470d Implementing tests for all methods in the LocalizationService. 2014-06-08 12:59:30 +02:00
Shannon
b43f39a0cb disables dist call 2014-06-08 12:50:45 +02:00
Shannon
d0cb27d1c1 Completes: U4-2633 Bundle all cache refresher transmissions into a single call per request for much better performance 2014-06-08 12:49:20 +02:00
Shannon
e8990eb6b2 Merge commit 'beb1979b4655a529b703ceec094a50f6a3dd8602' into 7.1.5 
Conflicts:
	src/Umbraco.Web.UI/config/umbracoSettings.config
 2014-06-08 12:24:29 +02:00
Shannon
05524c643e Merge branch '7.1.5-backoffice-miniprofiler' into 7.1.5 2014-06-08 12:08:34 +02:00
Shannon
ed989079b4 positions mini profiler to the bottom right 2014-06-08 12:08:05 +02:00
Morten Christensen
feed5c5e51 Fixes #U4-4593 EntityService.GetObjectType with passed in integer id or guid unique id 2014-06-08 09:46:43 +02:00
Stephan
0af19fa442 U4-5057 - fix UmbracoHelper.TypedSearch 2014-06-05 17:30:58 +02:00
Shandem
5b17bc6d5f Merge pull request #393 from henrikrossen/7.1.5 
Migrated obsolete method calls and cleaned ContentTypeServiceTests.cs
 2014-06-04 10:46:36 +10:00
Henrik Rossen Jakobsen
06a1f790dd Migrated obsolete method calls and cleaned ContentTypeServiceTests.cs 2014-06-03 21:47:18 +02:00
Shannon
e7994d077e minor logic change for checking if sort exists 2014-06-02 15:40:24 +10:00
Shannon
f55f9edb71 Ensures each property type has a real sort order when adding to the property type collection 2014-06-02 14:04:40 +10:00
Shannon
df3bc873df Upgrades mini profiler and enables it in the back offfice. 2014-05-30 15:26:22 +10:00
Sebastiaan Janssen
d1c5ddc03d Merge branch 'AndrewSwerlick-7.1.1' into 7.1.5 2014-05-29 18:19:52 +02:00