Changeset [18689600ddcd55ee64e65080a088e878198ff008] by Zhang Yuanyi
2009-11-05 22:15:07 UTC
Merge branch 'master' of git@github.com:Suave/1kg.org
http://github.com/Suave/1kg.org/commit/18689600ddcd55ee64e65080a088...
Committed by Zhang Yuanyi
- A app/controllers/admin/bulletins_controller.rb
- A app/controllers/bulletins_controller.rb
- A app/controllers/minisite/cnbloggercon09/dashboard_controller.rb
- A app/controllers/searches_controller.rb
- A app/helpers/searches_helper.rb
- A app/models/bulletin.rb
- A app/models/bulletin_comment.rb
- A app/models/search.rb
- A app/views/admin/bulletins/_form.html.erb
- A app/views/admin/bulletins/edit.html.erb
- A app/views/admin/bulletins/index.html.erb
- A app/views/admin/bulletins/new.html.erb
- A app/views/bulletins/index.html.erb
- A app/views/bulletins/show.html.erb
- A app/views/mailer/new_password_notification.erb
- A app/views/minisite/cnbloggercon09/dashboard/index.html.erb
- A app/views/schools/_status.html.erb
- A app/views/searches/show.html.erb
- A app/views/sessions/forget_password.html.erb
- A app/views/shared/_search_box.html.erb
- A app/views/shared/_visit.html.erb
- A config/initializers/update_without_timestampes.rb
- A config/locales/ar.yml
- A config/locales/bg.yml
- A config/locales/bn-IN.yml
- A config/locales/bs.yml
- A config/locales/ca-ES.yml
- A config/locales/cn.yml
- A config/locales/da.yml
- A config/locales/de-AT.yml
- A config/locales/de.yml
- A config/locales/ee.yml
- A config/locales/el.yml
- A config/locales/en.yml
- A config/locales/es-AR.yml
- A config/locales/es-MX.yml
- A config/locales/es.yml
- A config/locales/fa.yml
- A config/locales/fi.yml
- A config/locales/fr-CH.yml
- A config/locales/fr.yml
- A config/locales/gl-ES.yml
- A config/locales/he.yml
- A config/locales/hu.yml
- A config/locales/id.yml
- A config/locales/it.yml
- A config/locales/ja.yml
- A config/locales/ko.yml
- A config/locales/lt.yml
- A config/locales/lv.yml
- A config/locales/mk.yml
- A config/locales/nl.yml
- A config/locales/no-NB.yml
- A config/locales/no-NN.yml
- A config/locales/pl.yml
- A config/locales/pt-BR.yml
- A config/locales/pt-PT.yml
- A config/locales/ro.yml
- A config/locales/ru.yml
- A config/locales/sk.yml
- A config/locales/sr-Latn.yml
- A config/locales/sr.yml
- A config/locales/sv-SE.yml
- A config/locales/sw.yml
- A config/locales/tr.yml
- A config/locales/uk.yml
- A config/locales/vi.yml
- A config/locales/zh-CN.yml
- A config/locales/zh-TW.yml
- A public/images/announce/cnbloggercon09.jpg
- A public/images/buttonlink.gif
- A public/images/buttonstatus.gif
- A public/images/cnbloggercon09/1kg.png
- A public/images/cnbloggercon09/banner.jpg
- A public/images/cnbloggercon09/cnreviews.png
- A public/images/cnbloggercon09/cobranding.png
- A public/images/cnbloggercon09/dixiahe.png
- A public/images/cnbloggercon09/du-pin.png
- A public/images/cnbloggercon09/lanoo.gif
- A public/images/cnbloggercon09/mark.png
- A public/images/cnbloggercon09/more.png
- A public/images/cnbloggercon09/register.png
- A public/images/cnbloggercon09/register_hover.png
- A public/images/cnbloggercon09/sanxia.png
- A public/images/cnbloggercon09/sbf.png
- A public/images/cnbloggercon09/slogan.png
- A public/images/cnbloggercon09/taobao.png
- A public/images/cnbloggercon09/telecom.png
- A public/images/icon/online.png
- A public/images/school_main.png
- A public/images/star.png
- A public/images/star_gary.png
- A public/stylesheets/cnbloggercon09.css
- A spec/controllers/searches_controller_spec.rb
- A spec/helpers/searches_helper_spec.rb
- R app/views/schools/edit_position.html.erb
- R public/images/lightenschool/button.gif
- M app/controllers/admin/groups_controller.rb
- M app/controllers/comments_controller.rb
- M app/controllers/geos_controller.rb
- M app/controllers/guides_controller.rb
- M app/controllers/misc_controller.rb
- M app/controllers/schools_controller.rb
- M app/controllers/sessions_controller.rb
- M app/controllers/users_controller.rb
- M app/helpers/application_helper.rb
- M app/helpers/schools_helper.rb
- M app/models/mailer.rb
- M app/models/school.rb
- M app/models/school_contact.rb
- M app/models/school_guide.rb
- M app/models/user.rb
- M app/models/visited.rb
- M app/views/activities/show.html.erb
- M app/views/admin/groups/index.html.erb
- M app/views/admin/shared/_operation_list.erb
- M app/views/comments/_comments.html.erb
- M app/views/geos/_school_maps.html.erb
- M app/views/geos/_schools.html.erb
- M app/views/geos/show.html.erb
- M app/views/guides/_form.html.erb
- M app/views/guides/edit.html.erb
- M app/views/guides/new.html.erb
- M app/views/guides/show.html.erb
- M app/views/layouts/application.html.erb
- M app/views/minisite/kuailebox/dashboard/index.html.erb
- M app/views/minisite/lightenschool/dashboard/index.html.erb
- M app/views/misc/index.html.erb
- M app/views/misc/welcome.html.erb
- M app/views/schools/_gallery_photo.html.erb
- M app/views/schools/_photos.html.erb
- M app/views/schools/_school_map.html.erb
- M app/views/schools/edit_basic.html.erb
- M app/views/schools/edit_traffic.html.erb
- M app/views/schools/index.html.erb
- M app/views/schools/large_map.html.erb
- M app/views/schools/lei.html.erb
- M app/views/schools/new.html.erb
- M app/views/schools/photos.html.erb
- M app/views/schools/show.html.erb
- M app/views/sessions/new.html.erb
- M app/views/shared/_current_user_profile.erb
- M app/views/shared/_footer.erb
- M app/views/tags/index.html.erb
- M app/views/topics/show.html.erb
- M config/environment.rb
- M config/routes.rb
- M db/schema.rb
- M public/javascripts/jquery.prettyPhoto.js
- M public/stylesheets/core.css
- M public/stylesheets/lei.css
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »