Permalink
Switch branches/tags
Nothing to show
Commits on Jun 26, 2012
  1. trying to push

    ac0415 committed Jun 26, 2012
  2. Installed simple form

    ac0415 committed Jun 26, 2012
Commits on Jun 18, 2012
  1. deleted temp files

    ac0415 committed Jun 18, 2012
  2. fixed merge conflicts

    ac0415 committed Jun 18, 2012
Commits on Jun 13, 2012
  1. Dunno what this is

    ac0415 committed Jun 13, 2012
Commits on Jun 1, 2012
  1. added is_draft attribute

    aronasorman committed Jun 1, 2012
  2. removed port forwarding

    aronasorman committed Jun 1, 2012
Commits on May 29, 2012
  1. reshowed student photo

    aronasorman committed May 29, 2012
Commits on May 22, 2012
  1. Merge branch 'master' of github.com:aronasorman/smoking-gun

    aronasorman committed May 22, 2012
    Conflicts:
    	Vagrantfile
  2. seed the database with only 1 section, the archived section

    aronasorman committed May 22, 2012
     On branch master
    	modified:   db/seeds.rb
  3. now generate only 16 periods for both development and test

    aronasorman committed May 22, 2012
     On branch master
    	modified:   app/models/period.rb
  4. added archiving, and now archives all students before getting new

    aronasorman committed May 22, 2012
    registrar info
     On branch master
    	modified:   app/controllers/csv_controller.rb
    	modified:   app/models/student.rb
  5. added rspec factories and a test for archiving

    vagrant committed with aronasorman May 22, 2012
    	modified:   Gemfile
    	modified:   Gemfile.lock
    	new file:   spec/factories/section.rb
    	new file:   spec/factories/student.rb
    	new file:   spec/factories/user.rb
    	new file:   spec/models/student.rb
    	new file:   spec/spec_helper.rb
Commits on May 21, 2012
  1. stuff

    aronasorman committed May 21, 2012
     On branch master
    	modified:   .gitignore
    	modified:   cookbooks/postgresql
  2. added imagemagick dependency for image handling (paperclip)

    aronasorman committed May 21, 2012
     On branch master
    	modified:   Vagrantfile
  3. added rspec dependency. Never too late to follow good practices!

    aronasorman committed May 21, 2012
     On branch master
    	modified:   Gemfile
    	modified:   Gemfile.lock
  4. placed reading of csv into its own thread

    aronasorman committed May 21, 2012
     On branch master
    	modified:   ../app/controllers/csv_controller.rb
Commits on May 18, 2012
  1. further tweaked vagrant setup

    aronasorman committed with vagrant May 18, 2012
     On branch master
    	modified:   Vagrantfile
    	deleted:    cookbooks/chef-rvm
  2. further tweaked vagrant setup

    aronasorman committed May 18, 2012
     On branch master
    	modified:   Vagrantfile
    	deleted:    cookbooks/chef-rvm
  3. removed temp files of gedit and ignore them on .gitignore

    aronasorman committed May 18, 2012
     On branch master
    	modified:   ../.gitignore
    	deleted:    views/layouts/application.html.erb~
    	deleted:    views/schedule_entries/edit.html.erb~
    	deleted:    views/sections/show.html.erb~
    	deleted:    views/students/_form.html.erb~
    	deleted:    views/students/edit.html.erb~
    	deleted:    views/students/index.html.erb~
    	deleted:    views/students/show.html.erb~
    	deleted:    views/users/index.html.erb~
    	deleted:    views/users/show.html.erb~
  4. added chef configuration for vm

    aronasorman committed May 18, 2012
     On branch master
    	modified:   Vagrantfile
    	new file:   cookbooks/build-essential
    	new file:   cookbooks/chef-rvm
    	new file:   cookbooks/git
    	new file:   cookbooks/postgresql
Commits on May 16, 2012
  1. changed columns of followup_interview to text

    ac0415 committed May 16, 2012
     On branch master
    	deleted:    db/migrate/20120508081029_remove_year_from_sections.rb
    	deleted:    db/migrate/20120510031137_change_picture_to_binary_students.rb
    	deleted:    db/migrate/20120513151806_change_username_to_integer_in_users.rb
    	new file:   db/migrate/20120516235026_change_comments_column_to_text_in_followup_interviews.rb
    	new file:   db/migrate/20120516235459_change_planned_intervention_column_to_text_in_followup_interviews.rb
    	modified:   db/schema.rb
  2. fixed links

    ac0415 committed May 16, 2012
  3. commented out photo showing for heroku

    aronasorman committed May 16, 2012
     On branch master
    	modified:   app/views/students/_general_info.html.erb
  4. commented out photo showing for heroku

    aronasorman committed May 16, 2012
     On branch master
    	modified:   app/views/students/_general_info.html.erb
  5. remove encryptable module

    aronasorman committed May 16, 2012
     On branch master
    	modified:   app/models/user.rb
  6. edited password edit in vain to make change password work. oh well.

    aronasorman committed May 16, 2012
     On branch master
    	modified:   app/views/devise/passwords/edit.html.erb