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

Docs/project/fixes #543

Merged
merged 26 commits into from
Nov 17, 2017
Merged

Docs/project/fixes #543

merged 26 commits into from
Nov 17, 2017

Commits on Nov 4, 2017

  1. -

    @jdcpni
    jdcpni committed Nov 4, 2017
    Configuration menu
    Copy the full SHA
    e725a33 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2017

  1. Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu… 

    …Link into devel
    @jdcpni
    jdcpni committed Nov 5, 2017
    Configuration menu
    Copy the full SHA
    cb04745 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2017

  1. Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu… 

    …Link into devel
    @jdcpni
    jdcpni committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    ea3b359 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu… 

    …Link into CURRENT

# Conflicts:
#	tests/mechanisms/test_transfer_mechanism.py
    @jdcpni
    jdcpni committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    0c24e98 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu… 

    …Link into CURRENT

# Conflicts:
#	tests/mechanisms/test_transfer_mechanism.py
    @jdcpni
    jdcpni committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    7b545b4 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2017

  1. • State 

      _parse_state_spec:  fixed bug in parsing variable for projection_spec
    @jdcpni
    jdcpni committed Nov 12, 2017
    Configuration menu
    Copy the full SHA
    d5d6d6d View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2017

  1. Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu… 

    …Link into devel
    @jdcpni
    jdcpni committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    5c0c9da View commit details
    Browse the repository at this point in the history

  2. Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu… 

    …Link into devel
    @jdcpni
    jdcpni committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    1bde88c View commit details
    Browse the repository at this point in the history

  3. -

    @jdcpni
    jdcpni committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    6ec0988 View commit details
    Browse the repository at this point in the history

  4. -

    @jdcpni
    jdcpni committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    7a5b0fe View commit details
    Browse the repository at this point in the history

  5. • State 

      - docstring: STATE NAME ENTRY, MECHANISM/STATE and State constructor examples
    jdcpni committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    fdf89e6 View commit details
    Browse the repository at this point in the history

  6. -

    @jdcpni
    jdcpni committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    decf6d0 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2017

  1. Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu… 

    …Link into devel

# Conflicts:
#	Scripts/Scratch Pad.py
#	psyneulink/components/states/state.py
    @jdcpni
    jdcpni committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    c8343ed View commit details
    Browse the repository at this point in the history

  2. Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu… 

    …Link into devel

# Conflicts:
#	Scripts/Scratch Pad.py
#	psyneulink/components/states/state.py
    @jdcpni
    jdcpni committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    568caa1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu… 

    …Link into devel
    @jdcpni
    jdcpni committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    c62274c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu… 

    …Link into devel
    @jdcpni
    jdcpni committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    865c64c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'devel' of https://github.com/PrincetonUniversity/PsyNeu… 

    …Link into devel
    @jdcpni
    jdcpni committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    bf14c25 View commit details
    Browse the repository at this point in the history

  6. - JDC final changes

    @jdcpni
    jdcpni committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    ab2dd42 View commit details
    Browse the repository at this point in the history

  7. -

    @jdcpni
    jdcpni committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    7f4d63d View commit details
    Browse the repository at this point in the history

  8. -

    @jdcpni
    jdcpni committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    b63d60a View commit details
    Browse the repository at this point in the history

  9. -

    @jdcpni
    jdcpni committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    92de4b4 View commit details
    Browse the repository at this point in the history

  10. -

    @jdcpni
    jdcpni committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    8580fe2 View commit details
    Browse the repository at this point in the history

  11. -

    @jdcpni
    jdcpni committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    772263f View commit details
    Browse the repository at this point in the history

  12. -

    @jdcpni
    jdcpni committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    1e9b55a View commit details
    Browse the repository at this point in the history

  13. • Project 

      - docstring corrections
    @jdcpni
    jdcpni committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    6b56dd2 View commit details
    Browse the repository at this point in the history

  14. Merge branches 'devel' and 'docs/project/fixes' of https://github.com… 

    …/PrincetonUniversity/PsyNeuLink into docs/project/fixes

# Conflicts:
#	Scripts/Scratch Pad.py
    @jdcpni
    jdcpni committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    9f64866 View commit details
    Browse the repository at this point in the history