Changeset [2ced4e733f6f1b4dbc9aaea4fff702cd86d9e0c0] by Shawn Balestracci
Revision 2ced4e733f6f1b4dbc9aaea4fff702cd86d9e0c0,
committed by Shawn Balestracci
· October 28th, 2013 @ 08:19 PM
Merge branch 'rm_production' into wip-open
Conflicts:
gc_env.sh
https://github.com/vegantech/sims/commit/2ced4e733f6f1b4dbc9aaea4ff...
54 changed files
-
A
.ruby-gemset -
A
.ruby-version -
A
app/assets/javascripts/coffee/login.js.coffee -
A
app/helpers/login_helper.rb -
A
config/windows_live.yml.sample -
A
spec/helpers/login_helper_spec.rb -
R
.rvmrc -
M
.travis.yml -
M
Gemfile.lock -
M
app/assets/stylesheets/screen.css -
M
app/controllers/districts_controller.rb -
M
app/controllers/intervention_builder/recommended_monitors_controller.rb -
M
app/controllers/interventions_controller.rb -
M
app/controllers/users/sessions_controller.rb -
M
app/helpers/application_helper.rb -
M
app/helpers/flags_helper.rb -
M
app/models/answer_definition.rb -
M
app/models/asset.rb -
M
app/models/checklist_definition.rb -
M
app/models/devise/legacy_password.rb -
M
app/models/district_log.rb -
M
app/models/element_definition.rb -
M
app/models/goal_definition.rb -
M
app/models/intervention_cluster.rb -
M
app/models/intervention_definition.rb -
M
app/models/objective_definition.rb -
M
app/models/probe_definition.rb -
M
app/models/probe_definition_benchmark.rb -
M
app/models/question_definition.rb -
M
app/models/recommendation_answer_definition.rb -
M
app/models/recommendation_definition.rb -
M
app/models/recommended_monitor.rb -
M
app/models/tier.rb -
M
app/models/user.rb -
M
app/models/user_school_assignment.rb -
M
app/views/districts/logs.html.erb -
M
app/views/intervention_builder/interventions/_intervention_definition.html.erb -
M
app/views/intervention_builder/interventions/show.html.erb -
M
app/views/interventions/probe_assignments/_assign_progress_monitor.html.erb -
M
app/views/login/_whats_new.html.erb -
M
app/views/users/sessions/new.html.erb -
M
config/deploy/production.rb -
M
config/initializers/devise.rb -
M
gc_env.sh -
M
lib/district_export.rb -
M
lib/import_csv.rb -
M
lib/populate_intervention_dropdowns.rb -
M
spec/controllers/interventions_controller_spec.rb -
M
spec/helpers/application_helper_spec.rb -
M
spec/helpers/flags_helper_spec.rb -
M
spec/lib/populate_intervention_dropdowns_spec.rb -
M
spec/models/devise/legacy_password_spec.rb -
M
spec/models/intervention_definition_spec.rb -
M
spec/models/user_spec.rb