Permalink
Commits on Feb 9, 2012
  1. Merge commit 'katello-headpin-0.1.132-1' into BRANDING

    Conflicts:
    	headpin/katello-headpin/katello-headpin.spec
    	rel-eng/packages/katello-headpin
    Jordan OMara committed Feb 9, 2012
  2. gen_changes

    Jordan OMara committed Feb 9, 2012
  3. Screwed up a merge; broke headpin dashboard. Fixed.

    Jordan OMara committed Feb 9, 2012
Commits on Feb 8, 2012
  1. Merge branch 'master' into headpin

    Conflicts:
    	src/app/models/kt_environment.rb
    	src/app/views/dashboard/index.html.haml
    Jordan OMara committed Feb 8, 2012
  2. Moving /etc/katello/katello.yml to katello-common

    Jordan OMara committed Feb 8, 2012
  3. Refactoring build process for headpin

    It now rebuilds the entire app on top of the katello source instead of copying
    files over. This allows us to build custom css for headpin as well as keeps our RPM
    installations clean and rpm -V happy
    Jordan OMara committed Feb 8, 2012
Commits on Feb 7, 2012
  1. activation keys - remove 'allocated' from model and code

    This commit removes 'allocated' from the key_pools.  In the initial
    implementation for activation keys, we allowed the user to assign
    a quantity (allocation) of a given subscription to the key.  After
    discussion, we decided to revamp it to no longer associate quantity
    and instead have the keys used with 'auto-subscribe'. This approach
    eliminated the need to have several different keys to meet the needs
    of consumers (e.g. 2 socket, 4 socket...etc).
    bbuckingham committed Feb 7, 2012
  2. 788149 - activation keys - fix format_time error

    Added format_time to the application controller for access from
    controllers.  The alternative would be to expose the application helper
    within the controllers; however, noticed that we have explicitly
    set 'clear_helpers' on the application controller, so chose not to go
    that path.
    bbuckingham committed Feb 7, 2012
  3. 788228 - increasing to 16MB limit for file uploads

    Previous limit of 256k was far to small for manifest uploads
    mccun934 committed Feb 7, 2012
  4. 768254 - fix cli unit tests

    iNecas committed Feb 7, 2012