Changeset [02f5918c8d51cbe77204d234a1af91e945520d9f] by makestory
2010-05-18 12:12:15 UTC
Merge branch 'master' into mall
http://github.com/Suave/1kg.org/commit/02f5918c8d51cbe77204d234a1af...
Committed by makestory
- A app/views/activities/index.atom.builder
- A app/views/activities/show.atom.builder
- A app/views/groups/index.atom.builder
- A app/views/misc/index.atom.builder
- A app/views/schools/index.atom.builder
- A app/views/shared/_atom.html.erb
- A app/views/shares/show.atom.builder
- A app/views/topics/show.atom.builder
- A public/images/google.gif
- A public/images/rss.png
- A public/images/xianguo.gif
- A public/images/zhuaxia.gif
- A public/javascripts/jquery-ui.js
- A public/javascripts/jquery.js
- A public/javascripts/jrails.js
- R public/javascripts/jQuery/jquery-1.2.6.pack.js
- R public/javascripts/jQuery/jquery-ui.js
- R public/javascripts/jQuery/jquery.min.js
- R public/javascripts/jQuery/jquery.ui.core.min.js
- R public/javascripts/jQuery/jquery.ui.tabs.min.js
- R public/javascripts/jQuery/jrails.js
- M .gitignore
- M app/controllers/activities_controller.rb
- M app/controllers/groups_controller.rb
- M app/controllers/misc_controller.rb
- M app/controllers/schools_controller.rb
- M app/controllers/shares_controller.rb
- M app/controllers/topics_controller.rb
- M app/helpers/schools_helper.rb
- M app/views/activities/_form.html.erb
- M app/views/activities/index.html.erb
- M app/views/activities/show.html.erb
- M app/views/groups/index.html.erb
- M app/views/layouts/application.html.erb
- M app/views/misc/index.html.erb
- M app/views/schools/index.html.erb
- M app/views/searches/_search_box.html.erb
- M app/views/shares/show.html.erb
- M app/views/topics/show.html.erb
- M config/deploy.rb
- M config/environments/development.rb
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »