Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: conda-forge/conda-forge.github.io
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: conda-forge/conda-forge.github.io
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: coc
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 18 commits
  • 4 files changed
  • 6 contributors

Commits on Apr 28, 2022

  1. ENH code of conduct subteam

    @beckermr
    beckermr committed Apr 28, 2022
    Configuration menu
    Copy the full SHA
    bbf4503 View commit details
    Browse the repository at this point in the history

  2. adding myself 

    I handled 2 out of 3 incidents we had so I guess I have some experience with CoC in conda-forge ;-p
    @ocefpaf
    ocefpaf authored Apr 28, 2022
    Configuration menu
    Copy the full SHA
    f944e28 View commit details
    Browse the repository at this point in the history

  3. Update src/orga/subteams.rst

    @beckermr
    beckermr authored Apr 28, 2022
    Configuration menu
    Copy the full SHA
    121fced View commit details
    Browse the repository at this point in the history

  4. Update src/orga/subteams.rst

    @beckermr
    beckermr authored Apr 28, 2022
    Configuration menu
    Copy the full SHA
    ff37399 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2022

  1. Update src/orga/subteams.rst

    @beckermr
    beckermr authored Apr 29, 2022
    Configuration menu
    Copy the full SHA
    7c440fa View commit details
    Browse the repository at this point in the history

  2. Update src/orga/subteams.rst

    @beckermr
    beckermr authored Apr 29, 2022
    Configuration menu
    Copy the full SHA
    79f266e View commit details
    Browse the repository at this point in the history

  3. Update src/orga/subteams.rst 

    Co-authored-by: Christopher J. 'CJ' Wright <[email protected]>
    @beckermr @CJ-Wright
    beckermr and CJ-Wright authored Apr 29, 2022
    Configuration menu
    Copy the full SHA
    800851e View commit details
    Browse the repository at this point in the history

  4. Update src/orga/subteams.rst 

    Co-authored-by: Christopher J. 'CJ' Wright <[email protected]>
    @beckermr @CJ-Wright
    beckermr and CJ-Wright authored Apr 29, 2022
    Configuration menu
    Copy the full SHA
    9406dab View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2023

  1. Merge branch 'main' into coc

    @isuruf
    isuruf authored Apr 20, 2023
    Configuration menu
    Copy the full SHA
    2b652b6 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2023

  1. copy conda-incubator's CODE_OF_CONDUCT

    @jaimergp
    jaimergp committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    50452c3 View commit details
    Browse the repository at this point in the history

  2. Replaced conda -> conda-forge and other obvious changes

    @jaimergp
    jaimergp committed Jul 4, 2023
    Configuration menu
    Copy the full SHA
    eb91406 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Bring in tentative list of CoC members

    @jaimergp
    jaimergp committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    0aa95b9 View commit details
    Browse the repository at this point in the history

  2. adapt previous clauses

    @jaimergp
    jaimergp committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    026f00f View commit details
    Browse the repository at this point in the history

  3. update subteams so it refers to the main document

    @jaimergp
    jaimergp committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    29b6deb View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' of github.com:conda-forge/conda-forge.github.io i… 

    …nto coc
    @jaimergp
    jaimergp committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    ad67bb7 View commit details
    Browse the repository at this point in the history

  5. update README

    @jaimergp
    jaimergp committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    c18cd1a View commit details
    Browse the repository at this point in the history

  6. update toc

    @jaimergp
    jaimergp committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    e47d72f View commit details
    Browse the repository at this point in the history

  7. update mention of coc in governance.rst

    @jaimergp
    jaimergp committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    4547fdd View commit details
    Browse the repository at this point in the history
Loading