upgrade to ruby 2.0 and rails 4
commented out one un-needed route and fixed some new syntax shit in experiments_controller
sessions controller should not be under admin namespace, right?
added form_for [:admin, @user]  in views users new and sessions_path in views sessions new
trying to merge dev into upgrails4
added load member to mzid_files route
created mzid_files_controlle and spectrum_identification_protocol_controller. Added routes accordingly, also some little style-touch
added the geany project file, so project synchronizes in my other geanies
working on tables in the views for mzid_files/experiments and spectrum_identification_protocol/protocols controllers
created spectrum identification results controller, and added as a nested resource to experiments and also nested to protocols
fixed some admin namespace paths in admin/views, also deleted the sar_si_join table. NOw figure out how to save si before sar so I get the si_id
fixed some admin namespace paths in admin/views, also deleted the sar_si_join table. NOw figure out how to save si before sar so I get the si_id
moved spectra_files method from admin/sar controller to mzidfile model
mzid_files has_many spectrum_identifications. and spectrum_identifications has_many s_a_r_s. added mzid_file_id to spectrum_identifications
added has_many si_s to mzid_file, changed mzid_files view/index accordingly, commented out sar link in layout. Also added the migration file to add mzid_file_id to spectrum_identifications
run migration to remove mzid_file_id from spectra_acquisition_runs
adapted to rails 4 syntax in associations in models, also rails4 syntax in find_or_create_by. Also changed varchar to text in column value in  pdh
merged local and origin dev branches
adapting find_or_create_by syntax to rails 4 in mzid_2_db.rb
changed mass_delta data type to string (varchar(255)) in searched_modifications