Changeset [7460786e4ec040eb2d06f30a55dcf73f1517915e] by Shawn Balestracci
Revision 7460786e4ec040eb2d06f30a55dcf73f1517915e,
committed by Shawn Balestracci
· June 19th, 2011 @ 09:37 PM
Merge branch '620_cico' into wip
https://github.com/vegantech/sims/commit/7460786e4ec040eb2d06f30a55...
17 changed files
-
A
app/views/cico_settings/_cico_expectation.html.erb -
A
app/views/cico_settings/_cico_period.html.erb -
R
app/views/cico_settings/new.html.erb -
R
app/views/cico_settings/show.html.erb -
M
app/controllers/cico_school_days_controller.rb -
M
app/controllers/cico_settings_controller.rb -
M
app/helpers/cico_school_days_helper.rb -
M
app/helpers/cico_settings_helper.rb -
M
app/models/cico_expectation.rb -
M
app/models/cico_period.rb -
M
app/models/cico_school_day.rb -
M
app/models/cico_setting.rb -
M
app/models/cico_student_day.rb -
M
app/views/cico_school_days/edit.html.erb -
M
app/views/cico_settings/edit.html.erb -
M
app/views/cico_settings/index.html.erb -
M
public/javascripts/application.js