Skip to content
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.

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

将https://改为// #3

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

将https://改为// #3

wants to merge 12 commits into from

Conversation

DerekGrant
Copy link

在google-apis/google-client-api.html, google-apis/google-jsapi.html ,google-apis/google-maps-api.html , google-apis/google-plusone-api.html中将https://改为//,以让浏览器自动选择地图加载方式

@hanguokai
Copy link
Member

因为 gdgdocs.org 的代理暂时不支持 https ,所以即便将 map 中的 url 修改为 // 也无法使用。

@@ -26,16 +26,26 @@
<section>
<img src="images/logo/developers-logo.svg" id="developers">
<p>DevFest 是 Google 赞助发起的全球性开发者活动,活动内容完全由世界各地的 GDG 社区志愿者自行策划组织。
<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

目测是 merge 的时候出问题了吧

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

谢谢提示!这个问题在最新版本中应该已经解决了,现在是正常显示的

发自 Windows 邮件

发件人: Glow Chiang
发送时间: ‎2014‎年‎9‎月‎29‎日, ‎星期一 ‎10‎:‎32
收件人: gdgbeijing/devfest2014
抄送: DerekGrant

In event-about.html:

@@ -26,16 +26,26 @@



DevFest 是 Google 赞助发起的全球性开发者活动,活动内容完全由世界各地的 GDG 社区志愿者自行策划组织。
+<<<<<<< HEAD

目测是 merge 的时候出问题了吧


Reply to this email directly or view it on GitHub.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants