Skip to content

Devtest merge#21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josh-stupplebeen merged 3 commits into from
Apr 16, 2015
Merged

Devtest merge #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46c0ede
Added error suppression to SSO Window and DateTime handling to dynami…
josh-stupplebeen Apr 16, 2015
06d6a43
Merge branch 'RallyDevelopment' of https://github.com/RallyTools/Rall…
josh-stupplebeen Apr 16, 2015
7f6495e
Merge branch 'RallyTesting' of https://github.com/RallyTools/RallyRes…
josh-stupplebeen Apr 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion Rally.RestApi.UiForWpf/SsoWindow.xaml.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
using mshtml;
using System.Reflection;
using mshtml;
using Rally.RestApi.Auth;
using System;
using System.Collections.Generic;
Expand DownExpand Up@@ -39,6 +40,21 @@ public SsoWindow()
{
InitializeComponent();
browser.LoadCompleted += browser_LoadCompleted;
//browser.Navigated += (a, b) => HideScriptErrors(browser, true);
}

private void HideScriptErrors(WebBrowser browser, bool hide)
{
var fiComWebBrowser = typeof(WebBrowser).GetField("_axIWebBrowser2", BindingFlags.Instance | BindingFlags.NonPublic);
if (fiComWebBrowser == null) return;
var objComWebBrowser = fiComWebBrowser.GetValue(browser);
if (objComWebBrowser == null)
{
browser.Navigated += (o, s) => HideScriptErrors(browser, hide);
return;
}
objComWebBrowser.GetType()
.InvokeMember("Silent", BindingFlags.SetProperty, null, objComWebBrowser, new object[] { hide });
}
#endregion

Expand Down
4 changes: 4 additions & 0 deletions Rally.RestApi/Json/DynamicJsonObject.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,6 +120,10 @@ private object FormatSetValue(object value)
{
return value;
}
if (value is DateTime)
{
return ((DateTime)value).ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fff'Z'");
}
throw new ArgumentException("Attempt to set property to an unsupported type.");
}

Expand Down