Changeset [4a5da316e1ebb6a142c2b6b1dfcfa5459fe82017] by Shawn Balestracci
Revision 4a5da316e1ebb6a142c2b6b1dfcfa5459fe82017,
committed by Shawn Balestracci
· February 28th, 2010 @ 08:17 PM
Merge branch 'master' into 271_group_progress_monitor_entry
http://github.com/vegantech/sims/commit/4a5da316e1ebb6a142c2b6b1dfc...
50 changed files
-
A
db/migrate/20100224233945_add_roles_mask_to_users.rb -
A
db/migrate/20100225000140_convert_roles_to_roles_mask.rb -
A
db/migrate/20100227032415_remove_roles_table.rb -
R
spec/fixtures/roles.yml -
R
test/fixtures/roles.yml -
M
app/controllers/district/users_controller.rb -
M
app/controllers/intervention_builder/interventions_controller.rb -
M
app/controllers/intervention_builder/objectives_controller.rb -
M
app/controllers/login_controller.rb -
M
app/helpers/application_helper.rb -
M
app/models/district.rb -
M
app/models/right.rb -
M
app/models/role.rb -
M
app/models/system.rb -
M
app/models/user.rb -
M
app/views/district/users/_role.html.erb -
M
app/views/district/users/_roles.html.erb -
M
app/views/intervention_builder/interventions/_form.html.erb -
M
app/views/intervention_builder/interventions/show.html.erb -
M
app/views/layouts/_menu.html.erb -
M
config/deploy/open2.rb -
M
config/deploy/staging.rb -
M
config/environment.rb -
M
config/gems.yml -
M
db/migrate/20100226021506_remove_rights_table.rb -
M
db/schema.rb -
M
features/flag_search.feature -
M
features/grade_search.feature -
M
features/group_search.feature -
M
features/intervention_participants.feature -
M
features/name_search.feature -
M
features/rjs_dropdown_group_search.feature -
M
features/school_select.feature -
M
features/step_definitions/from_scratch.rb -
M
features/step_definitions/sims_steps.rb -
M
features/support/step_helpers.rb -
M
features/team_notes.feature -
M
features/year_search.feature -
M
lib/create_training_district.rb -
M
lib/import_csv/roles.rb -
M
lib/tasks/verify_rcov.rake -
M
spec/controllers/district/users_controller_spec.rb -
M
spec/controllers/intervention_builder/objectives_controller_spec.rb -
M
spec/controllers/spell_check_controller_spec.rb -
M
spec/fixtures/users.yml -
M
spec/helpers/checklists_helper_spec.rb -
M
spec/models/role_spec.rb -
M
spec/models/system_spec.rb -
M
spec/models/user_spec.rb -
M
test/fixtures/users.yml