Permalink
Browse files

Merge branch 'master' into issue76

Conflicts:
	lib/acts_as_numberable.rb
  • Loading branch information...
2 parents e040021 + 9ec5fbf commit b263d357c1c78145279c7a1c6f23acfcf232dcb5 Joel Yin committed Jun 12, 2012
Showing with 1,050 additions and 855 deletions.
  1. +1 −1 .rvmrc
  2. +37 −63 Gemfile
  3. +155 −124 Gemfile.lock
  4. BIN {public → app/assets}/images/CC-by.jpg
  5. BIN {public → app/assets}/images/CNX-X.png
  6. BIN {public → app/assets}/images/CNX-X.psd
  7. BIN {public → app/assets}/images/account_tab.png
  8. BIN {public → app/assets}/images/add_a_member.png
  9. BIN {public → app/assets}/images/add_collaborator.png
  10. BIN {public → app/assets}/images/answer_choice.png
  11. BIN {public → app/assets}/images/assigning_roles.png
  12. BIN {public → app/assets}/images/black_x_v1.png
  13. BIN {public → app/assets}/images/bulb.png
  14. BIN {public → app/assets}/images/button1.png
  15. BIN {public → app/assets}/images/cc.logo.png
  16. BIN app/assets/images/checkCredit.png
  17. BIN {public → app/assets}/images/check_icon_v1.png
  18. BIN {public → app/assets}/images/citeam_spen_logo_c_v1.png
  19. BIN {public → app/assets}/images/citeam_spen_logo_homepage.png
  20. BIN {public → app/assets}/images/comment.gif
  21. BIN {public → app/assets}/images/down_arrow_head.png
  22. BIN {public → app/assets}/images/down_arrow_head_sq.png
  23. BIN {public → app/assets}/images/draft.png
  24. BIN {public → app/assets}/images/edit.gif
  25. BIN {public → app/assets}/images/edit_roles_link.png
  26. BIN {public → app/assets}/images/existing_question.png
  27. BIN {public → app/assets}/images/gray_background.png
  28. BIN {public → app/assets}/images/gray_background_tall.png
  29. BIN {public → app/assets}/images/gray_background_taller.png
  30. BIN {public → app/assets}/images/help_button_v1.png
  31. BIN {public → app/assets}/images/help_button_v2.png
  32. BIN {public → app/assets}/images/help_button_v2_sm.png
  33. BIN {public → app/assets}/images/image_box.png
  34. BIN {public → app/assets}/images/image_icon.png
  35. BIN {public → app/assets}/images/image_preview.png
  36. BIN {public → app/assets}/images/image_tag.png
  37. BIN {public → app/assets}/images/lml_logo.png
  38. BIN {public → app/assets}/images/message_roles.png
  39. BIN {public → app/assets}/images/message_settings.png
  40. BIN {public → app/assets}/images/multipart_question_text.png
  41. BIN {public → app/assets}/images/pagehead-background-white.png
  42. BIN {public → app/assets}/images/quadbase_banner_v1.png
  43. BIN {public → app/assets}/images/quadbase_banner_v6.png
  44. BIN {public → app/assets}/images/quadbase_logo_v1a.png
  45. BIN {public → app/assets}/images/question_choice_v1.png
  46. BIN {public → app/assets}/images/question_matching_v1.png
  47. BIN {public → app/assets}/images/question_multipart_v1.png
  48. BIN {public → app/assets}/images/question_multistep_v1.png
  49. BIN {public → app/assets}/images/question_multistep_v2.png
  50. BIN {public → app/assets}/images/question_parts.png
  51. BIN {public → app/assets}/images/question_text.png
  52. BIN {public → app/assets}/images/red_button_200_60.png
  53. BIN {public → app/assets}/images/red_button_hover_200_60.png
  54. BIN {public → app/assets}/images/right_arrow_head_sq.png
  55. BIN {public → app/assets}/images/roles_table.png
  56. BIN {public → app/assets}/images/show.gif
  57. BIN {public → app/assets}/images/signup.png
  58. BIN {public → app/assets}/images/signupform.png
  59. BIN {public → app/assets}/images/thumbs_down.png
  60. BIN {public → app/assets}/images/thumbs_down_hover.png
  61. BIN {public → app/assets}/images/thumbs_up.png
  62. BIN {public → app/assets}/images/thumbs_up_hover.png
  63. BIN {public → app/assets}/images/trash.gif
  64. BIN {public → app/assets}/images/up_arrow_head.png
  65. BIN {public → app/assets}/images/workspace_selection.png
  66. BIN {public → app/assets}/images/x_icon_v1.png
  67. +25 −9 public/javascripts/application.js → app/assets/javascripts/application.js.erb
  68. +7 −0 app/assets/javascripts/codemirror.js
  69. 0 {public → app/assets}/javascripts/codemirror_utils.js
  70. 0 {public → app/assets}/javascripts/jquery_extensions.js
  71. +5 −0 app/assets/javascripts/markitup.js
  72. 0 {public → app/assets}/javascripts/markitup_set.js
  73. 0 {public → app/assets}/javascripts/quadbase.js
  74. +5 −0 app/assets/javascripts/uploadify.js
  75. 0 {public → app/assets}/stylesheets/.gitkeep
  76. +18 −0 app/assets/stylesheets/application.css
  77. +7 −0 app/assets/stylesheets/markitup.css
  78. +8 −2 {public → app/assets}/stylesheets/quadbase-embed.css
  79. +32 −16 {public → app/assets}/stylesheets/quadbase.css
  80. 0 {public → app/assets}/stylesheets/scaffold.css
  81. +6 −0 app/assets/stylesheets/uploadify.css
  82. +5 −4 app/controllers/application_controller.rb
  83. +0 −1 app/controllers/attachable_assets_controller.rb
  84. +7 −1 app/controllers/project_members_controller.rb
  85. +14 −13 app/controllers/questions_controller.rb
  86. +1 −1 app/controllers/registrations_controller.rb
  87. +1 −1 app/controllers/users_controller.rb
  88. +1 −0 app/helpers/application_helper.rb
  89. +15 −1 app/helpers/questions_helper.rb
  90. +7 −8 app/models/answer_choice.rb
  91. +1 −1 app/models/asset.rb
  92. +2 −2 app/models/attachable_asset.rb
  93. +2 −3 app/models/comment_thread_subscription.rb
  94. +2 −2 app/models/license.rb
  95. +4 −2 app/models/logic.rb
  96. +4 −4 app/models/logic_library.rb
  97. +4 −4 app/models/logic_library_version.rb
  98. +16 −16 app/models/multipart_question.rb
  99. +2 −7 app/models/project_member.rb
  100. +109 −61 app/models/question.rb
  101. +12 −3 app/models/question_collaborator.rb
  102. +8 −6 app/models/question_part.rb
  103. +10 −5 app/models/question_role_request.rb
  104. +1 −1 app/models/solution.rb
  105. +10 −11 app/models/user.rb
  106. +2 −2 app/models/vote.rb
  107. +4 −4 app/models/website_configuration.rb
  108. +3 −3 app/views/attachable_assets/_add_image_dialog.html.erb
  109. +3 −3 app/views/attachable_assets/_form.html.erb
  110. +1 −1 app/views/home/index.html.erb
  111. +13 −34 app/views/layouts/application.html.erb
  112. +10 −0 app/views/layouts/questions.html.erb
  113. +2 −2 app/views/multipart_questions/_show.html.erb
  114. +24 −14 app/views/questions/_search.html.erb
  115. +1 −1 app/views/questions/edit.html.erb
  116. +2 −1 app/views/questions/quickview.js.erb
  117. +1 −0 app/views/questions/show.html.erb
  118. +1 −1 app/views/questions/source.html.erb
  119. +1 −5 app/views/shared/_mark_it_up.html.erb
  120. +2 −2 app/views/shared/_votes.html.erb
  121. +25 −8 app/views/simple_questions/_answer_choice_fields.html.erb
  122. +14 −7 app/views/simple_questions/_content_and_answers.html.erb
  123. +19 −1 app/views/simple_questions/_form.html.erb
  124. +0 −1 app/views/simple_questions/_show.html.erb
  125. +2 −2 app/views/simple_questions/_source.html.erb
  126. +2 −0 app/views/solutions/edit.html.erb
  127. +33 −12 config/application.rb
  128. +3 −13 config/boot.rb
  129. +15 −3 config/environments/development.rb
  130. +35 −14 config/environments/production.rb
  131. +9 −7 config/environments/test.rb
  132. +2 −2 config/initializers/01_load_developer_settings.rb
  133. +0 −4 config/initializers/devise.rb
  134. +5 −0 config/initializers/inflections.rb
  135. +1 −1 config/initializers/session_store.rb
  136. +24 −0 config/initializers/squeel.rb
  137. +17 −0 config/initializers/wrap_parameters.rb
  138. +1 −1 config/locales/en.yml
  139. +5 −6 lib/acts_as_numberable.rb
  140. +1 −0 lib/content_parse_and_cache.rb
  141. +3 −3 lib/vote_methods.rb
  142. +0 −16 public/javascripts/jquery-1.5.1.min.js
  143. +0 −196 public/javascripts/rails.js
  144. +7 −2 test/factories.rb
  145. +6 −0 test/functional/attachable_assets_controller_test.rb
  146. +20 −21 test/functional/licenses_controller_test.rb
  147. +9 −2 test/functional/project_members_controller_test.rb
  148. +7 −7 test/functional/website_configurations_controller_test.rb
  149. +1 −0 test/unit/logic_test.rb
  150. +2 −0 test/unit/multipart_question_test.rb
  151. +21 −12 test/unit/project_test.rb
  152. +35 −35 test/unit/quadbase_parser_test.rb
  153. +6 −2 test/unit/question_role_request_test.rb
  154. +102 −29 test/unit/question_test.rb
  155. +4 −2 test/unit/simple_question_test.rb
  156. 0 {public → vendor/assets}/javascripts/autocomplete-rails.js
  157. 0 {public → vendor/assets}/javascripts/codemirror-compressed.js
  158. 0 {public → vendor/assets}/javascripts/jcarousellite_1.0.1.js
  159. 0 {public → vendor/assets}/javascripts/jquery-ui-1.8.12.custom.min.js
  160. 0 {public → vendor/assets}/javascripts/jquery-ui-timepicker-addon.js
  161. 0 {public → vendor/assets}/javascripts/jquery.easing.1.1.1.js
  162. BIN {public → vendor/assets}/javascripts/jquery.uploadify/browse_button.png
  163. BIN {public → vendor/assets}/javascripts/jquery.uploadify/cancel.png
  164. 0 {public → vendor/assets}/javascripts/jquery.uploadify/jquery.uploadify.v2.1.4.min.js
  165. 0 {public → vendor/assets}/javascripts/jquery.uploadify/swfobject.js
  166. 0 {public → vendor/assets}/javascripts/jquery.uploadify/uploadify.css
  167. 0 {public → vendor/assets}/javascripts/jquery.uploadify/uploadify.php
  168. BIN {public → vendor/assets}/javascripts/jquery.uploadify/uploadify.swf
  169. 0 {public → vendor/assets}/javascripts/jslint.js
  170. 0 {public → vendor/assets}/javascripts/markitup/jquery.markitup.js
  171. BIN {public → vendor/assets}/javascripts/markitup/sets/default/images/bold.png
  172. BIN {public → vendor/assets}/javascripts/markitup/sets/default/images/bullets.png
  173. BIN {public → vendor/assets}/javascripts/markitup/sets/default/images/clean.png
  174. BIN {public → vendor/assets}/javascripts/markitup/sets/default/images/image.png
  175. BIN {public → vendor/assets}/javascripts/markitup/sets/default/images/italic.png
  176. BIN {public → vendor/assets}/javascripts/markitup/sets/default/images/link.png
  177. BIN {public → vendor/assets}/javascripts/markitup/sets/default/images/math.png
  178. BIN {public → vendor/assets}/javascripts/markitup/sets/default/images/numbered_list.png
  179. BIN {public → vendor/assets}/javascripts/markitup/sets/default/images/picture.png
  180. BIN {public → vendor/assets}/javascripts/markitup/sets/default/images/preview.png
  181. 0 {public → vendor/assets}/javascripts/markitup/sets/default/images/readme.txt
  182. BIN {public → vendor/assets}/javascripts/markitup/sets/default/images/stroke.png
  183. 0 {public → vendor/assets}/javascripts/markitup/sets/default/set.js
  184. 0 {public → vendor/assets}/javascripts/markitup/sets/default/style.css
  185. BIN {public → vendor/assets}/javascripts/markitup/skins/markitup/images/bg-container.png
  186. BIN {public → vendor/assets}/javascripts/markitup/skins/markitup/images/bg-editor-bbcode.png
  187. BIN {public → vendor/assets}/javascripts/markitup/skins/markitup/images/bg-editor-dotclear.png
  188. BIN {public → vendor/assets}/javascripts/markitup/skins/markitup/images/bg-editor-html.png
  189. BIN {public → vendor/assets}/javascripts/markitup/skins/markitup/images/bg-editor-json.png
  190. BIN {public → vendor/assets}/javascripts/markitup/skins/markitup/images/bg-editor-markdown.png
  191. BIN {public → vendor/assets}/javascripts/markitup/skins/markitup/images/bg-editor-textile.png
  192. BIN {public → vendor/assets}/javascripts/markitup/skins/markitup/images/bg-editor-wiki.png
  193. BIN {public → vendor/assets}/javascripts/markitup/skins/markitup/images/bg-editor-xml.png
  194. BIN {public → vendor/assets}/javascripts/markitup/skins/markitup/images/bg-editor.png
  195. BIN {public → vendor/assets}/javascripts/markitup/skins/markitup/images/handle.png
  196. BIN {public → vendor/assets}/javascripts/markitup/skins/markitup/images/menu.png
  197. BIN {public → vendor/assets}/javascripts/markitup/skins/markitup/images/submenu.png
  198. 0 {public → vendor/assets}/javascripts/markitup/skins/markitup/style.css
  199. BIN {public → vendor/assets}/javascripts/markitup/skins/simple/images/handle.png
  200. BIN {public → vendor/assets}/javascripts/markitup/skins/simple/images/menu.png
  201. BIN {public → vendor/assets}/javascripts/markitup/skins/simple/images/submenu.png
  202. 0 {public → vendor/assets}/javascripts/markitup/skins/simple/style.css
  203. 0 {public → vendor/assets}/javascripts/markitup/templates/preview.css
  204. 0 {public → vendor/assets}/javascripts/markitup/templates/preview.html
  205. 0 {public → vendor/assets}/javascripts/seedrandom-min.js
  206. 0 {public → vendor/assets}/javascripts/seedrandom.js
  207. 0 {public → vendor/assets}/stylesheets/codemirror.css
  208. BIN {public → vendor/assets}/stylesheets/images/ui-bg_diagonals-thick_75_f3d8d8_40x40.png
  209. BIN {public → vendor/assets}/stylesheets/images/ui-bg_dots-small_65_a6a6a6_2x2.png
  210. BIN {public → vendor/assets}/stylesheets/images/ui-bg_flat_0_333333_40x100.png
  211. BIN {public → vendor/assets}/stylesheets/images/ui-bg_flat_65_ffffff_40x100.png
  212. BIN {public → vendor/assets}/stylesheets/images/ui-bg_flat_75_ffffff_40x100.png
  213. BIN {public → vendor/assets}/stylesheets/images/ui-bg_glass_55_dfe5f1_1x400.png
  214. BIN {public → vendor/assets}/stylesheets/images/ui-bg_highlight-hard_100_eeeeee_1x100.png
  215. BIN {public → vendor/assets}/stylesheets/images/ui-bg_highlight-hard_100_f6f6f6_1x100.png
  216. BIN {public → vendor/assets}/stylesheets/images/ui-bg_highlight-soft_15_b22222_1x100.png
  217. BIN {public → vendor/assets}/stylesheets/images/ui-icons_000000_256x240.png
  218. BIN {public → vendor/assets}/stylesheets/images/ui-icons_b22222_256x240.png
  219. BIN {public → vendor/assets}/stylesheets/images/ui-icons_ffffff_256x240.png
  220. 0 {public → vendor/assets}/stylesheets/jquery-ui-1.8.12.custom.css
  221. 0 {public → vendor/assets}/stylesheets/yui_menubar_overrides.css
View
2 .rvmrc
@@ -1 +1 @@
-rvm --create ruby-1.9.2@quadbase
+rvm --create ruby-1.9.3@quadbase
View
100 Gemfile
@@ -1,89 +1,63 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
-gem 'rails', '3.0.12'
-gem 'rake', '0.8.7'
+gem 'rails', '3.2.4'
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+ gem 'sass-rails', '~> 3.2.5'
+ gem 'coffee-rails', '~> 3.2.2'
+ gem 'uglifier', '~> 1.2.4'
+end
+
+gem 'jquery-rails', '~> 2.0.2'
# Deploy with Capistrano
-gem 'capistrano'
+gem 'capistrano', '~> 2.12.0'
# Authentication
-gem 'devise'
-
-gem 'jquery-rails'
+gem 'devise', '~> 2.1.0'
-# gem "nested_form"
+# Assets
+gem 'parslet', '~> 1.4.0'
-gem "will_paginate", "3.0.pre2"
+gem 'paperclip', '~> 2.7.0'
-gem 'parslet', '~> 1.2'
-
-gem "paperclip", "~> 2.3"
-gem 'mime-types', :require => 'mime/types'
+gem 'mime-types', '~> 1.18', :require => 'mime/types'
# Search
-gem "meta_where"
+gem 'squeel', '~> 1.0.2'
+
+gem 'will_paginate', '~> 3.0.3'
-gem 'acts-as-taggable-on', '~>2.1.0'
+gem 'acts-as-taggable-on', '~> 2.1.1'
-gem 'rails3-jquery-autocomplete'
+gem 'rails3-jquery-autocomplete', '~> 1.0.7'
# reCAPTCHA
-gem "recaptcha", :require => "recaptcha/rails"
+gem 'recaptcha', '~> 0.3.4', :require => 'recaptcha/rails'
-gem 'yajl-ruby'
+gem 'yajl-ruby', '~> 1.1.0'
-gem 'jsonify'
-gem 'jsonify-rails'
+gem 'jsonify', '~> 0.3.1'
+gem 'jsonify-rails', '~> 0.3.2'
-gem 'execjs'
-gem 'therubyracer'
-gem 'uglifier'
+gem 'execjs', '~> 1.4.0'
+gem 'therubyracer', '~> 0.10.1'
-gem "bullring", "~> 0.7.4"
+gem 'bullring', '~> 0.7.4'
group :development, :test do
- gem 'sqlite3'
- gem 'ruby-debug19'
- # gem 'machinist', '< 2.0'
- gem 'faker'
- gem 'factory_girl_rails', '<2.0'
- gem 'timecop'
+ gem 'sqlite3', '~> 1.3.6'
+ gem 'ruby-debug19', '~> 0.11.6'
+ gem 'faker', '~> 1.0.1'
+ gem 'factory_girl_rails', '~> 1.7.0'
+ gem 'timecop', '~> 0.3.5'
end
-gem 'single_test'
+gem 'single_test', '~> 0.5.1'
group :production do
- gem 'mysql2'
- gem 'rack-ssl-enforcer'
+ gem 'mysql2', '~> 0.3.11'
+ gem 'rack-ssl-enforcer', '~> 0.2.4'
end
-
-gem 'ruby-debug19'
-
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
-# gem 'ruby-debug'
-# gem 'ruby-debug19'
-
-# Bundle the extra gems:
-# gem 'bj'
-# gem 'nokogiri'
-# gem 'sqlite3-ruby', :require => 'sqlite3'
-# gem 'aws-s3', :require => 'aws/s3'
-
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-# group :development, :test do
-# gem 'webrat'
-# end
Oops, something went wrong.

0 comments on commit b263d35

Please sign in to comment.