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

edits to agonism #39

Closed
wants to merge 15 commits into from
Closed

edits to agonism #39

wants to merge 15 commits into from

Conversation

swmargulis
Copy link

All definitions in the agonism category for behavioral function have been updated.

pmidford and others added 15 commits July 15, 2016 16:45
@pmidford
test working with updated nbo-edit file with imported and modified ab…
63efadf 
…o_in_nbo.owl
@pmidford
Merge branch 'fix_issue_37'
c6b9080
@swmargulis
Merge pull request #2 from pmidford/master
143a9ed 
Updates and an nbo that imports abo_in_nbo
@aclark-binghamton-edu
Merge pull request #1 from pmidford/master
c0b1bfb 
Updates and an nbo that imports abo_in_nbo
@aclark-binghamton-edu
simple case change first word
581fbfb 
Changed Behavior to behavior as a test
@swmargulis
Merge pull request #3 from aclark-binghamton-edu/master
5213d6b 
case change request
@aclark-binghamton-edu
Added definition of "predator avoidance behavior"
005694e
@aclark-binghamton-edu
Altered definition of "social aggressive behavior"
7eab2f7 
changed Robert’s definition to designate social group members rather
than use “society”
@swmargulis
Merge pull request #4 from aclark-binghamton-edu/master
0e5078d 
update 2 definitions of NBO terms
@swmargulis
Agonistic alarm
5538104 
updated definition based on most recent definition revisions.
@aclark-binghamton-edu
Added definition for 'color change'
b489568 
Definition for ‘color change’ added from Nov-Dec 2015 definitions for
ABO written by Margulis and Clark
@pmidford
Merge pull request #1 from aclark-binghamton-edu/master
de80910 
Keeping up to date
@pmidford
Merge branch 'pr/2'
57a5574 
added xsd:string data types to added created_by and creation_date so they are treated as strings, not annotations.  Appearance of two unrelated annotations confused git's merge.
@swmargulis
Merge pull request #5 from pmidford/master
4f33e7b 
Fixed merge problem
@swmargulis
Agonism edits
14b7d52 
updated all definitions in the Behavioral Function category of Agonism
@pmidford
Copy link
Collaborator

Except you sent it to the obo-behavior, not Anne's repo.

On 8/11/16 9:47 AM, swmargulis wrote:

All definitions in the agonism category for behavioral function have
been updated.

    You can view, comment on, or merge this pull request online at:

#39

    Commit Summary

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#39, or mute the
thread
https://github.com/notifications/unsubscribe-auth/AAX3jmjMxn9b7PZa6lzNob4C9ER1E7bJks5qeyfVgaJpZM4JiIwd.

@swmargulis
Copy link
Author

Oops. Let me try that again then.

Sue Margulis, Ph.D.
Associate Professor and Chair, Animal Behavior, Ecology, and Conservation
Associate Professor, Biology
Canisius College
2001 Main St
Buffalo NY 14208
(716) 888-2773
margulis@canisius.edumailto:margulis@canisius.edu
AZA Studbook Keeper, white-cheeked gibbon SSP
Chair, Education Committee, Animal Behavior Society
[CC_logo_email sig]

From: Peter E. Midford [mailto:notifications@github.com]
Sent: Thursday, August 11, 2016 9:52 AM
To: obo-behavior/behavior-ontology
Cc: Margulis, Susan W; Author
Subject: Re: [obo-behavior/behavior-ontology] edits to agonism (#39)

Except you sent it to the obo-behavior, not Anne's repo.

On 8/11/16 9:47 AM, swmargulis wrote:

All definitions in the agonism category for behavioral function have
been updated.

You can view, comment on, or merge this pull request online at:

#39

Commit Summary

  • test working with updated nbo-edit file with imported and modified
    abo_in_nbo.owl
  • Merge branch 'fix_issue_37'
  • Merge pull request disorders #2 from pmidford/master
  • Merge pull request posture #1 from pmidford/master
  • simple case change first word
  • Merge pull request intelligence #3 from aclark-binghamton-edu/master
  • Added definition of "predator avoidance behavior"
  • Altered definition of "social aggressive behavior"
  • Merge pull request feelings under emotional behavior #4 from aclark-binghamton-edu/master
  • Agonistic alarm
  • Added definition for 'color change'
  • Merge pull request posture #1 from aclark-binghamton-edu/master
  • Merge branch 'pr/2'
  • Merge pull request consciousness #5 from pmidford/master
  • Agonism edits

File Changes

Patch Links:

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#39, or mute the
thread
https://github.com/notifications/unsubscribe-auth/AAX3jmjMxn9b7PZa6lzNob4C9ER1E7bJks5qeyfVgaJpZM4JiIwd.

—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHubhttps://github.com//pull/39#issuecomment-239166797, or mute the threadhttps://github.com/notifications/unsubscribe-auth/AOl4sQ0VNW8awPZbBNkHp12Tkc9kyhmjks5qeykGgaJpZM4JiIwd.

@pmidford pmidford closed this Aug 11, 2016
@pmidford
Copy link
Collaborator

pmidford commented Aug 11, 2016 •
edited

Misdirected.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@swmargulis @pmidford @aclark-binghamton-edu