Revision: 6897
Author: [email protected]
Date: Fri Nov 13 12:34:04 2009
Log: Merge trunk r6896 into this branch
Update MissingPlugin app with license and new IE download URL
svn merge --ignore-ancestry -c6896 \
http://google-web-toolkit.googlecode.com/svn/trunk/ .
http://code.google.com/p/google-web-toolkit/source/detail?r=6897
Modified:
/releases/2.0/branch-info.txt
/releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/MissingPluginPane.ui.xml
/releases/2.0/plugins/MissingPlugin/war/MissingPlugin.html
=======================================
--- /releases/2.0/branch-info.txt Fri Nov 13 10:35:54 2009
+++ /releases/2.0/branch-info.txt Fri Nov 13 12:34:04 2009
@@ -638,3 +638,7 @@
Updated dev mode prompt URL to refer to "gwt.codesvr" instead
of "gwt.hosted"
svn merge --ignore-ancestry -c 6893
http://google-web-toolkit.googlecode.com/svn/trunk/ .
+tr...@6896 was merged into this branch
+ Update MissingPlugin app with license and new IE download URL
+ svn merge --ignore-ancestry -c6896 \
+ http://google-web-toolkit.googlecode.com/svn/trunk/ .
=======================================
---
/releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/MissingPluginPane.ui.xml
Mon Nov 9 21:01:39 2009
+++
/releases/2.0/plugins/MissingPlugin/src/com/google/gwt/missingplugin/client/MissingPluginPane.ui.xml
Fri Nov 13 12:34:04 2009
@@ -49,6 +49,12 @@
font-family: Verdana;
padding-top: 10px;
}
+
+ .license {
+ padding-top: 2em;
+ font-family: Verdana;
+ font-size: 9pt;
+ }
</ui:style>
<g:HTMLPanel styleName='{style.pane}'>
@@ -63,6 +69,14 @@
For more information, see the
<a ui:field="troubleshootingLink"
style="color:#000;">Troubleshooting FAQ</a>
.
+ </div>
+ <div class="{style.license}">
+ All plugins are licensed under the <a
+ href="http://code.google.com/webtoolkit/terms.html";>Apache 2.0 open
source
+ license</a>, which includes limitations of liability and disclaimers
of
+ warranty for the product. Please note that some included libraries
may be
+ licensed under other open source licenses listed <a
+
href="http://code.google.com/webtoolkit/terms.html#licenses";>here</a>.
</div>
</g:HTMLPanel>
=======================================
--- /releases/2.0/plugins/MissingPlugin/war/MissingPlugin.html Wed Nov 11
20:55:14 2009
+++ /releases/2.0/plugins/MissingPlugin/war/MissingPlugin.html Fri Nov 13
12:34:04 2009
@@ -108,7 +108,7 @@
"ie" :
{
"caption" : "Download the GWT Developer Plugin<br>For Internet
Explorer",
- "url" :
"http://google-web-toolkit.googlecode.com/svn/trunk/plugins/ie/prebuilt/GwtDevModeIePluginInstaller.msi";,
+ "url" :
"https://dl-ssl.google.com/tag/s/appguid%3D%7B9a5e649a-ec63-4c7d-99bf-75adb345e7e5%7D%%26lang%3Den%26appname%3DGWT%2520Developer%2520Plugin%2520for%2520IE%26needsadmin%3Dfalse/gwt/plugins/ie/GwtDevPluginSetup.exe";,
"platforms" : "Win x86",
"supported" : true
},
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
