Changeset [6f114e802f1ec60fa627e1b2c2cefdb94148a9e3] by Shawn Balestracci
Revision 6f114e802f1ec60fa627e1b2c2cefdb94148a9e3,
committed by Shawn Balestracci
· September 12th, 2010 @ 01:27 PM
Merge branch 'master' into
488_intervention_ending_reason_includes_481
http://github.com/vegantech/sims/commit/6f114e802f1ec60fa627e1b2c2c...
23 changed files
-
A
app/views/notifications/special_ed_referral.text.html.erb -
A
app/views/notifications/special_ed_referral.text.plain.erb -
A
public/tutorial/infinite_campus/ic_auto1.png -
A
public/tutorial/infinite_campus/ic_auto_export2.png -
A
public/tutorial/infinite_campus/ic_cmd_prompt.png -
A
public/tutorial/infinite_campus/ic_csvdump.bat.png -
A
public/tutorial/infinite_campus/ic_custom_tab1.png -
A
public/tutorial/infinite_campus/ic_download_zip.png -
A
public/tutorial/infinite_campus/ic_new_custom_tab.png -
A
public/tutorial/infinite_campus/ic_remote2.png -
A
public/tutorial/infinite_campus/ic_remote_1.png -
A
public/tutorial/infinite_campus/ic_review_readme.png -
A
public/tutorial/infinite_campus/ic_run_csvdump.bat.png -
A
public/tutorial/infinite_campus/ic_tab_1.png -
A
public/tutorial/infinite_campus/ic_unzip.png -
A
public/tutorial/infinite_campus/ic_zip_import.png -
M
app/helpers/application_helper.rb -
M
app/models/notifications.rb -
M
app/models/team_referrals.rb -
M
features/step_definitions/email_steps.rb -
M
lib/mailer_with_subdomains.rb -
M
public/tutorial/infinite_campus/index.htm -
M
vendor/plugins/railmail2/app/helpers/railmail_helper.rb