Skip to content

I os con cn2012 #2

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

Jump to bottom
Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

I os con cn2012 #2

wants to merge 3 commits into from

Conversation

ThrowDice
Copy link

还有一些需要改动，你先发布一下吧。

@ThrowDice
Commit Yitao Yang's changes
42ce93d
@ThrowDice
first commit for iOSCon2012
e5a5167 
Changelog:

update content for
1.home page banner
2.home page speakers
3.home page weibo link
4.about page introduction
5.venue page
6.schedule page table modification(add a border)
7.sponsors page
@dndx
Copy link
Collaborator

dndx commented Mar 1, 2012

已上线

On Thu, Mar 1, 2012 at 10:09 PM, ThrowDice <
[email protected]

wrote:

还有一些需要改动，你先发布一下吧。

You can merge this Pull Request by running:

git pull https://github.com/ThrowDice/PyConCN iOSConCN2012

Or you can view, comment on it, or merge it online at:

#2

-- Commit Summary --

  • Commit Yitao Yang's changes
  • first commit for iOSCon2012

-- File Changes --

A .gitignore (2)
A README (7)
D apps/2011/static/xml/speakers.xml (183)
D apps/2011/templates/siteView/about.html (84)
D apps/2011/templates/siteView/schedule.html (280)
D apps/2011/templates/siteView/venue.html (92)
D apps/2011/templates/siteView/volunteer.html (102)
A apps/2012/.views.py.swo (0)
A apps/2012/init.py (0)
A apps/2012/conf.py (0)
A apps/2012/info.ini (0)
A apps/2012/locale/zh_CN/LC_MESSAGES/uliweb.po (0)
A apps/2012/locale/zh_CN/LC_MESSAGES/uliweb.pot (0)
A apps/2012/setting.ini (0)
A apps/2012/static/css/index.css (0)
R apps/2012/static/css/schedule.css (4)
A apps/2012/static/css/sponsors.css (0)
A apps/2012/static/css/volunteer.css (0)
A apps/2012/static/images/.DS_Store (0)
A apps/2012/static/images/PyConChina.png (0)
A apps/2012/static/images/heroes/Python-new.gif (0)
A apps/2012/static/images/heroes/Python-old.png (0)
A apps/2012/static/images/heroes/bambook.png (0)
A apps/2012/static/images/heroes/guido.jpg (0)
A apps/2012/static/images/ios_logo.png (0)
A apps/2012/static/images/logo_s.png (0)
A apps/2012/static/images/speakers/chenshixin.jpg (0)
A apps/2012/static/images/speakers/chenzheng.jpg (0)
A apps/2012/static/images/speakers/damienhou.jpg (0)
A apps/2012/static/images/speakers/diaolizhi.jpg (0)
A apps/2012/static/images/speakers/duanmuheng.jpg (0)
A apps/2012/static/images/speakers/haopeiqiang.jpg (0)
A apps/2012/static/images/speakers/hongqiangning.jpg (0)
A apps/2012/static/images/speakers/huangdong.jpg (0)
A apps/2012/static/images/speakers/kongxiangbo.png (0)
A apps/2012/static/images/speakers/laiyonghao.jpg (0)
A apps/2012/static/images/speakers/lijundong.jpg (0)
A apps/2012/static/images/speakers/liliang.jpg (0)
A apps/2012/static/images/speakers/linwei.jpg (0)
A apps/2012/static/images/speakers/liyinghui.jpg (0)
A apps/2012/static/images/speakers/nopic.gif (0)
A apps/2012/static/images/speakers/panjunyong.jpg (0)
A apps/2012/static/images/speakers/ryanye.jpg (0)
A apps/2012/static/images/speakers/shenwai.jpg (0)
A apps/2012/static/images/speakers/tuhongyi.jpg (0)
A apps/2012/static/images/speakers/tuyimin.jpg (0)
A apps/2012/static/images/speakers/wangjian.jpg (0)
A apps/2012/static/images/speakers/wangjianfeng.jpg (0)
A apps/2012/static/images/speakers/yangwu.gif (0)
A apps/2012/static/images/speakers/zhouqi.jpg (0)
A apps/2012/static/images/sponsors/BEIJINGgtug.jpg (0)
A apps/2012/static/images/sponsors/BEIJINGgtug.png (0)
A apps/2012/static/images/sponsors/Guanzhou-GTUG.jpg (0)
A apps/2012/static/images/sponsors/Guanzhou-GTUG_400.jpg (0)
A apps/2012/static/images/sponsors/PMCamp_logo.jpg (0)
A apps/2012/static/images/sponsors/Tiny4Cocoa_logo.png (0)
A apps/2012/static/images/sponsors/TopGeek_logo.jpg (0)
A apps/2012/static/images/sponsors/ccp.gif (0)
A apps/2012/static/images/sponsors/cpyug.gif (0)
A apps/2012/static/images/sponsors/csdn.gif (0)
A apps/2012/static/images/sponsors/demo-coffee-logo.jpg (0)
A apps/2012/static/images/sponsors/douban.gif (0)
A apps/2012/static/images/sponsors/gensee-cloud.gif (0)
A apps/2012/static/images/sponsors/gensee.png (0)
A apps/2012/static/images/sponsors/google.png (0)
A apps/2012/static/images/sponsors/google_groups.gif (0)
A apps/2012/static/images/sponsors/gtug-shanghai-logo.png (0)
A apps/2012/static/images/sponsors/gtug.gif (0)
A apps/2012/static/images/sponsors/hangzhou-GTUG-logo.jpg (0)
A apps/2012/static/images/sponsors/iApp4Me.png (0)
A apps/2012/static/images/sponsors/infoq.gif (0)
A apps/2012/static/images/sponsors/jinshan.gif (0)
A apps/2012/static/images/sponsors/liubao.png (0)
A apps/2012/static/images/sponsors/logo.png (0)
A apps/2012/static/images/sponsors/matrixpartners_logo.png (0)
A apps/2012/static/images/sponsors/mobiletmtlogo.png (0)
A apps/2012/static/images/sponsors/pycon.gif (0)
A apps/2012/static/images/sponsors/shunwang.jpg (0)
A apps/2012/static/images/sponsors/sina.gif (0)
A apps/2012/static/images/sponsors/snda.png (0)
A apps/2012/static/images/sponsors/techparty_logo.png (0)
A apps/2012/static/images/sponsors/topgeek.gif (0)
A apps/2012/static/images/sponsors/tudou.png (0)
A apps/2012/static/images/sponsors/turingbook.gif (0)
A apps/2012/static/images/sponsors/woodpecker.gif (0)
A apps/2012/static/images/sponsors/xunpu.png (0)
A apps/2012/static/images/venue/KIC_ditu.jpg (0)
A apps/2012/static/images/volunteer/chenshixin.jpg (0)
A apps/2012/static/images/volunteer/lugang.jpg (0)
A apps/2012/static/images/volunteer/luweifeng.jpg (0)
A apps/2012/static/images/volunteer/lvguoning.png (0)
A apps/2012/static/images/volunteer/shenwai.jpg (0)
A apps/2012/static/images/volunteer/sundatong.jpg (0)
A apps/2012/static/images/volunteer/zhixiaoyong.jpg (0)
A apps/2012/static/images/volunteer/zhouqi.png (0)
A apps/2012/static/js/index.js (0)
A apps/2012/static/js/schedule.js (0)
A apps/2012/static/js/venue.js (0)
A apps/2012/static/readme.txt (0)
A apps/2012/static/xml/speakers.xml (72)
R apps/2012/templates/index.html (150)
A apps/2012/templates/readme.txt (0)
A apps/2012/templates/siteView/about.html (76)
R apps/2012/templates/siteView/registration.html (10)
A apps/2012/templates/siteView/schedule.html (92)
R apps/2012/templates/siteView/sponsors.html (96)
A apps/2012/templates/siteView/venue.html (15)
A apps/2012/templates/siteView/volunteer.html (58)
R apps/2012/views.py (6)
M apps/bootstrap/templates/bootstrap_layout.html (4)
M apps/settings.ini (10)

-- Patch Links --

https://github.com/pyhunterpig/PyConCN/pull/2.patch
https://github.com/pyhunterpig/PyConCN/pull/2.diff

Reply to this email directly or view it on GitHub:
#2

Datong

@ThrowDice
See Changelog
be6efcd 
Changelog

1.remove Guido in home page
2.remove Sting in home page speaker
3.remove 查看此主办方其它活动 in about page
4.update home page banner image
5.update home page logo
6.update sponsor page media sponsor content
7.update home page sponsers link and alt
8.update home page media support link and alt
9.add 泡菜's intro and avatar to volunteer page
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ThrowDice @dndx