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

WIP: add the ability to nest teams #38

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

WIP: add the ability to nest teams #38

wants to merge 21 commits into from

Commits on Mar 1, 2016

  1. add the ability to nest teams

    @jacobwegner
    jacobwegner committed Mar 1, 2016
    Configuration menu
    Copy the full SHA
    1fbc351 View commit details
    Browse the repository at this point in the history

  2. remove unused import

    @jacobwegner
    jacobwegner committed Mar 1, 2016
    Configuration menu
    Copy the full SHA
    daa656c View commit details
    Browse the repository at this point in the history

  3. update migration 0002 to use pinax_teams app label

    @jacobwegner
    jacobwegner committed Mar 1, 2016
    Configuration menu
    Copy the full SHA
    0c9dffc View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2016

  1. bump version number for next release

    @jacobwegner
    jacobwegner committed Jul 3, 2016
    Configuration menu
    Copy the full SHA
    51062aa View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/pinax/pinax-teams

    @jacobwegner
    jacobwegner committed Jul 3, 2016
    Configuration menu
    Copy the full SHA
    2b09030 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2016

  1. Merge remote-tracking branch 'upstream/master' into add-nested-teams

    @jacobwegner
    jacobwegner committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    1ecfc9b View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2016

  1. fix failing test

    @jacobwegner
    jacobwegner committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    77c2488 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2016

  1. factor out is_managed_by_as_filter

    @jacobwegner
    jacobwegner committed Jul 21, 2016
    Configuration menu
    Copy the full SHA
    5301f9a View commit details
    Browse the repository at this point in the history

  2. fix get_root_team and ancestors to refer to Team instance using self

    @jacobwegner
    jacobwegner committed Jul 21, 2016
    Configuration menu
    Copy the full SHA
    4374927 View commit details
    Browse the repository at this point in the history

  3. add docstring to ancestors_for assignment tag

    @jacobwegner
    jacobwegner committed Jul 21, 2016
    Configuration menu
    Copy the full SHA
    138e02f View commit details
    Browse the repository at this point in the history

  4. add docstring and rename descendants_for to children_for

    @jacobwegner
    jacobwegner committed Jul 21, 2016
    Configuration menu
    Copy the full SHA
    10762c7 View commit details
    Browse the repository at this point in the history

  5. add descendants to Team

    @jacobwegner
    jacobwegner committed Jul 21, 2016
    Configuration menu
    Copy the full SHA
    661d8f1 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2017

  1. Merge remote-tracking branch 'upstream/master'

    @jacobwegner
    jacobwegner committed Jul 17, 2017
    Configuration menu
    Copy the full SHA
    f78ed55 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into add-nested-teams

    @jacobwegner
    jacobwegner committed Jul 17, 2017
    Configuration menu
    Copy the full SHA
    d1d54df View commit details
    Browse the repository at this point in the history

  3. fix syntax error

    @jacobwegner
    jacobwegner committed Jul 17, 2017
    Configuration menu
    Copy the full SHA
    ed9daa8 View commit details
    Browse the repository at this point in the history

  4. pin pinax-invitations

    @jacobwegner
    jacobwegner committed Jul 17, 2017
    Configuration menu
    Copy the full SHA
    5b6888f View commit details
    Browse the repository at this point in the history

  5. resolve migration conflict

    @jacobwegner
    jacobwegner committed Jul 17, 2017
    Configuration menu
    Copy the full SHA
    d4b8f77 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2017

  1. fix migrations for pinax-invitations

    @jacobwegner
    jacobwegner committed Sep 11, 2017
    Configuration menu
    Copy the full SHA
    704662e View commit details
    Browse the repository at this point in the history

  2. locate templates within pinax/teams

    @jacobwegner
    jacobwegner committed Sep 11, 2017
    Configuration menu
    Copy the full SHA
    b34420d View commit details
    Browse the repository at this point in the history

  3. fix render_to_string

    @jacobwegner
    jacobwegner committed Sep 11, 2017
    Configuration menu
    Copy the full SHA
    8fce429 View commit details
    Browse the repository at this point in the history

  4. fix linting errors

    @jacobwegner
    jacobwegner committed Sep 11, 2017
    Configuration menu
    Copy the full SHA
    f25b1e4 View commit details
    Browse the repository at this point in the history