Skip to content

Commits

Permalink
master
Switch branches/tags

Name already in use

A tag already exists with the provided branch name. Many Git commands accept both tag and branch names, so creating this branch may cause unexpected behavior. Are you sure you want to create this branch?

Commits on Dec 14, 2018

  1. SHIBUI-1031: add rank to role

    @dima767
    dima767 committed Dec 14, 2018
    Copy the full SHA
    510ec55 View commit details

  2. Merge branch 'master' into feature/SHIBUI-1031

    @dima767
    dima767 committed Dec 14, 2018
    Copy the full SHA
    d80854e View commit details

Commits on Dec 12, 2018

  1. Polishing

    @dima767
    dima767 committed Dec 12, 2018
    Copy the full SHA
    0165717 View commit details

  2. Method name change for consistency

    @dima767
    dima767 committed Dec 12, 2018
    Copy the full SHA
    edf035d View commit details

  3. Merge branch 'feature/SHIBUI-1031' of bitbucket.org:unicon/shib-idp-u… 

    …i into feature/SHIBUI-1031
    @dima767
    dima767 committed Dec 12, 2018
    Copy the full SHA
    8f4de87 View commit details

  4. Fix test

    @dima767
    dima767 committed Dec 12, 2018
    Copy the full SHA
    1d48e80 View commit details

  5. Merge branch 'master' into feature/SHIBUI-1031

    @dima767
    dima767 committed Dec 12, 2018
    Copy the full SHA
    5becd15 View commit details

  6. SHIBUI-1031: 1038

    @dima767
    dima767 committed Dec 12, 2018
    Copy the full SHA
    0c26b6f View commit details

  7. SHIBUI-1031: 1036

    @dima767
    dima767 committed Dec 12, 2018
    Copy the full SHA
    7f25830 View commit details

  8. Merge branch 'master' into feature/SHIBUI-1031

    @dima767
    dima767 committed Dec 12, 2018
    Copy the full SHA
    9f0db36 View commit details

  9. Merge branch 'master' into feature/SHIBUI-1031

    @dima767
    dima767 committed Dec 12, 2018
    Copy the full SHA
    4b56891 View commit details

  10. SHIBUI-1031: 1034

    @dima767
    dima767 committed Dec 12, 2018
    Copy the full SHA
    44e957a View commit details

  11. Merged in nojira (pull request #262) 

    Fix location of dynamic http metadata resolver JSON schema
    @dima767
    dima767 authored and Jonathan Johnson committed Dec 12, 2018
    Copy the full SHA
    4f28514 View commit details

  12. Fix location of dynamic http metadata resolver JSON schema

    @dima767
    dima767 committed Dec 12, 2018
    Copy the full SHA
    afce3a8 View commit details

Commits on Dec 11, 2018

  1. SHIBUI-1031: 1034

    @dima767
    dima767 committed Dec 11, 2018
    Copy the full SHA
    656bab1 View commit details

  2. SHIBUI-1031: 1034

    @dima767
    dima767 committed Dec 11, 2018
    Copy the full SHA
    2a6bf14 View commit details

  3. Merge branch 'master' into feature/SHIBUI-1031

    @dima767
    dima767 committed Dec 11, 2018
    Copy the full SHA
    642393f View commit details

  4. Add TODO

    @dima767
    dima767 committed Dec 11, 2018
    Copy the full SHA
    24f4d9a View commit details

  5. Add TODO for parent mapping

    @dima767
    dima767 committed Dec 11, 2018
    Copy the full SHA
    5406939 View commit details

  6. SHIBUI-799: polishing

    @dima767
    dima767 committed Dec 11, 2018
    Copy the full SHA
    dedbae2 View commit details

  7. SHIBUI-799: code review feedback

    @dima767
    dima767 committed Dec 11, 2018
    Copy the full SHA
    3ca883c View commit details

  8. Merge branch 'master' into SHIBUI-799

    @dima767
    dima767 committed Dec 11, 2018
    Copy the full SHA
    8e21a09 View commit details

Commits on Dec 10, 2018

  1. Merged in bugfix/SHIBUI-1001 (pull request #253) 

    Bugfix/SHIBUI-1001
    @dima767
    dima767 authored and Jonathan Johnson committed Dec 10, 2018
    Copy the full SHA
    bcaefec View commit details

Commits on Dec 7, 2018

  1. SHIBUI-799: polishing

    @dima767
    dima767 committed Dec 7, 2018
    Copy the full SHA
    901e848 View commit details

  2. SHIBUI-799: JSON schema REST API

    @dima767
    dima767 committed Dec 7, 2018
    Copy the full SHA
    dfe6abf View commit details

  3. SHIBUI-799 fix test

    @dima767
    dima767 committed Dec 7, 2018
    Copy the full SHA
    8e7dc67 View commit details

  4. SHIBUI-799 - integrating with front end

    @dima767
    dima767 committed Dec 7, 2018
    Copy the full SHA
    a2427e0 View commit details

  5. SHIBUI-799 UI JSON Schema REST API wip

    @dima767
    dima767 committed Dec 7, 2018
    Copy the full SHA
    ebcc169 View commit details

  6. SHIBUI-799 - refactor model

    @dima767
    dima767 committed Dec 7, 2018
    Copy the full SHA
    f78ab5a View commit details

Commits on Dec 6, 2018

  1. SHIBUI-799: fix nameid filter init error during effective reload

    @dima767
    dima767 committed Dec 6, 2018
    Copy the full SHA
    d533107 View commit details

Commits on Dec 5, 2018

  1. Fix merge conflicts

    @dima767
    dima767 committed Dec 5, 2018
    Copy the full SHA
    e0fcb55 View commit details

  2. SHIBUI-926

    @dima767
    dima767 committed Dec 5, 2018
    Copy the full SHA
    3f14ef4 View commit details

Commits on Dec 4, 2018

  1. Merge branch 'master' into bugfix/SHIBUI-1001

    @dima767
    dima767 committed Dec 4, 2018
    Copy the full SHA
    73f068c View commit details