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

3475 Commits

Author SHA1 Message Date
Simon Busborg
8008a3b7c5 Fix for http://issues.umbraco.org/issue/U4-7574 2015-12-18 11:22:40 +01:00
Simon Busborg
da02b1330c Fix for http://issues.umbraco.org/issue/U4-7572 2015-12-18 10:33:22 +01:00
Mads Rasmussen
8830faedfd remove gradient from orange buttons 2015-12-17 14:19:34 +01:00
Mads Rasmussen
087ad2e1fa grid: remove the + from add content button 2015-12-17 14:01:33 +01:00
Mads Rasmussen
549881bfb7 Merge pull request #961 from umbraco/temp-U4-7551 
U4-7551 New Content type editor dialog to select an editor for a prop…
 2015-12-17 13:18:39 +01:00
Mads Rasmussen
afd5b2e8d3 fix missing eventService injection 2015-12-17 12:38:31 +01:00
Mads Rasmussen
c7ac6e5e70 Loading grouped datatypes when reusing in content type editor. Create new data type from available editor, get data type from reuse. 2015-12-17 12:32:18 +01:00
Mads Rasmussen
6d30c89757 fix merge conflict 2015-12-17 11:20:40 +01:00
Shannon
62db58110a re-reverts GetGroupedPropertyEditors and adds GetGroupedDataTypes 2015-12-17 11:13:49 +01:00
Claus
1655749c5d Merge branch 'temp-U4-7549' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
 2015-12-17 10:41:44 +01:00
Mads Rasmussen
87109b0747 rename umb-list-view directive to umb-list-view-settings. Because the other was just confusing 2015-12-17 10:17:34 +01:00
Simon Busborg
d89defe23b Added correct cursors to elements that can be moved in the grid 2015-12-17 09:03:48 +01:00
Mads Rasmussen
e16a1a2459 content type editor: switch settings and remove buttons to follow same convention as grid + fix small html bug. 2015-12-16 20:04:23 +01:00
Mads Rasmussen
48c963985a Hide editor sub headers in content type property preview. This will prevent it from scrolling down on long content types (and look weird) 2015-12-16 20:01:29 +01:00
Mads Rasmussen
57d78aac70 remove before stop event in grid sorting. The code doesn't work and it makes an js error in Edge which makes sorting fail. 2015-12-16 19:58:17 +01:00
Mads Rasmussen
5ec5afd16f Fixes: U4-7554 Compositions are not loaded in media types + move icon converter for composition to prevent js error 2015-12-16 19:51:25 +01:00
Shannon
fcbac0138a U4-7549 For new installs make the Image use the image cropper instead of upload 
Also fixes issue with media type editor which was a bug resulting fromn(U4-6837)
 2015-12-16 17:23:50 +01:00
Shannon
07533e0145 U4-7551 New Content type editor dialog to select an editor for a property type needs the "Default" and "Reuse" tab functionality changed 
Removes unused/non-required methods from data type controller/service.
 2015-12-16 16:51:12 +01:00
Shannon Deminick
9cc57479da Merge pull request #957 from umbraco/temp-U4-7186 
Fixes: U4-7186 Go through the remaining dialogs and check for consistency
 2015-12-16 16:35:02 +01:00
Shannon
790727e952 Fixes reference to new data type tree alias "dataTypes" (breaking because of U4-7150) 2015-12-16 16:19:16 +01:00
Shannon
a2e64b3485 Fixes reference to new document type tree alias "documentTypes" (breaking because of U4-7150) 2015-12-16 16:16:21 +01:00
Shannon
ea86c8bcff Fixes reference to new member group tree alias "memberGroups" (breaking because of U4-7150) 2015-12-16 16:07:56 +01:00
Claus
7cf1491661 Merge branch 'temp-U4-6837' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx.cs
 2015-12-16 12:32:16 +01:00
Shannon
aa91b5c68d Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2015-12-16 11:06:37 +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
Claus
f5e9151ffd Localized some texts on the slider configuration. 2015-12-15 15:42:14 +01:00
bjarnef
5a9dd11a7c Change margin-top for triangle and re-order config properties 2015-12-15 15:42:14 +01:00
bjarnef
9e6123abd3 Modify properties and styling 2015-12-15 15:42:13 +01:00
bjarnef
6c3ef2aaa9 Add more config properties 2015-12-15 15:42:13 +01:00
bjarnef
88fadcf74e Add slider bootstrap-slider v5.2.6 
Add newer version of script and add addtional properties.
 2015-12-15 15:42:12 +01:00
Mads Rasmussen
5d4f4376dd make overlay component of rich text editor link picker in property editor and grid editor 2015-12-15 15:26:07 +01:00
Mads Rasmussen
80675eee75 use new overlay component in tree picker prevalue editor 2015-12-15 15:26:07 +01:00
Mads Rasmussen
7d31bc9d35 make it easier to use itempicker and iconpicker - use submit method to submit instead of custom method - add overlay option to hide submit button. Clean up code by removing close method. 2015-12-15 15:26:07 +01:00
Mads Rasmussen
a08566c04c fix media, macro and embed overlays in rte in grid 2015-12-15 15:18:33 +01:00
Mads Rasmussen
fe7f73ff57 setup global ysod overlay + change error model 2015-12-15 15:18:33 +01:00
Simon Busborg
41b5ab697f Correct indention for umb-overlay 2015-12-15 15:18:33 +01:00
Simon Busborg
b464637f98 Removed hardcoded text for testing 2015-12-15 15:18:33 +01:00
Simon Busborg
e027689171 Added new styling standard for dialog title 2015-12-15 15:18:32 +01:00
Rune Strand
fc0fe61c2f Add ysodOverlay to listview and localized dialog buttons 2015-12-15 15:18:32 +01:00
Mads Rasmussen
78e1356c03 update rich text editor to use new macro picker overlay 2015-12-15 15:18:32 +01:00
Mads Rasmussen
4dd8ab227b update grid macro picker to use new overlay component 2015-12-15 15:18:32 +01:00
Mads Rasmussen
227c6d8cb1 copy insert macro dialog to new macro picker overlay + update macro container property editor 2015-12-15 15:18:32 +01:00
Mads Rasmussen
9eefe17331 make global class for empty state texts - use in compositions dialog + list view 2015-12-15 15:18:31 +01:00
Mads Rasmussen
874da20288 user new media picker overlay component in grid image picker config 2015-12-15 15:18:31 +01:00
Mads Rasmussen
a9411aa246 change grid items settings dialog to new overlay component 2015-12-15 15:18:31 +01:00
Mads Rasmussen
cfbfa2f5c9 umb-overlay: block styling of form elements 2015-12-15 15:06:45 +01:00
Mads Rasmussen
e163fefd7d use new media picker component in grid media picker 2015-12-15 15:06:45 +01:00
Mads Rasmussen
dc59b5b674 rename "rteembed" to "embed", save data to other property, add changes to tinymce + use new overlay component in grid embed 2015-12-15 15:06:45 +01:00
Mads Rasmussen
778522cad7 add copy of user dialog and help dialog for new overlay component 2015-12-15 15:06:45 +01:00
Mads Rasmussen
ea3942f151 umb-overlay: add support for left side positioned dialogs 2015-12-15 15:06:45 +01:00