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

11546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
per ploug
0cbdebc9b0 Merge remote-tracking branch 'origin/7.2.0' into 7.2.0 
Conflicts:

	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.html
 2014-11-12 15:44:11 +01:00
per ploug
4f655acda5 Splits the grid layout config into 3 2014-11-12 15:37:23 +01:00
antoine
4257a89cc1 U4-5793 The three icons (delete, move, settings) seems to fail to appear if the cursor is coming from inside the row. I need to move the cursor out of the row entirely and then back in. Seems like a bug to me. 2014-11-12 14:14:02 +01:00
antoine
7300316780 grid add button always centered 2014-11-12 14:14:00 +01:00
antoine
94da555fea Some styles unification for the grid's prevalues 2014-11-12 14:13:57 +01:00
Sebastiaan Janssen
ae47ad882d #U4-5592 Fixed, Due in version 7.2.0 
#U4-5746 Fixed, Due in version 7.2.0
Note: dotless is required for the artist formerly known as tuning
 2014-11-12 10:40:31 +01:00
Shannon
79d9412b31 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-11-12 10:05:28 +11:00
Shannon
f6c39362cd reverts codemirror tinymce editor from release until we can fix the IE issue with it, people can still enable it if they want though. 2014-11-12 10:05:20 +11:00
Shannon Deminick
48fb2a2fcc Merge pull request #534 from kipusoep/Textbox-trimming-disabled 
Disabled trimming (U4-5603)
 2014-11-12 09:09:59 +11:00
antoine
4562237a96 U4-5778 Grid: Not all of the add-circle/button is clickable 2014-11-11 22:04:30 +01:00
antoine
3420694cca Some grid view css adjustments 2014-11-11 21:56:25 +01:00
antoine
c68067eb09 highlight area for setting, not control. 2014-11-11 21:27:38 +01:00
antoine
a8c73296ea Right info and warm highlight for rows' and controls' options (remove, move and setting) 2014-11-11 20:58:35 +01:00
Stefan Kip
805c1bf8d0 Disabled trimming 
Set ngTrim to false.
 2014-11-11 13:59:09 +01:00
Shannon
15119fc8d0 removes other refs to $scope.cfg, this is never necessary 2014-11-11 18:03:37 +11:00
Shannon Deminick
e2f8a73561 Merge pull request #528 from robertjf/7.2.0 
Fixes issue U4-5754 Attempt to set start node on Media Picker sends user...
 2014-11-11 17:57:26 +11:00
Shannon
4d9f6ccd22 Fixes: U4-5780 RenderActionInvoker needs a perf fix with caching when it's using reflection 2014-11-11 17:52:40 +11:00
Sebastiaan Janssen
9112c05477 Merge pull request #531 from Jeavon/GridCodeStandards 
A few small tweaks to the C# part of the Grid editor for coding standard...
 2014-11-10 15:46:50 +01:00
Jeavon Leopold
c0c624d62e A few small tweaks to the C# part of the Grid editor for coding standards 2014-11-10 14:43:43 +00:00
per ploug
306a30265e Remove ace from bower and directives folder 2014-11-10 13:36:57 +01:00
per ploug
1ee6fc8514 Update build.bat to beta2 2014-11-10 13:33:42 +01:00
Rune Hem Strand
1003ac42df Grid template preview 
New template preview for content section
 2014-11-10 12:17:39 +01:00
Robert Foster
ca951aa56b Fix for issue U4-5755 Issue: Multiple mixins with same tab cause content node edit crash 2014-11-08 01:13:17 +11:00
Robert Foster
6ea7b32363 Fixes issue U4-5754 Attempt to set start node on Media Picker sends user to Content section 2014-11-08 00:57:37 +11:00
Per Ploug Krogslund
db4495cf50 Grid mock data and modified tests 
all client side changes, will not affect live sites
 2014-11-07 11:13:28 +01:00
per ploug
ed8cccdf5a Minor visual annoyances + changed output html 
changes made due to feedback from Adam, Rune and Simon on how to make
the grid as flexible as possible
 2014-11-06 22:58:35 +01:00
per ploug
9cd8ce5626 Grid layout changes to support breaking rows 2014-11-06 14:13:27 +01:00
per ploug
990f271c63 Merge 2014-11-05 20:10:06 +01:00
per ploug
adfdbaec46 Adds support for grid row configuration and styling 2014-11-05 15:44:29 +01:00
Stephan
0f4436a465 U4-5728 - Do not run KeepAlive, ScheduledPublishing, without an url 2014-11-03 20:20:10 +01:00
Sebastiaan Janssen
8ccbf70b39 Making sure lower-case "Change password" is also removed 2014-11-03 18:05:12 +01:00
antoine
ddd26f3ad4 Move/remove row button hover wasn't correct, point on control's methods instead of row's 2014-11-03 14:04:59 +01:00
Sebastiaan Janssen
316e7531a0 #U4-5738 Fixed Due in version 7.2.0 
Umbraco 7.2 installation via NuGet fails
 2014-11-03 13:13:23 +01:00
Shannon Deminick
0f068f5fb1 Merge pull request #524 from Odie20XX/patch-1 
Update MembershipHelper.cs
 2014-11-01 05:53:52 +10:00
antoine
8f6b76f9fc U4-5730 7.2.0 Grid - edit parameters of macro added into grid content 2014-10-31 16:29:22 +01:00
Odie20XX
468c281d7d Update MembershipHelper.cs 
The parameter "logMemberIn" wasn't used so setting "LoginOnSuccess" on the RegisterModel didn't have any effect. By checking the parameter you can disable automatically logging in the user after registration. If registration failed, it would have returned null in an earlier stage so it's safe to say registration succeeded at this point.
 2014-10-31 15:30:20 +01:00
Antoine Giraud
f7cb188210 Merge pull request #522 from arknu/U4-5638-grid-prevalue-editor 
U4-5638: Replace style with ng-style to ensure styling is applied in IE
 2014-10-31 12:55:18 +01:00
antoine
00518d0de7 Add the startNodeId option for the grid media editor 2014-10-31 09:59:13 +01:00
Sebastiaan Janssen
892a8d2a8a Update gruntFile.js 2014-10-30 10:12:43 +01:00
arknu
ced6c011aa U4-5638: Also replace style with ng-style in the property editor 2014-10-29 15:25:59 +01:00
arknu
efc2008783 U4-5638: Replace style with ng-style to ensure styling is applied in IE 2014-10-29 12:58:38 +01:00
Shannon
acb987a451 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-29 18:20:10 +10:00
Shannon
4a1ea6e2d8 Fixes: U4-5710 UmbracoVirtualNodeRouteHandler does not allow for SurfaceController forms 2014-10-29 18:20:01 +10:00
Antoine Giraud
cc23d57803 Merge pull request #521 from enricleon/7.2.0 
Add new colorpicker directive to the canvasdesigner to improve reusability into the canvasdesigner editors
 2014-10-29 09:18:32 +01:00
Enric León
81fdae3dc4 Change spectrumpicker to colorpicker in all editors 2014-10-28 16:27:04 +01:00
Enric León
2859eb560c Add new directive colorpicker that wraps spectrumpicker into a dialog 2014-10-28 16:27:03 +01:00
Sebastiaan Janssen
7c5ad67a9f Update to config transform adding a <remove /> too late and assembly bindings not transforming correctly 2014-10-28 14:41:52 +01:00
Sebastiaan Janssen
8c69bb400b Error in powershell, more backups and updates readme for beta 2014-10-28 10:56:30 +01:00
per ploug
0c33fa0421 Removes protocol from vimeo forms video link 2014-10-28 10:02:23 +01:00
per ploug
0605f9d7ba Links forms dashboard video to vimeo 2014-10-28 09:01:51 +01:00