Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Content deletion - initial merge to master #479

Merged
merged 111 commits into from Aug 20, 2012
Merged

Content deletion - initial merge to master #479

merged 111 commits into from Aug 20, 2012

Commits on Jul 19, 2012

  1. Added action type to changeset to accomadate content deletion

    Added initial bindings to changeset. We may decide to go with the inheritance model
    soon, depending on the variations in the backend code.
    parthaa committed Jul 19, 2012
    Configuration menu
    Copy the full SHA
    dd76693 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c4e941e View commit details
    Browse the repository at this point in the history
  3. Forgot to undo one part

    parthaa committed Jul 19, 2012
    Configuration menu
    Copy the full SHA
    09cd3d2 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #337 from parthaa/init-content-deletion-model

    content-deletion - Added action type to  changeset to accomadate content deletion
    bbuckingham committed Jul 19, 2012
    Configuration menu
    Copy the full SHA
    ae0df9e View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2012

  1. content-deletion - update ui to support defining an action type on ch…

    …angeset
    
    This commit contains the changes to allow user to define the changeset as
    either a deletion or promotion changeset.
    bbuckingham committed Jul 20, 2012
    Configuration menu
    Copy the full SHA
    0ef2a89 View commit details
    Browse the repository at this point in the history
  2. content-deletion - remove 'promotion' from several display text items

    Updating several of the i18n strings to remove the word 'promotion'
    since the changeset will be used to support both promotion and deletion.
    
    As we add in the deletion capability and test, we'll make the distinctions
    in the text, where appropriate.
    bbuckingham committed Jul 20, 2012
    Configuration menu
    Copy the full SHA
    a304694 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2012

  1. promotions - fix bugs with removing packages from a changeset

    While working on a feature, found that a couple of bugs in being
    able to delete packages from a changeset via the changeset sliding
    tree.
    bbuckingham committed Jul 23, 2012
    Configuration menu
    Copy the full SHA
    70ada4a View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2012

  1. promotions - bug - promoted repo can be promoted over and over

    Once a repo has been promoted to the next environment, it should show
    as 'promoted' in the UI and the user should not be adding it
    to another changeset to promote again.  (I.e. once the repo is promoted,
    the user would promote the pkgs and errata for promotion).  (This is
    based upon feedback from the original developer).
    
    Without this commit, the user can promote the same repo over and
    over, even if it has already been promoted.   This appears to
    be a regression introduced when we added the repository model
    to the katello AR.
    bbuckingham committed Jul 24, 2012
    Configuration menu
    Copy the full SHA
    2a5f732 View commit details
    Browse the repository at this point in the history
  2. content-deletion - initial ui chgs for add/remove to deletion changeset

    This commit contains the initial changes needed to allow a user
    to add/remove objects to deletion changeset.  Object in this
    context include: products, system templates, repositories,
    packages, errata and distributions.
    
    In the case of a deletion changeset, the user should be able to add/remove
    anything that is in the current environment.
    
    In the case of a promotion changeset, the user should only
    be able to add content based upon the previous established rules
    (e.g. product promoted to next env, object not already promoted...etc)
    bbuckingham committed Jul 24, 2012
    Configuration menu
    Copy the full SHA
    e1f562d View commit details
    Browse the repository at this point in the history
  3. content-deletion - show cs type on promotions cs edit details pane

    When user views the details for a changeset on the promotions
    page, they should see that it is either for deletion or promotion.
    
    At this time, user cannot edit the changeset type, since doing
    so could completely invalidate some of the content in the changeset.
    bbuckingham committed Jul 24, 2012
    Configuration menu
    Copy the full SHA
    fec8354 View commit details
    Browse the repository at this point in the history
  4. content-deletion - changeset history - show changeset type

    When viewing a changeset from the changeset history, include the
    type as part of the information displayed.
    bbuckingham committed Jul 24, 2012
    Configuration menu
    Copy the full SHA
    89742bf View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2012

  1. Merge pull request #363 from bbuckingham/fork-content-deletion

    content-deletion - a few UI commits
    parthaa committed Jul 25, 2012
    Configuration menu
    Copy the full SHA
    f1cd155 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fbe7209 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #366 from bbuckingham/fork-content-deletion

    content-deletion - fix broken spec
    parthaa committed Jul 25, 2012
    Configuration menu
    Copy the full SHA
    227d2c4 View commit details
    Browse the repository at this point in the history
  4. content-deletion - associate proper env with changeset upon creation

    When a changeset is created, it is associated with an environment.
    This commit will associate the changeset with the proper environment
    based upon the type of changeset.
    
    In the case of a deletion changeset, it needs to be associated with
    the current environment (e.g. dev, if in dev env).
    
    In the case of a promotion changeset, it needs to be associated with
    the next environment where the content is being promoted to
    (e.g. if in dev and next env is test, it would be set to test).
    bbuckingham committed Jul 25, 2012
    Configuration menu
    Copy the full SHA
    93af58c View commit details
    Browse the repository at this point in the history
  5. content-deletion - fix specs broken on previous commit

    In the previous commit, we updated the logic to associate
    proper environment with the changeset based upon the
    changeset action (promotion/deletion); however, the
    specs needed some updates to account for this change.
    bbuckingham committed Jul 25, 2012
    Configuration menu
    Copy the full SHA
    17103e0 View commit details
    Browse the repository at this point in the history
  6. content-deletion - only allow promotion changesets when in Library

    When the user is in the Library, only allow for changesets of
    type 'promotion'.  Do not allow for 'deletion' changesets.
    bbuckingham committed Jul 25, 2012
    Configuration menu
    Copy the full SHA
    8046155 View commit details
    Browse the repository at this point in the history
  7. content-deletion - update navigation for changesets

    With content-deletion, we are adding the ability to support both
    promotions and deletions of content.  The current navigation is
    worded such that it indicates support of only promotions.
    
    Based on feedback/discussion on mailing list, updating the navigation
    from:
    
      Content -> Changeset Promotions -> Promotions
                                      -> Changeset Promotion History
    
    to:
    
      Content -> Changset Management -> Changesets
                                     -> Changesets History
    bbuckingham committed Jul 25, 2012
    Configuration menu
    Copy the full SHA
    12ec614 View commit details
    Browse the repository at this point in the history
  8. content-deletion - set the ui action button to promote/delete based o…

    …n cs type
    
    This small commit updates the 'play' button text to set it to delete or
    promote based upon the type of changeset that is currently open.
    bbuckingham committed Jul 25, 2012
    Configuration menu
    Copy the full SHA
    0a7a7ee View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2012

  1. content deletion - adding CLI actions

    Mike McCune committed Jul 26, 2012
    Configuration menu
    Copy the full SHA
    3a3086b View commit details
    Browse the repository at this point in the history
  2. content deletion - removing hard coded type

    Mike McCune committed Jul 26, 2012
    Configuration menu
    Copy the full SHA
    f3aaa54 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #370 from mccun934/content-deletion

    Content deletion
    mccun934 committed Jul 26, 2012
    Configuration menu
    Copy the full SHA
    6dd8a50 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #367 from bbuckingham/fork-content-deletion

    content deletion - few more UI commits
    parthaa committed Jul 26, 2012
    Configuration menu
    Copy the full SHA
    5aa305c View commit details
    Browse the repository at this point in the history
  5. Adding a new changeset model for Content Deletion

    Moving to an inheritance model where changeset class is now
    split as PromotionChangeset and DeletionChangeset.
    A 'type' column was added to changests table instead of the action_type
    so that the rails model works naturally
    parthaa committed Jul 26, 2012
    Configuration menu
    Copy the full SHA
    e060ef5 View commit details
    Browse the repository at this point in the history
  6. fixed a typo

    parthaa committed Jul 26, 2012
    Configuration menu
    Copy the full SHA
    ef93a8a View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2012

  1. Fixed some unit tests.

    parthaa committed Jul 27, 2012
    Configuration menu
    Copy the full SHA
    081a79a View commit details
    Browse the repository at this point in the history
  2. Merge pull request #373 from parthaa/real-content-delete-model

    Changeset refactor
    mccun934 committed Jul 27, 2012
    Configuration menu
    Copy the full SHA
    d8164f3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c8dd3a0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0b8f0af View commit details
    Browse the repository at this point in the history
  5. content-deletion - fix promotion... accidental regression for env han…

    …dling
    
    This commit fixes a bug that I introduced :( when adding support
    for content deletion.
    bbuckingham committed Jul 27, 2012
    Configuration menu
    Copy the full SHA
    34bc2a9 View commit details
    Browse the repository at this point in the history
  6. Fixed a compile glitch

    parthaa committed Jul 27, 2012
    Configuration menu
    Copy the full SHA
    b4b497d View commit details
    Browse the repository at this point in the history
  7. Added the deleting state

    parthaa committed Jul 27, 2012
    Configuration menu
    Copy the full SHA
    2f308d0 View commit details
    Browse the repository at this point in the history
  8. content-deletion - first mods to integrate js w/ controller (apply/st…

    …atus)
    
    This is the initial integration commit between the javascript and controller
    to support deletion changesets.  The old 'promote' action is now
    'apply' supporting both promotion and deletion.  The old 'promotion_progress'
    action is now 'status', to be consistent with other controllers.
    bbuckingham committed Jul 27, 2012
    Configuration menu
    Copy the full SHA
    fbc62af View commit details
    Browse the repository at this point in the history
  9. content-deletion - skip dependency resolution for deletion changesets

    This is a small commit that will bypass checking for dependencies
    when a deletion changeset is to be applied.  For now, we will
    allow the request to be made, but skip the check.  In the future,
    the plan is to perform such checks.
    bbuckingham committed Jul 27, 2012
    Configuration menu
    Copy the full SHA
    cad2565 View commit details
    Browse the repository at this point in the history
  10. content-deletion - update how changesets are listed when page loaded

    When the user goes to the Changesets page for a given environment,
    we need to list any working deletion changes for that environment
    and any promotion changesets for the next environment.
    
    Previously, we'd always show 'all' working changesets that
    are in the next environment; however, that does not work properly
    for deletion changesets.
    bbuckingham committed Jul 27, 2012
    Configuration menu
    Copy the full SHA
    3089259 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #382 from bbuckingham/fork-content-deletion

    content-deletion - a few random commits for UI
    parthaa committed Jul 27, 2012
    Configuration menu
    Copy the full SHA
    791e778 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    f801e41 View commit details
    Browse the repository at this point in the history
  13. Made the deletion changeset more bare bones . Trying to just get pack…

    …age delete workign at this point
    parthaa committed Jul 27, 2012
    Configuration menu
    Copy the full SHA
    58e75bd View commit details
    Browse the repository at this point in the history
  14. Merge pull request #383 from mccun934/content-deletion

    content deletion - adding back in the CLI promote and apply
    parthaa committed Jul 27, 2012
    Configuration menu
    Copy the full SHA
    50ac570 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    f228097 View commit details
    Browse the repository at this point in the history
  16. Merge pull request #384 from parthaa/package-changes1

    Package delete changes
    mccun934 committed Jul 27, 2012
    Configuration menu
    Copy the full SHA
    af09f05 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2012

  1. Configuration menu
    Copy the full SHA
    e852d8e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c61d421 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cd5471a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a61eff9 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #385 from parthaa/package-deux

    Package  Delete via changeset
    bbuckingham committed Jul 28, 2012
    Configuration menu
    Copy the full SHA
    94e6726 View commit details
    Browse the repository at this point in the history
  6. content-deletion - add backend support for deleting errata

    This commit contains changes needed to process deletion
    of errata that are in a deletion changeset.
    bbuckingham committed Jul 28, 2012
    Configuration menu
    Copy the full SHA
    dd2792d View commit details
    Browse the repository at this point in the history
  7. content-deletion - add backend support for deleting distributions

    This commit contains changes needed to process deletion
    of distros that are in a deletion changeset.
    bbuckingham committed Jul 28, 2012
    Configuration menu
    Copy the full SHA
    5ba5c97 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #386 from bbuckingham/fork-content-deletion

    content-deletion - add backend support for ...
    parthaa committed Jul 28, 2012
    Configuration menu
    Copy the full SHA
    c76a64d View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2012

  1. content-deletion - add backend support for deleting repos

    This commit contains changes needed to process deletion
    of repos that are in a deletion changeset.
    bbuckingham committed Jul 29, 2012
    Configuration menu
    Copy the full SHA
    0646dd3 View commit details
    Browse the repository at this point in the history
  2. content-deletion - update cs create to default to promotion

    When we refactored the changeset in to multiple classes, changeset
    creation no longer defaulted to 'promotion'.  This commit addresses
    that.
    bbuckingham committed Jul 29, 2012
    Configuration menu
    Copy the full SHA
    77c93b0 View commit details
    Browse the repository at this point in the history
  3. content-deletion - change cs promote status text to apply (to be gene…

    …ric)
    
    Currently, when a changeset is processed, there is status text indicating
    (promoting, promotion failed, promoted...); however, this text does
    not make sense for a deletion changeset.  Changing the text to be
    'applying', 'apply failed' and 'applied' in order to be generic.
    
    We may want to reword this later, however, we may not need to once the UI
    better reflects the changeset type.
    bbuckingham committed Jul 29, 2012
    Configuration menu
    Copy the full SHA
    1bab3be View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    64576a8 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f64c056 View commit details
    Browse the repository at this point in the history
  6. content-deletion - minor changes to changeset history

    This commit contains a couple of minor changes for the changeset history page:
    1. support listing the 'deleted' changesets
    2. support searching based on "type:promotion" and "type:deletion". Without
       this particular change, the user would have to search using
       PromotionChangeset and DeletionChangeset
    bbuckingham committed Jul 29, 2012
    Configuration menu
    Copy the full SHA
    8027215 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #387 from bbuckingham/fork-content-deletion

    content-deletion - add backend support for ...
    mccun934 committed Jul 29, 2012
    Configuration menu
    Copy the full SHA
    e10b443 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2012

  1. content deletion - proper deletion support in the CLI

    also a to_json method on changeset to propery output type
    Mike McCune committed Jul 30, 2012
    Configuration menu
    Copy the full SHA
    340a0a2 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2012

  1. Merge pull request #402 from mccun934/content-deletion

    content deletion - proper deletion support in the CLI
    xsuchy committed Jul 31, 2012
    Configuration menu
    Copy the full SHA
    5712c68 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2012

  1. Fixed some merge conflicts

    parthaa committed Aug 2, 2012
    Configuration menu
    Copy the full SHA
    abeda25 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #422 from parthaa/master-content-delete-merge

    Master content delete merge
    bbuckingham committed Aug 2, 2012
    Configuration menu
    Copy the full SHA
    7a0a8d1 View commit details
    Browse the repository at this point in the history
  3. content-deletion - updates to handle last env in path

    This commit contains some minor changes to be able to handle
    deletion changesets within the last environment of the environment
    path.  Since previously only promotions were supported, the
    'New Changeset' link, changeset sliding tree and changeset actions
    were not applicable; however, now we need them.
    
    This commit contains some minor changes to also begin to introduce
    a permission check for deletion changesets.  The behavior of
    this will be altered as we update the permission model and introduce
    the UI changes based on UXD input; however, this gets the current
    functionality working in that last environment.
    bbuckingham committed Aug 2, 2012
    Configuration menu
    Copy the full SHA
    530e8d4 View commit details
    Browse the repository at this point in the history
  4. content-deletion - update repo deletion to disable or remove based on…

    … env
    
    This commit changes the behavior of repo deletion (via content deletion)
    to support the following:
    
    1. If the repo being deleted is in the last environment of the environment
       path (e.g. in Test when path is Libary->Dev->Test), delete it
    
    2. If the repo being deleted is in the middle of the environment path
       (e.g. in Dev when path is Library->Dev->Test), disable and unpublish
       the repo.  This leaves the repo, but makes it appear to be gone
       from the user perspective.  Also, if the repo is repromoted,
       it will be enabled and published, making it available again.
    bbuckingham committed Aug 2, 2012
    Configuration menu
    Copy the full SHA
    b62a512 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    98eaedc View commit details
    Browse the repository at this point in the history
  6. Merge pull request #425 from parthaa/master-content-delete-merge

    Updating the converge-ui version
    bbuckingham committed Aug 2, 2012
    Configuration menu
    Copy the full SHA
    e106a09 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    2d83955 View commit details
    Browse the repository at this point in the history
  8. Merge remote-tracking branch 'upstream/content-deletion' into content…

    …-deletion
    Mike McCune committed Aug 2, 2012
    Configuration menu
    Copy the full SHA
    0953ee6 View commit details
    Browse the repository at this point in the history
  9. update converge ui

    Mike McCune committed Aug 2, 2012
    Configuration menu
    Copy the full SHA
    94f166a View commit details
    Browse the repository at this point in the history
  10. Revert "update converge ui"

    This reverts commit 94f166a.
    Mike McCune committed Aug 2, 2012
    Configuration menu
    Copy the full SHA
    20226e2 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2012

  1. Merge pull request #426 from mccun934/content-deletion

    Content deletion
    bbuckingham committed Aug 3, 2012
    Configuration menu
    Copy the full SHA
    fe86627 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #424 from bbuckingham/fork-content-deletion-3

    content-deletion - fixes for handling deletion of repos... and deletion of content from last env
    parthaa committed Aug 3, 2012
    Configuration menu
    Copy the full SHA
    0a471bf View commit details
    Browse the repository at this point in the history
  3. Speeded up package deletion and promotion by using a differnt call in…

    … pulp
    
    (cherry picked from commit a68b8ca4d78f17ef3cf24429cb1108071717245b)
    parthaa committed Aug 3, 2012
    Configuration menu
    Copy the full SHA
    1c32b78 View commit details
    Browse the repository at this point in the history
  4. content-deletion - add a promotion/deletion banner to the changeset tree

    This is an initial commit to add a banner to the changeset sliding
    tree to allow a user to view either promotion or deletion changesets...
    bbuckingham committed Aug 3, 2012
    Configuration menu
    Copy the full SHA
    d559ecb View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2012

  1. Moved the add+remove repo packages method to orchestration layer

    This was suggested in the pull request
    parthaa committed Aug 6, 2012
    Configuration menu
    Copy the full SHA
    5f3de4c View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2012

  1. Configuration menu
    Copy the full SHA
    15a844b View commit details
    Browse the repository at this point in the history
  2. Merge pull request #432 from parthaa/speedier-package-delete

    Speeded up package deletion and promotion
    mccun934 committed Aug 7, 2012
    Configuration menu
    Copy the full SHA
    84eb51d View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2012

  1. Configuration menu
    Copy the full SHA
    0dc43a7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    18ed8a2 View commit details
    Browse the repository at this point in the history
  3. Fixed more spec tests

    parthaa committed Aug 8, 2012
    Configuration menu
    Copy the full SHA
    e352940 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #451 from parthaa/merge-unit-test-fixes

    unit test fixes
    mccun934 committed Aug 8, 2012
    Configuration menu
    Copy the full SHA
    0e42bfc View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2012

  1. content-deletion - initial chgs to support 2 changeset trees (deletio…

    …n/promotion)
    
    This is an initial commit to provide changes to support the appearance
    of 2 separate sliding trees for promotion and deletion changesets.
    
    There is more work to be done to get this to work when applying the
    changesets...etc.
    bbuckingham committed Aug 13, 2012
    Configuration menu
    Copy the full SHA
    51cceef View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5f7762e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1f69053 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5de99c7 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2012

  1. content-deletion - load changeset sliding tree based on changeset hash

    If the user accesses the changesets page with a changeset hash
    (e.g. "#changeset=changeset_10") and that changeset is a
    deletion changeset, load the page with the deletion changeset
    sliding tree selected; otherwise, use the default behavior which
    is to load the page with the promotion changeset sliding tree
    selected.
    bbuckingham committed Aug 14, 2012
    Configuration menu
    Copy the full SHA
    f74d101 View commit details
    Browse the repository at this point in the history
  2. content-deletion - remove the changeset type from the sliding tree li…

    …sting
    
    Previously we had a single list consisting of all changesets.  In
    that listing, we included some text to indicate the type for each
    changeset (i.e. deletion/promotion).  Since we are now creating 2
    separate lists, that type is no longer necessary; therefore, removing it.
    bbuckingham committed Aug 14, 2012
    Configuration menu
    Copy the full SHA
    5079bd4 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #458 from parthaa/speedy-package-fix

    Quick fix to a bug introduced in the package deletion and promotion
    mccun934 committed Aug 14, 2012
    Configuration menu
    Copy the full SHA
    2accabc View commit details
    Browse the repository at this point in the history
  4. content-deletion - update the content tree to use 'Added (Undo)' vs '…

    …Remove'
    
    This commit contains changes so that when an item (e.g. product, pkg,
    errata...) is added to the changeset, the content tree includes
    "Added (Undo)" (where undo is a link) vs "Remove".  Although this
    affects the content tree (left side), it does not affect the changeset
    tree (right side), which will continue to use 'Remove'.
    
    This commit also contains a small fix to allow repos to be removed
    from a changeset after they have been added.  Previously there was
    a bug where the repo once added was not correctly detected by
    the changeset 'has_item' method.
    bbuckingham committed Aug 14, 2012
    Configuration menu
    Copy the full SHA
    b34536e View commit details
    Browse the repository at this point in the history
  5. content-deletion - update the content tree to use 'Added (Undo)' vs '…

    …Remove'
    
    This is a follow-up to the previous commit to address the changes needed
    to the system templates view.
    bbuckingham committed Aug 14, 2012
    Configuration menu
    Copy the full SHA
    907b522 View commit details
    Browse the repository at this point in the history
  6. content-deletion - add title attribute to the changeset action bar

    This commit adds the title attribute to the items in the
    changeset action bar (e.g. Remove, Edit Details, Review, Promote/Edit).
    For simplicity/efficiency, chose to use html title attribute for
    these vs creating a tipsy element.
    bbuckingham committed Aug 14, 2012
    Configuration menu
    Copy the full SHA
    b1cdc64 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2012

  1. content-deletion - add custom confirms for changeset deletion

    Update to have a custom confirm on changeset deletion, so user
    is aware of the type of changeset they are deleting.
    bbuckingham committed Aug 15, 2012
    Configuration menu
    Copy the full SHA
    cc3ee59 View commit details
    Browse the repository at this point in the history
  2. content-deletion - add a tipsy to the 'Added' item in content tree

    Added a tipsy to the 'Added' text in the content tree so that
    when user hovers, they see info like "Added to changeset XYZ".
    bbuckingham committed Aug 15, 2012
    Configuration menu
    Copy the full SHA
    ff4f2f9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    81c5d78 View commit details
    Browse the repository at this point in the history
  4. content-deletion - convert action titles to tipsy for consistency

    Added title attribute to changeset actions (e.g. Remove, Edit..etc);
    however, noticed that tipsy is used in this page quite a bit but
    title is not.  As a result, updated them to use tipsy for consistency.
    Also, added a 'tipsify' class so that we can have a single instantiation
    of tipsy for the tipsies added for the actions, the ones used for
    the "Added (Undo)" and others in the future.
    bbuckingham committed Aug 15, 2012
    Configuration menu
    Copy the full SHA
    7c56615 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e63b4b3 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2012

  1. Merge pull request #468 from bbuckingham/fork-content-deletion-3

    content-deletion - changes to UI based on mockups
    parthaa committed Aug 16, 2012
    Configuration menu
    Copy the full SHA
    fe7eadd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3710ad1 View commit details
    Browse the repository at this point in the history
  3. changesets - fix notice type on successful promotion/deletion

    This commit addresses the issue where the notices generated
    for a successful promotion or deletion changeset was a
    'sticky message'.
    bbuckingham committed Aug 16, 2012
    Configuration menu
    Copy the full SHA
    ea18172 View commit details
    Browse the repository at this point in the history
  4. content-deletion - fix issue w/ deletion tree not loading on last env

    This commit contains a small fix to address an issue where if
    the user goes to the 'last' environment, they do not see the
    any deletion changesets listed on page load.
    bbuckingham committed Aug 16, 2012
    Configuration menu
    Copy the full SHA
    acea01e View commit details
    Browse the repository at this point in the history
  5. Merge pull request #474 from bbuckingham/fork-content-deletion-3

    content-deletion - 2 small fixes
    mccun934 committed Aug 16, 2012
    Configuration menu
    Copy the full SHA
    e324921 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2012

  1. Configuration menu
    Copy the full SHA
    cdb1707 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #473 from parthaa/delete-sys-templates

    Added system template deletion feature
    mccun934 committed Aug 17, 2012
    Configuration menu
    Copy the full SHA
    8453ec1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    af313dd View commit details
    Browse the repository at this point in the history
  4. Merge pull request #477 from parthaa/delete-sys-templates

    System Template Content Deletion fixes
    bbuckingham committed Aug 17, 2012
    Configuration menu
    Copy the full SHA
    f8ebab6 View commit details
    Browse the repository at this point in the history
  5. content deletion - adding support for product deletion

    Mike McCune committed Aug 17, 2012
    Configuration menu
    Copy the full SHA
    98cb0b5 View commit details
    Browse the repository at this point in the history
  6. content deletion - adding support for product deletion

    Mike McCune committed Aug 17, 2012
    Configuration menu
    Copy the full SHA
    ac86f5b View commit details
    Browse the repository at this point in the history
  7. Merge branch 'content-deletion' of github.com:mccun934/katello into c…

    …ontent-deletion
    
    Conflicts:
    	src/app/models/deletion_changeset.rb
    Mike McCune committed Aug 17, 2012
    Configuration menu
    Copy the full SHA
    7f232b4 View commit details
    Browse the repository at this point in the history
  8. content deletion - putting commented code back in

    Mike McCune committed Aug 17, 2012
    Configuration menu
    Copy the full SHA
    b6acb66 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #478 from mccun934/content-deletion

    Content deletion - add support for product delete
    bbuckingham committed Aug 17, 2012
    Configuration menu
    Copy the full SHA
    71715ae View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2012

  1. Merge remote-tracking branch 'upstream/master' into content-deletion

    Conflicts:
    	src/app/controllers/api/changesets_controller.rb
    	src/app/controllers/changesets_controller.rb
    	src/app/views/changesets/_new.html.haml
    	src/spec/controllers/changeset_controller_spec.rb
    bbuckingham committed Aug 18, 2012
    Configuration menu
    Copy the full SHA
    7665054 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3878e0c View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2012

  1. Merge remote-tracking branch 'upstream/master' into content-deletion

    Conflicts:
    	src/app/models/changeset.rb
    	src/spec/models/changeset_spec.rb
    bbuckingham committed Aug 20, 2012
    Configuration menu
    Copy the full SHA
    c8bccce View commit details
    Browse the repository at this point in the history