Permalink
Commits on Apr 24, 2012
  1. @pitr-ch
  2. @pitr-ch
  3. @tstrachota

    Merge pull request #22 from pitr-ch/add_default_org_and_environment_o…

    …f_user_to_cli
    
    Add default org and environment for user to cli
    tstrachota committed Apr 24, 2012
  4. @pitr-ch

    Merge branch 'master' into add_default_org_and_environment_of_user_to…

    …_cli
    
    * master: (8 commits)
      reverted katello.yml back to katello master version
      ...
    
    Conflicts:
    	src/app/controllers/users_controller.rb
    pitr-ch committed Apr 24, 2012
Commits on Apr 23, 2012
  1. @mccun934

    Merge pull request #27 from jsomara/headpin

    merging headpin branching logic into master.  makes katello and headpin play better together
    mccun934 committed Apr 23, 2012
  2. @jsomara

    Merge pull request #3 from thomasmckay/headpin2

    removed reference to headpin in client.conf and katello.yml
    jsomara committed Apr 23, 2012
  3. @thomasmckay
  4. @thomasmckay
  5. @ehelms

    Merge pull request #24 from pitr-ch/766647-duplicate_env_creation-bet…

    …ter_error_message_needed
    
    766647 - duplicate env creation - better error message needed
    ehelms committed Apr 23, 2012
  6. @bbuckingham

    Merge pull request #20 from ehelms/master

    Fix for issue with loading roles details due to javascript ordering from changes to having a single inline script tag.
    bbuckingham committed Apr 23, 2012
  7. @jsomara

    Merge pull request #1 from thomasmckay/headpin2

    Headpin2
    jsomara committed Apr 23, 2012
  8. @thomasmckay
  9. @thomasmckay

    fenced spec tests

    thomasmckay committed Apr 23, 2012
  10. Merging headpin flags into master

    Jordan OMara committed Apr 23, 2012
  11. @pitr-ch
  12. @pitr-ch

    cli - refactors long if into method

    adds method Action#require_at_least_one_of_options
    pitr-ch committed Apr 23, 2012
  13. @pitr-ch

    removes forgotten TODOs

    pitr-ch committed Apr 23, 2012
Commits on Apr 20, 2012
  1. @pitr-ch

    white-space formatting

    pitr-ch committed Apr 20, 2012
  2. @pitr-ch

    katello-cli, katello - setting default environment for user

    - add default {organization|environment} in user {info|list}
    - add default {organization|environment} options in user {create|update}
    - refaktors setting of default_environment, moved form controller into
      model
    pitr-ch committed Apr 20, 2012
  3. @mbacovsky

    Merge pull request #21 from iNecas/bz812263

    812263 - keep the original tomcat server.xml when resetting dbs
    mbacovsky committed Apr 20, 2012
  4. @iNecas

    812263 - keep the original tomcat server.xml when resetting dbs

    katello-reset-dbs calls cpsetup script which alters /etc/tomcat6/server.xml and
    sets another password to a keystore. Using the original file fixes the issue.
    iNecas committed Apr 20, 2012
  5. @ehelms

    Fixes issue on Roles page loading the edit panel where a javascript

    ordering problem caused the role details to not show properly.
    ehelms committed Apr 20, 2012
Commits on Apr 19, 2012
  1. @bbuckingham

    Merge pull request #19 from jlsherrill/bz813427

    813427 - do not delete repos from Red Hat Providers
    bbuckingham committed Apr 19, 2012
  2. @jlsherrill

    813427 - do not delete repos from Red Hat Providers

    since candlepin will reuse content objects globally
    across owners, we should not delete content from
    candlepin unless it is a custom provider
    jlsherrill committed Apr 19, 2012
  3. @tstrachota
  4. @pitr-ch

    Merge pull request #18 from tstrachota/printer_fix

    cli - fixed wrong formatters used for product and repo last sync time
    pitr-ch committed Apr 19, 2012
  5. @jlsherrill

    Merge pull request #17 from ehelms/master

    Fixes for missing CSRF meta.
    jlsherrill committed Apr 19, 2012
  6. @tstrachota
  7. @ehelms

    Fixes issue with CSRF meta tag being out of place and notifications not

    being in the proper script tag resulting from moving all inline
    javascript to a single script tag.
    ehelms committed Apr 19, 2012
  8. @tstrachota
  9. @mbacovsky

    Merge pull request #14 from lzap/httpd_restart

    814063 - unable to restart httpd
    
    now Katello returns proper warning (and even to rhsm) that katello-configure needs to be run first.
    mbacovsky committed Apr 19, 2012
  10. @lzap
  11. @lzap
  12. @iNecas
  13. @pitr-ch

    Merge pull request #15 from tstrachota/printer_fix

    cli - fix for printer regressions
    pitr-ch committed Apr 19, 2012