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.

Sign up for GitHub

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

Jump to bottom

Policies do not merge #39

Merged
merged 45 commits into from
Nov 18, 2015
Merged

Policies do not merge #39

merged 45 commits into from
Nov 18, 2015

Commits on Oct 19, 2015

  1. Added new test

    @iPablo
    iPablo committed Oct 19, 2015
    Configuration menu
    Copy the full SHA
    d1113ac View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development' of https://github.com/Emergya/gecoscc-ui i… 

    …nto policies-do-not-merge
    @iPablo
    iPablo committed Oct 19, 2015
    Configuration menu
    Copy the full SHA
    a14c4d9 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2015

  1. Changes in cookbook and command for new improvements

    @iPablo
    iPablo committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    7b256f2 View commit details
    Browse the repository at this point in the history

  2. Rename variables name

    @iPablo
    iPablo committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    2323523 View commit details
    Browse the repository at this point in the history

  3. Improvements in testcookbook

    @iPablo
    iPablo committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    7df97da View commit details
    Browse the repository at this point in the history

  4. Add new tests and improvements

    @iPablo
    iPablo committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    c60a3ff View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2015

  1. Add first version to merge ous and groups polciies

    @iPablo
    iPablo committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    74b1c67 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2015

  1. Policies mergeables with user and groups

    @iPablo
    iPablo committed Oct 28, 2015
    Configuration menu
    Copy the full SHA
    3d85a3f View commit details
    Browse the repository at this point in the history

  2. Improve Tests

    @iPablo
    iPablo committed Oct 28, 2015
    Configuration menu
    Copy the full SHA
    c8097f0 View commit details
    Browse the repository at this point in the history

  3. Improve tests

    @iPablo
    iPablo committed Oct 28, 2015
    Configuration menu
    Copy the full SHA
    bed1f6e View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2015

  1. Mergeables object related policies

    @iPablo
    iPablo committed Oct 29, 2015
    Configuration menu
    Copy the full SHA
    bb9b896 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2015

  1. Software profiles now merged

    @iPablo
    iPablo committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    578a8a6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'remove-emiter-policies' into policies-do-not-merge

    @iPablo
    iPablo committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    a87078c View commit details
    Browse the repository at this point in the history

  3. Improve code

    @iPablo
    iPablo committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    6994c67 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2015

  1. Refactor code

    @iPablo
    iPablo committed Nov 5, 2015
    Configuration menu
    Copy the full SHA
    44be1c8 View commit details
    Browse the repository at this point in the history

  2. Add new tests and improve tests

    @iPablo
    iPablo committed Nov 5, 2015
    Configuration menu
    Copy the full SHA
    45fdf85 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'software-profile-out-of-scope' into policies-do-not-merge

    @iPablo
    iPablo committed Nov 5, 2015
    Configuration menu
    Copy the full SHA
    3850a4f View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2015

  1. Modified policies importer policies

    @iPablo
    iPablo committed Nov 9, 2015
    Configuration menu
    Copy the full SHA
    147cad0 View commit details
    Browse the repository at this point in the history

  2. Added merge/unmerge policy icon

    @albluqmun
    albluqmun committed Nov 9, 2015
    Configuration menu
    Copy the full SHA
    10f91ac View commit details
    Browse the repository at this point in the history

  3. Merge branch 'policies-do-not-merge' of github.com:Emergya/gecoscc-ui… 

    … into policies-do-not-merge
    @albluqmun
    albluqmun committed Nov 9, 2015
    Configuration menu
    Copy the full SHA
    47db612 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'policies-do-not-merge' of github.com:Emergya/gecoscc-ui… 

    … into policies-do-not-merge
    @albluqmun
    albluqmun committed Nov 9, 2015
    Configuration menu
    Copy the full SHA
    c1b2942 View commit details
    Browse the repository at this point in the history

  5. Code refactor

    @iPablo
    iPablo committed Nov 9, 2015
    Configuration menu
    Copy the full SHA
    69a2764 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'policies-do-not-merge' of https://github.com/Emergya/ge… 

    …coscc-ui into policies-do-not-merge
    @iPablo
    iPablo committed Nov 9, 2015
    Configuration menu
    Copy the full SHA
    aa75a38 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2015

  1. Code refactored

    @iPablo
    iPablo committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    6d78e91 View commit details
    Browse the repository at this point in the history

  2. Code refactored

    @iPablo
    iPablo committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    812e589 View commit details
    Browse the repository at this point in the history

  3. add field is_mergeable to policies in test_resources:cookbook

    @iPablo
    iPablo committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    e261010 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'policies-do-not-merge' of github.com:Emergya/gecoscc-ui… 

    … into policies-do-not-merge
    @albluqmun
    albluqmun committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    35b0d20 View commit details
    Browse the repository at this point in the history

  5. Added title for mergeable/unmergeable policies icons

    @albluqmun
    albluqmun committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    2929dda View commit details
    Browse the repository at this point in the history

  6. refactored and improved code

    @iPablo
    iPablo committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    e6986e0 View commit details
    Browse the repository at this point in the history

  7. Code improvements

    @iPablo
    iPablo committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    fbe1096 View commit details
    Browse the repository at this point in the history

  8. Changed icon unmergeable policy

    @albluqmun
    albluqmun committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    47c66b0 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2015

  1. Check if a policy has been updated when updated a node, if not, we do… 

    …nt show it in the box tasks
    @iPablo
    iPablo committed Nov 11, 2015
    Configuration menu
    Copy the full SHA
    d09a80d View commit details
    Browse the repository at this point in the history

  2. Removed unused code

    @iPablo
    iPablo committed Nov 11, 2015
    Configuration menu
    Copy the full SHA
    f70b053 View commit details
    Browse the repository at this point in the history

  3. Added new test

    @iPablo
    iPablo committed Nov 11, 2015
    Configuration menu
    Copy the full SHA
    1d69dad View commit details
    Browse the repository at this point in the history

  4. Improved code

    @iPablo
    iPablo committed Nov 11, 2015
    Configuration menu
    Copy the full SHA
    00452b8 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2015

  1. Improved code

    @iPablo
    iPablo committed Nov 12, 2015
    Configuration menu
    Copy the full SHA
    9a148ce View commit details
    Browse the repository at this point in the history

  2. Fixed html tags

    @albluqmun
    albluqmun committed Nov 12, 2015
    Configuration menu
    Copy the full SHA
    6d44576 View commit details
    Browse the repository at this point in the history

  3. Add i18n literals

    @albluqmun
    albluqmun committed Nov 12, 2015
    Configuration menu
    Copy the full SHA
    e82829a View commit details
    Browse the repository at this point in the history

  4. Added comments to the functions and improved code a bit

    @iPablo
    iPablo committed Nov 12, 2015
    Configuration menu
    Copy the full SHA
    a6a1e3b View commit details
    Browse the repository at this point in the history

  5. Added new test

    @iPablo
    iPablo committed Nov 12, 2015
    Configuration menu
    Copy the full SHA
    aec4555 View commit details
    Browse the repository at this point in the history

  6. Adding recalc nodes policies command

    @goinnn
    goinnn committed Nov 12, 2015
    Configuration menu
    Copy the full SHA
    4c1da9f View commit details
    Browse the repository at this point in the history

  7. Merge branch 'policies-do-not-merge' of github.com:Emergya/gecoscc-ui… 

    … into policies-do-not-merge
    @goinnn
    goinnn committed Nov 12, 2015
    Configuration menu
    Copy the full SHA
    2d5ae9d View commit details
    Browse the repository at this point in the history

  8. Updating the test_30_recalc_command_cert_policy

    @goinnn
    goinnn committed Nov 12, 2015
    Configuration menu
    Copy the full SHA
    652d449 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2015

  1. Added comments to the recalc_nodes_policies command

    @iPablo
    iPablo committed Nov 13, 2015
    Configuration menu
    Copy the full SHA
    3b88b6c View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2015

  1. Replace 'mergeable' and 'unmergeable' for 'Additive' and 'Overriding'

    @iPablo
    iPablo committed Nov 18, 2015
    Configuration menu
    Copy the full SHA
    434d77c View commit details
    Browse the repository at this point in the history