Permalink
Commits on Sep 9, 2011
Commits on Sep 8, 2011
  1. 735747 - fixing issue where creating a permission with create verb wo…

    …uld result in an error
    jlsherrill committed Sep 8, 2011
  2. Changes from using controller_name (a pre-defined rails function) to

    using controller_display_name for use in setting model object ids in
    views.
    ehelms committed Sep 8, 2011
  3. Merge branch 'master' into thin

    Conflicts:
    	src/app/views/layouts/_footer.haml
    	src/public/javascripts/role_sliding_tree.js
    	src/public/javascripts/system_packages.js
    mccun934 committed Sep 8, 2011
  4. updated hudson_rsa.pub ssh key

    Dmitri Dolguikh committed Sep 8, 2011
  5. Merge branch 'oauth_provider'

    Dmitri Dolguikh committed Sep 8, 2011
Commits on Sep 7, 2011
  1. moving new thin and httpd conf files to match existing config locations

    Also updated the /extras/ directory to be called /deploy/ to indicate
    to our developers that the files in that directory are used for
    deployment and are not actually an 'extra' that is optional.
    mccun934 committed Sep 7, 2011
  2. 734196 - Disabled add and remove buttons in roles sliding tree after

    they have been clicked to prevent multiple server calls.
    ehelms committed Sep 7, 2011