Permalink
Commits on Jun 16, 2011
  1. @chrismear

    Allow for customised templates based on current organisation's class.

    Adds a new ActionView resolver, OrganisationResolver, which looks for a
    template in a subdirectory named after the current organisation's class, in
    preference to the default template in the default location.
    chrismear committed May 24, 2011
  2. @chrismear
  3. @chrismear
Commits on Jun 8, 2011
  1. @jberkel

    Fix spec

    jberkel committed Jun 8, 2011
  2. @jberkel

    WS

    jberkel committed Jun 8, 2011
Commits on May 30, 2011
  1. @chrismear

    Merge branch 'refactoring'

    Conflicts:
    	app/controllers/application_controller.rb
    	app/controllers/members_controller.rb
    	app/controllers/proposals_controller.rb
    	app/controllers/votes_controller.rb
    	app/controllers/welcome_controller.rb
    chrismear committed May 30, 2011
  2. @chrismear
  3. @chrismear
Commits on May 29, 2011
  1. @chrismear
  2. @chrismear

    Fix app RDoc generation under Ruby 1.8.

    Requiring ruby-debug at Bundler setup time was causing an
    
      uninitialized constant RubyToken::AlreadyDefinedToken
    
    error in the doc:app Rake task. Until we find a better fix for this, you will
    need to enable the debugger explicitly by passing the `--debugger` option to
    `rails server` or `rails console` under 1.8.
    chrismear committed May 24, 2011
  3. @chrismear

    Version 1.1.1.

    chrismear committed May 29, 2011
  4. @chrismear

    Fix typo.

    chrismear committed May 29, 2011
Commits on May 28, 2011
  1. @chrismear
  2. @chrismear

    Add a Rake task to create a dummy organisation, for dev purposes.

    Closes #298.
    
    This is a new version of similar Rake tasks we used to have until
    bdc1034, where they were removed due to being
    out of date.
    chrismear committed May 28, 2011
  3. @chrismear

    Fix Organisation#host returning wrong host in single organisation mode.

    Closes #300.
    
    The code assumed that the single organisation in single organisation mode
    would not have a subdomain set. However, OrganisationsController#create always
    sets the subdomain attribute. We now explicitly check the
    single_organisation_mode setting instead.
    chrismear committed May 28, 2011
Commits on May 23, 2011
  1. @chrismear
  2. @chrismear

    Notes and tidying.

    chrismear committed May 23, 2011
  3. @chrismear
  4. @chrismear
  5. @chrismear
  6. @chrismear
  7. @chrismear
  8. @chrismear

    Add state_machine gem.

    chrismear committed May 19, 2011
  9. @chrismear
  10. @chrismear

    More accurate method names and more Machinist usage in spec helpers.

    'stubs.rb' contained several helpers that claimed to be stubbing things,
    when in fact they were just creating real model objects.
    
    Now the file is 'helpers.rb', and method names avoid using 'stub'.
    
    Machinist factories are now used rather than making objects by hand where
    possible.
    chrismear committed May 17, 2011
  11. @chrismear
  12. @chrismear
  13. @chrismear

    Finish removal of Proposal direct edit functionality in favour of exp…

    …licit controller actions.
    chrismear committed May 15, 2011
  14. @chrismear
  15. @chrismear
  16. @chrismear
  17. @chrismear

    Rename Member#can_vote? to Member#eligible_to_vote?.

    Reduces confusion with controller/view #can? method provided by CanCan, and
    emphasies that we are checking business logic requirements, not checking
    basic permissions.
    chrismear committed May 14, 2011
  18. @chrismear

    Use CanCan for authorization at controller and view level.

    This consolidates checks against member_class permissions and checks against current organisation state
    into one place. The controller or view just asks whether the user is able to create/read/update/delete
    a particular resource.
    chrismear committed May 5, 2011
  19. @chrismear
  20. @chrismear