Changeset [7b6b5767ab111bd99fccd44d007e742aee0aeb9f] by Zhang Yuanyi
2010-05-12 11:09:08 UTC
Merge branch 'dev' of git@github.com:Suave/1kg.org into
dev
http://github.com/Suave/1kg.org/commit/7b6b5767ab111bd99fccd44d007e...
Committed by Zhang Yuanyi
- A app/views/games/versions.html.erb
- A vendor/plugins/tiny_mce/lib/tiny_mce/assets/tiny_mce/plugins/media/langs/zh_dlg.js
- A vendor/plugins/tiny_mce/lib/tiny_mce/assets/tiny_mce/themes/advanced/langs/zh_dlg.js
- R app/views/admin/requirement_types/_ext_form.html.erb
- M .gitignore
- M app/controllers/activities_controller.rb
- M app/controllers/admin/requirements_controller.rb
- M app/controllers/games_controller.rb
- M app/controllers/groups_controller.rb
- M app/controllers/requirements_controller.rb
- M app/controllers/schools_controller.rb
- M app/controllers/users_controller.rb
- M app/models/neighborhood.rb
- M app/models/requirement_type.rb
- M app/models/user.rb
- M app/views/activities/_form.html.erb
- M app/views/activities/mainphoto.html.erb
- M app/views/admin/game_categories/edit.html.erb
- M app/views/admin/game_categories/index.html.erb
- M app/views/admin/game_categories/new.html.erb
- M app/views/admin/requirement_types/edit.html.erb
- M app/views/admin/requirement_types/new.html.erb
- M app/views/comments/_comments.html.erb
- M app/views/games/_category.html.erb
- M app/views/games/_category_list.html.erb
- M app/views/games/_form.html.erb
- M app/views/games/_games.html.erb
- M app/views/games/category.html.erb
- M app/views/games/edit.html.erb
- M app/views/games/index.html.erb
- M app/views/games/new.html.erb
- M app/views/games/show.html.erb
- M app/views/layouts/application.html.erb
- M app/views/requirement_types/_form.html.erb
- M app/views/requirement_types/index.html.erb
- M app/views/requirement_types/show.html.erb
- M app/views/schools/index.html.erb
- M app/views/schools/info_window.html.erb
- M app/views/schools/show.html.erb
- M app/views/shared/_topic.html.erb
- M app/views/shared/_visit.html.erb
- M app/views/topics/show.html.erb
- M app/views/users/_profile.html.erb
- M config/routes.rb
- M db/schema.rb
- M lib/body_format.rb
- M public/robots.txt
- M public/stylesheets/core.css
- M vendor/plugins/tiny_mce/lib/tiny_mce/assets/tiny_mce/langs/zh.js
- M vendor/plugins/tiny_mce/lib/tiny_mce/assets/tiny_mce/plugins/media/js/media.js
- M vendor/plugins/tiny_mce/lib/tiny_mce/assets/tiny_mce/plugins/media/media.htm
- M vendor/plugins/tiny_mce/lib/tiny_mce/assets/tiny_mce/themes/advanced/source_editor.htm
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »