Permalink
Commits on Oct 12, 2012
  1. got deploy sorted out.

    pol committed Oct 12, 2012
Commits on Oct 10, 2012
  1. Merge remote-tracking branch 'ffcrm/search-redesign'

    pol committed Oct 10, 2012
    Conflicts:
    	app/helpers/application_helper.rb
    	config/settings.default.yml
    	spec/views/campaigns/show.haml_spec.rb
Commits on Oct 8, 2012
  1. Merge remote-tracking branch 'ffcrm/master'

    pol committed Oct 8, 2012
    Conflicts:
    	Capfile
    	config/settings.default.yml
  2. Revert "added ruport gem"

    pol committed Oct 8, 2012
    This reverts commit 32ccc6a.
  3. Revert "added a student reports controller, views and added a tab for…

    pol committed Oct 8, 2012
    … it"
    
    This reverts commit 1807ce8.
Commits on Oct 6, 2012
Commits on Sep 25, 2012
Commits on Sep 22, 2012
Commits on Sep 21, 2012
  1. Added ability to remove 'id' from auto_complete results. Useful when …

    steveyken committed Sep 21, 2012
    …you want to exclude one particular object id in the current context.
Commits on Sep 20, 2012
Commits on Sep 17, 2012
  1. Get entities instance variable in partial - otherwise have to update …

    ndbroadbent committed Sep 17, 2012
    …all the specs with stubs :/
  2. Fixed campaign show spec, related to export - must define :id param i…

    ndbroadbent committed Sep 17, 2012
    …n order for url to be generated properly. This usually happens behind the scenes via Rails magic
  3. Removed last option specs

    ndbroadbent committed Sep 17, 2012
  4. Fixed index specs

    ndbroadbent committed Sep 17, 2012
  5. Removed options specs

    ndbroadbent committed Sep 17, 2012
  6. Fixed changing format for advanced search - rerun advanced search que…

    ndbroadbent committed Sep 17, 2012
    …ry after redraw finished