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

14906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claus
4db1599bcb Null checks for when using folders. 
Updated tree menu items.
 2016-01-11 12:07:35 +01:00
Claus
a7212f6b60 Changing config setting to the default. 
Referencing wrong config element.
 2016-01-11 12:07:34 +01:00
Claus
6650a72c79 Pass along parentId when getting available compositions since we need it to get available compositions when creating the empty scaffolding. 
Include ancestors in the list of compositions.
Mark ancestors as disabled/locked.
 2016-01-11 12:07:33 +01:00
Claus
08c4dede08 Output disabled class in backoffice. 2016-01-11 12:07:32 +01:00
Claus
0d37357376 Mark compositions coming from parents with metadata. 
Ensure metadata is not ignored.
 2016-01-11 12:07:31 +01:00
Claus
7a1f4b6b4b include parents as compositions. 2016-01-11 12:06:39 +01:00
Claus
5360bcff52 context menu for creating child doctype. 2016-01-11 12:06:37 +01:00
Claus
e509099cdb Setting for enabling inherited documenttypes. 2016-01-11 12:06:35 +01:00
Claus
81395169ba line endings 2016-01-11 12:02:33 +01:00
Simon Busborg
323257a0bf Merge pull request #1005 from umbraco/temp-U4-7568 
Fixes: U4-7568 Only set focus on header name input when creating new node
 2016-01-11 09:10:05 +01:00
Mads Rasmussen
f9fa81bf13 only focus editor name when empty - new nodes 2016-01-10 19:23:22 +01:00
Mads Rasmussen
e20a152e4f Fix bug where editor name was not always focused 2016-01-10 19:22:44 +01:00
Mads Rasmussen
16e79c98a6 Merge pull request #1003 from umbraco/temp-U4-7638 
Fixes: U4-7638 Make larger area of tree node clickable
 2016-01-10 13:21:44 +01:00
Mads Rasmussen
bf06e1e1e8 Fixes: U4-7674 Fixed header for doc type "Compositions" and "Reorder" links 2016-01-09 22:00:19 +01:00
Mads Rasmussen
7d49c49bab Fixes: U4-7651 Hide button spinner, when validation errors occur for datatype 2016-01-09 20:53:56 +01:00
Mads Rasmussen
d4a1eea8e5 Fixes: U4-7575 Deselecting items in the MNTP are not deselected 2016-01-09 20:49:54 +01:00
Simon Busborg
a6cf13d835 Positioned loader under tree-item 2016-01-08 13:10:04 +01:00
Shannon
273d2e2a2b Merge branch 'temp-U4-7635' into 7.4.0 2016-01-08 12:29:35 +01:00
Shannon
4cb523fb66 Added tests for ContentTypeServiceExtensions 2016-01-08 12:29:11 +01:00
Simon Busborg
e731831658 Fixes: U4-7638 Make larger area of tree node clickable 2016-01-08 11:41:17 +01:00
Mads Rasmussen
d1059c9dbe Merge pull request #986 from umbraco/temp-U4-7619 
U4-7619
 2016-01-08 11:34:33 +01:00
Mads Rasmussen
5dbda59f9d Merge pull request #1001 from umbraco/temp-U4-7564 
Fixes: U4-7564 "Save and publish" button menu skewed [7.4.0-beta]
 2016-01-07 21:35:02 +01:00
Mads Rasmussen
e64f0fc5c5 Fixes: U4-7654 Recycle bin now display a input instead of a readonly heading 2016-01-07 21:10:04 +01:00
Shannon
02b6f94a1b moves the current logic into a re-usable ext method 2016-01-07 19:46:22 +01:00
Simon Busborg
896eda1022 Fixes firefox bug where it ignores inline elements width 2016-01-07 12:58:28 +01:00
Simon Busborg
4139972f72 Fixes: U4-7564 "Save and publish" button menu skewed [7.4.0-beta] 
So I tested it on a Surface and got the same result as you. We get this "bug" because of how bootstrap handles dropdowns on mobile/tablets. Bootstrap detect Suface as a tablet, and therefor pushed an element to the DOM called `dropdown-backdrop`. Disabling this will fix the "bug". But we need to be aware of this taken from http://getbootstrap.com/javascript/

>''"On mobile devices, opening a dropdown adds a `.dropdown-backdrop` as a tap area for closing dropdown menus when tapping outside the menu, a requirement for proper iOS support. This means that switching from an open dropdown menu to a different dropdown menu requires an extra tap on mobile."''

Since it's a very old Bootstrap we're using I took the liberty to just add `.btn-group .dropdown-backdrop` `display: none` so that the element wouldn't appear in the DOM anymore.
 2016-01-07 11:20:13 +01:00
Mads Rasmussen
2a0287f5ad Fixes: U4-7653 List view - input types 2016-01-06 19:29:30 +01:00
Mads Rasmussen
7cb4a47f3e Fixes: U4-7653 List view - can't remove custom layouts 2016-01-06 19:00:23 +01:00
Sebastiaan Janssen
20720cdb28 Merge branch 'dev-v7' into 7.4.0 2016-01-06 15:59:51 +01:00
Sebastiaan Janssen
d2483159bc Fixes unit tests, not all packages will have the sort order in there 2016-01-06 15:59:23 +01:00
Sebastiaan Janssen
37baeec8a9 Merge branch 'dev-v7' into 7.4.0 
# Conflicts:
#	src/Umbraco.Core/Services/PackagingService.cs
 2016-01-06 15:23:47 +01:00
Sebastiaan Janssen
48ab3f580c Fixes the build 2016-01-06 15:21:45 +01:00
Sebastiaan Janssen
aa6897bfa7 Merge branch 'dev-v7' into 7.4.0 
# Conflicts:
#	src/Umbraco.Core/Services/PackagingService.cs
 2016-01-06 15:00:44 +01:00
Claus
c524d67a37 Fixes: U4-7553 Importing Document Type doesn't respect property sort order 
Handling sortOrder property in both import/export.

(cherry picked from commit 378479b4c1)

# Conflicts:
#	src/Umbraco.Core/Services/PackagingService.cs
 2016-01-06 14:56:31 +01:00
Sebastiaan Janssen
f1414ae000 Merge pull request #995 from umbraco/temp-U4-7553 
Fixes: U4-7553 Importing Document Type doesn't respect property sort order
 2016-01-06 14:50:21 +01:00
Claus
378479b4c1 Fixes: U4-7553 Importing Document Type doesn't respect property sort order 
Handling sortOrder property in both import/export.
 2016-01-06 14:48:37 +01:00
Sebastiaan Janssen
701dea5de7 Merge pull request #969 from umbraco/temp-U4-7591 
U4-7591 File cleanup for old editor 'tasks' and 'create' dialogs
 2016-01-06 13:43:14 +01:00
Shannon
5767cea8f2 fixes build/merge 2016-01-06 12:58:05 +01:00
Shannon
4e3cf6c608 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Core/ObjectExtensions.cs
	src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs
	src/Umbraco.Web/Editors/ContentTypeController.cs
	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
 2016-01-06 12:54:19 +01:00
Shannon
4c3258812c normalize culture for test 2016-01-06 12:50:41 +01:00
Shannon
bc98f5e8fc code cleanup. 
Conflicts:
	src/Umbraco.Core/ObjectExtensions.cs
 2016-01-06 12:49:18 +01:00
Shannon
6f2f6c088b Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-06 12:48:36 +01:00
Shannon
da91923577 Changes ObjectExtensions NormalizeNumberDecimalSeparator to use normal Culture (not UI Culture) 2016-01-06 12:48:26 +01:00
Sebastiaan Janssen
fbc46d8046 Merge pull request #989 from umbraco/temp-U4-7643 
U4-7643 DatabaseServerMessenger.cs causes lucene indexes to rebuild o…
 2016-01-06 12:43:36 +01:00
Shannon Deminick
3cec0c3b43 Merge pull request #993 from umbraco/temp-U4-7655 
Fixes: U4-7655 PropertyValueEditor tests failing
 2016-01-06 12:26:38 +01:00
Shannon
e8a0fae557 adds notes 2016-01-06 12:24:09 +01:00
Shannon Deminick
e0baf45247 Merge pull request #992 from umbraco/temp-U4-5168 
U4-5168 Media Items label says "Document Type" instead of  "Media Type"
 2016-01-06 12:22:53 +01:00
Sebastiaan Janssen
43e983e27a Corrects spelling of localStorateDir to localStorageDir 2016-01-06 12:17:48 +01:00
Claus
b1b7598e3c code cleanup. 2016-01-06 12:17:30 +01:00
Claus
b4ca4917cc Updating Double and Single conversion (where NormalizeNumberDecimalSeparator is also used) to include CurrentUICulture. 2016-01-06 12:12:29 +01:00