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

Fix calibrations #177

Open
wants to merge 467 commits into
base: dev
Choose a base branch
from
Open

Fix calibrations #177

wants to merge 467 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Oct 23, 2018

  1. Echo in code update and fix to warning in ExpPanel

    @k1o0
    k1o0 committed Oct 23, 2018
    Configuration menu
    Copy the full SHA
    8cc73a5 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2018

  1. Scheduled updating in +git/update

    @k1o0
    k1o0 committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    9a1e015 View commit details
    Browse the repository at this point in the history

  2. Changed .gitmodules to point back to cortex-lab subrepos for pull req… 

    …uest
    Jai Bhagat authored Oct 25, 2018
    Configuration menu
    Copy the full SHA
    1cccfc1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #69 from jaib1/dev 

    Setting dev up-to-date with master, plus incorporating additional changes made directly to dev (that were not made to master)
    @k1o0
    k1o0 authored Oct 25, 2018
    Configuration menu
    Copy the full SHA
    39caab5 View commit details
    Browse the repository at this point in the history

  4. Reset lick counter NB: May ditch this method in future in favour of f… 

    …aster 'signalsy' approach
    @k1o0
    k1o0 committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    13c85a8 View commit details
    Browse the repository at this point in the history

  5. Lick detector zero'd + git.update uses 'where git'

    @k1o0
    k1o0 committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    ad3b8da View commit details
    Browse the repository at this point in the history

  6. Removed premature commit. Wheel now zero'd + where git in update func

    @k1o0
    k1o0 committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    6ceb4e6 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev' of https://github.com/cortex-lab/Rigbox into dev 

    reverted premature commit
    @k1o0
    k1o0 committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    cd23b73 View commit details
    Browse the repository at this point in the history

  8. rm unfinished code

    @k1o0
    k1o0 committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    af0738b View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2018

  1. added future training flag to AlyxPanel

    jaib1 committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    9ee295f View commit details
    Browse the repository at this point in the history

  2. Updated Output to log when giving water in AlyxPanel

    jaib1 committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    150a61c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #73 from jaib1/dev 

    added future training flag to AlyxPanel
    @k1o0
    k1o0 authored Oct 26, 2018
    Configuration menu
    Copy the full SHA
    64677be View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2018

  1. Future water bug fix, better error handling is dispWtrReq and consist… 

    …ent log formatting
    @k1o0
    k1o0 committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    53bce3b View commit details
    Browse the repository at this point in the history

  2. Merge from dev, auto update of code every monday

    @k1o0
    k1o0 committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    633416a View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2018

  1. Returns index of named arg

    @k1o0
    k1o0 committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    f943f48 View commit details
    Browse the repository at this point in the history

  2. Bug fix and SPX222 support

    @k1o0
    k1o0 committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    e4cdf24 View commit details
    Browse the repository at this point in the history

  3. Updates to signals & wheelAnalysis modules

    @k1o0
    k1o0 committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    1c05914 View commit details
    Browse the repository at this point in the history

  4. commentings on SignalsExp plus last signals subrepo commit

    jaib1 committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    7148e9e View commit details
    Browse the repository at this point in the history

  5. repoint submodules back at Jai's forks

    jaib1 committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    9bba914 View commit details
    Browse the repository at this point in the history

  6. last changes made to signals subrepo

    jaib1 committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    66f8d8f View commit details
    Browse the repository at this point in the history

  7. pulling Miles' Rigbox dev commits from past 2 weeks

    jaib1 committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    9b27d06 View commit details
    Browse the repository at this point in the history

  8. typo fixes for readme

    jaib1 committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    00af989 View commit details
    Browse the repository at this point in the history

  9. View all subjects window is now a better size

    @k1o0
    k1o0 committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    814cfde View commit details
    Browse the repository at this point in the history

  10. Merge branch 'dev' of https://github.com/cortex-lab/Rigbox into dev

    @k1o0
    k1o0 committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    4fd00a4 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2018

  1. Wheel signal availiable in degrees and mm

    @k1o0
    k1o0 committed Nov 15, 2018
    Configuration menu
    Copy the full SHA
    4ec10e6 View commit details
    Browse the repository at this point in the history

  2. Moved useRig to be before expDef run

    @k1o0
    k1o0 committed Nov 15, 2018
    Configuration menu
    Copy the full SHA
    3d23d11 View commit details
    Browse the repository at this point in the history

  3. Skip repeats on wheel trace and zero offset now accessable

    @k1o0
    k1o0 committed Nov 15, 2018
    Configuration menu
    Copy the full SHA
    7d222c1 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2018

  1. Moved wheel out of useRig method: conflict with setting output

    @k1o0
    k1o0 committed Nov 16, 2018
    Configuration menu
    Copy the full SHA
    385d6ba View commit details
    Browse the repository at this point in the history

  2. Fix to paths; npy-matlab added properly

    @k1o0
    k1o0 committed Nov 16, 2018
    Configuration menu
    Copy the full SHA
    81d7e8d View commit details
    Browse the repository at this point in the history

  3. Update from master

    @k1o0
    k1o0 committed Nov 16, 2018
    Configuration menu
    Copy the full SHA
    8982b19 View commit details
    Browse the repository at this point in the history

  4. Docstring fix

    @k1o0
    k1o0 committed Nov 16, 2018
    Configuration menu
    Copy the full SHA
    b53653c View commit details
    Browse the repository at this point in the history

  5. Fix log for when no future train dates

    @k1o0
    k1o0 committed Nov 16, 2018
    Configuration menu
    Copy the full SHA
    64aa3ca View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2018

  1. Alyx changes in subject endpoint

    Olivier Winter committed Nov 19, 2018
    Configuration menu
    Copy the full SHA
    9b7a815 View commit details
    Browse the repository at this point in the history

  2. eui.AlyxPanel: water restriction management endpoint refactoring

    Olivier Winter committed Nov 19, 2018
    Configuration menu
    Copy the full SHA
    a8c895c View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2018

  1. Water type set in hardware

    @k1o0
    k1o0 committed Nov 20, 2018
    Configuration menu
    Copy the full SHA
    e960a1a View commit details
    Browse the repository at this point in the history

  2. field name change for trials numbers

    @k1o0
    k1o0 committed Nov 20, 2018
    Configuration menu
    Copy the full SHA
    34a4b7a View commit details
    Browse the repository at this point in the history

  3. Bug fix for post water

    @k1o0
    k1o0 committed Nov 20, 2018
    Configuration menu
    Copy the full SHA
    86b4ce0 View commit details
    Browse the repository at this point in the history

  4. Ugly but functional drop-down for water type

    @k1o0
    k1o0 committed Nov 20, 2018
    Configuration menu
    Copy the full SHA
    8b45502 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2018

  1. eui.AlyxPanel: water restriction management endpoint refactoring

    @k1o0
    Olivier Winter authored and k1o0 committed Nov 21, 2018
    Configuration menu
    Copy the full SHA
    3994da9 View commit details
    Browse the repository at this point in the history

  2. Alyx changes in subject endpoint

    @k1o0
    Olivier Winter authored and k1o0 committed Nov 21, 2018
    Configuration menu
    Copy the full SHA
    770ef43 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2018

  1. Initial DaqController changes for clock output + tidying other files

    jaib1 committed Nov 26, 2018
    Configuration menu
    Copy the full SHA
    3cb5851 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2018

  1. working RewardAsClock in DaqController

    jaib1 committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    a94ab94 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of https://github.com/cortex-lab/Rigbox into dev

    jaib1 committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    b0dd22d View commit details
    Browse the repository at this point in the history

  3. manual changes to resolve remote conflicts

    jaib1 committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    7526eee View commit details
    Browse the repository at this point in the history

  4. Session water posted by rig instead of mc. Allows rig specific water … 

    …type.
    @k1o0
    k1o0 committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    53273c6 View commit details
    Browse the repository at this point in the history

  5. Simplified ChoiceWorld water post

    @k1o0
    k1o0 committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    f6a1ff5 View commit details
    Browse the repository at this point in the history

  6. Merge from dev

    @k1o0
    k1o0 committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    e63525a View commit details
    Browse the repository at this point in the history

  7. Scheduled update day set in paths file

    @k1o0
    k1o0 committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    779a9f8 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2018

  1. Launch Webpage for session fix

    @k1o0
    k1o0 committed Nov 28, 2018
    Configuration menu
    Copy the full SHA
    318cae0 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2018

  1. Small delay for correct behaviour of reward on stim

    @k1o0
    k1o0 committed Nov 30, 2018
    Configuration menu
    Copy the full SHA
    a60e93a View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin' into wheelDeg

    @k1o0
    k1o0 committed Nov 30, 2018
    Configuration menu
    Copy the full SHA
    952ac29 View commit details
    Browse the repository at this point in the history

  3. Update tp submodules

    @k1o0
    k1o0 committed Nov 30, 2018
    Configuration menu
    Copy the full SHA
    b3a0f2f View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2018

  1. Removed star and end dates in water-restriction GET for view subject … 

    …method
    @k1o0
    k1o0 committed Dec 3, 2018
    Configuration menu
    Copy the full SHA
    0908e33 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2018

  1. Merge pull request #76 from jaib1/dev 

    Mainly DaqController Stuff
    Jai Bhagat authored Dec 4, 2018
    Configuration menu
    Copy the full SHA
    dcf2bae View commit details
    Browse the repository at this point in the history

  2. commit for updated submodules

    jaib1 committed Dec 4, 2018
    Configuration menu
    Copy the full SHA
    c5cccc1 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2018

  1. Fix'd weight plot; no longer ploting unweighed days

    @k1o0
    k1o0 committed Dec 5, 2018
    Configuration menu
    Copy the full SHA
    6f667d1 View commit details
    Browse the repository at this point in the history

  2. Typo fix in signals repo

    @k1o0
    k1o0 committed Dec 5, 2018
    Configuration menu
    Copy the full SHA
    1462af7 View commit details
    Browse the repository at this point in the history

  3. Updates to modules and update fun

    @k1o0
    k1o0 committed Dec 5, 2018
    Configuration menu
    Copy the full SHA
    066ec03 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2018

  1. Merge remote branch 'dev' of https://github.com/cortex-lab/Rigbox int… 

    …o local dev
    jaib1 committed Dec 6, 2018
    Configuration menu
    Copy the full SHA
    8397dae View commit details
    Browse the repository at this point in the history

  2. stash and pull strategy changes to git.update

    jaib1 committed Dec 6, 2018
    Configuration menu
    Copy the full SHA
    ddc5045 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2018

  1. hw-info ext bugfix; new commits to alyx-matlab; added test paths

    @k1o0
    k1o0 committed Dec 7, 2018
    Configuration menu
    Copy the full SHA
    2a3b473 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of https://github.com/cortex-lab/Rigbox into dev

    @k1o0
    k1o0 committed Dec 7, 2018
    Configuration menu
    Copy the full SHA
    df3caf4 View commit details
    Browse the repository at this point in the history

  3. Removed questioning directory comments

    Jai Bhagat authored Dec 7, 2018
    Configuration menu
    Copy the full SHA
    3f764de View commit details
    Browse the repository at this point in the history

  4. Merge pull request #78 from cortex-lab/devGitUpdate 

    Dev git update
    Jai Bhagat authored Dec 7, 2018
    Configuration menu
    Copy the full SHA
    25b5f2f View commit details
    Browse the repository at this point in the history

  5. Give different water types in the future. Today's recorded weigth now… 

    … displayed
    @k1o0
    k1o0 committed Dec 7, 2018
    Configuration menu
    Copy the full SHA
    6e8e9de View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev' of https://github.com/cortex-lab/Rigbox into dev

    @k1o0
    k1o0 committed Dec 7, 2018
    Configuration menu
    Copy the full SHA
    1c88311 View commit details
    Browse the repository at this point in the history

  7. Update to alyx-matlab submodule

    @k1o0
    k1o0 committed Dec 7, 2018
    Configuration menu
    Copy the full SHA
    5d31c5a View commit details
    Browse the repository at this point in the history

  8. Update readme.md

    Jai Bhagat authored Dec 7, 2018
    Configuration menu
    Copy the full SHA
    05f723e View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2018

  1. Update to signals

    @k1o0
    k1o0 committed Dec 10, 2018
    Configuration menu
    Copy the full SHA
    ad6571b View commit details
    Browse the repository at this point in the history

  2. Update to signals

    @k1o0
    k1o0 committed Dec 10, 2018
    Configuration menu
    Copy the full SHA
    8978915 View commit details
    Browse the repository at this point in the history

  3. Update git.update

    Jai Bhagat authored Dec 10, 2018
    Configuration menu
    Copy the full SHA
    89ce3fb View commit details
    Browse the repository at this point in the history

  4. corresponding 'git.update' update to 'mc'

    Jai Bhagat authored Dec 10, 2018
    Configuration menu
    Copy the full SHA
    329bd47 View commit details
    Browse the repository at this point in the history

  5. corresponding 'git.update' update to 'srv.expServer'

    Jai Bhagat authored Dec 10, 2018
    Configuration menu
    Copy the full SHA
    5facbea View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2018

  1. Scheduled update day taken from paths file

    @k1o0
    k1o0 committed Dec 12, 2018
    Configuration menu
    Copy the full SHA
    71c4ade View commit details
    Browse the repository at this point in the history

  2. Merge pull request #84 from cortex-lab/gitUpdate 

    git.update update
    Jai Bhagat authored Dec 12, 2018
    Configuration menu
    Copy the full SHA
    fc5fc5f View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2018

  1. Update to submodules

    @k1o0
    k1o0 committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    4409066 View commit details
    Browse the repository at this point in the history

  2. Fixed bug with hw-info saved as '.jjson' file

    @k1o0
    k1o0 committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    d23f6fb View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of https://github.com/cortex-lab/Rigbox into dev

    @k1o0
    k1o0 committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    c6fceb2 View commit details
    Browse the repository at this point in the history

  4. Reverting changes; .mat hw-nfo still used by tlvs. Using strrep to de… 

    …al with ext in expServer
    @k1o0
    k1o0 committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    8135874 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2018

  1. Wheel assignment back in useRig

    @k1o0
    k1o0 committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    c9d7a00 View commit details
    Browse the repository at this point in the history

  2. Merge from wheelDeg

    @k1o0
    k1o0 committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    388f317 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2018

  1. Rolled back DaqController due to issues with DigitalTTL output

    @k1o0
    k1o0 committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    77a3c2c View commit details
    Browse the repository at this point in the history

  2. Logs no longer subtract reference time: already done by obj.Clock.now… 

    … method
    @k1o0
    k1o0 committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    0e5e400 View commit details
    Browse the repository at this point in the history

  3. Releasing hardware and ports properly after experiment end

    @k1o0
    k1o0 committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    b55ea8e View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2018

  1. Removed fieldOrDefault; same functionality as getOr

    @k1o0
    k1o0 committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    e5ed26f View commit details
    Browse the repository at this point in the history

  2. Added ext input to expFilePath

    @k1o0
    k1o0 committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    3b6a322 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of https://github.com/cortex-lab/Rigbox into dev

    @k1o0
    k1o0 committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    f984ce4 View commit details
    Browse the repository at this point in the history

  4. bug fix: variable required transpose

    @k1o0
    k1o0 committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    3169f66 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2019

  1. Checks for local folder rather than remote when creating new dir for … 

    …buffer
    @k1o0
    k1o0 committed Jan 9, 2019
    Configuration menu
    Copy the full SHA
    fcd6dcb View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2019

  1. Auto cleanup of WeekendWater profile; changes to comments

    @k1o0
    k1o0 committed Jan 10, 2019
    Configuration menu
    Copy the full SHA
    ddd772b View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2019

  1. Clearer plots and tables in view subject history

    @k1o0
    k1o0 committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    24ce0fd View commit details
    Browse the repository at this point in the history

  2. Update to submodule; can't post zero weights

    @k1o0
    k1o0 committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    b64f90b View commit details
    Browse the repository at this point in the history

  3. Clearer plots and tables in view subject history

    @k1o0
    k1o0 committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    77febac View commit details
    Browse the repository at this point in the history

  4. Update to submodules: added params to subsession JSON field

    @k1o0
    k1o0 committed Jan 11, 2019
    Configuration menu
    Copy the full SHA
    c7e758a View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2019

  1. updated submodule signals

    @ArminLak
    ArminLak committed Jan 15, 2019
    Configuration menu
    Copy the full SHA
    c193c60 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2019

  1. Merge from dev

    @k1o0
    k1o0 committed Jan 20, 2019
    Configuration menu
    Copy the full SHA
    206f656 View commit details
    Browse the repository at this point in the history

  2. Moved Signals vis functions from cortexlab directory

    @k1o0
    k1o0 committed Jan 20, 2019
    Configuration menu
    Copy the full SHA
    56dd8b9 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2019

  1. cellFlat now works with arrays of Signals objects

    @k1o0
    k1o0 committed Jan 22, 2019
    Configuration menu
    Copy the full SHA
    770499b View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2019

  1. Comments still saved loaclly upon failure to post to Alyx

    @k1o0
    k1o0 committed Jan 24, 2019
    Configuration menu
    Copy the full SHA
    72acc90 View commit details
    Browse the repository at this point in the history

  2. Updates to session done with PATCH

    @k1o0
    k1o0 committed Jan 24, 2019
    Configuration menu
    Copy the full SHA
    9ad2c06 View commit details
    Browse the repository at this point in the history

  3. Updates to session done with PATCH

    @k1o0
    k1o0 committed Jan 24, 2019
    Configuration menu
    Copy the full SHA
    eb4cb39 View commit details
    Browse the repository at this point in the history

  4. Added change to patch cached put files to Alyx

    @k1o0
    k1o0 committed Jan 24, 2019
    Configuration menu
    Copy the full SHA
    d54582b View commit details
    Browse the repository at this point in the history

  5. Added change to patch cached put files to Alyx

    @k1o0
    k1o0 committed Jan 24, 2019
    Configuration menu
    Copy the full SHA
    e4a0325 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2019

  1. Fix bug for when code never fetched

    @k1o0
    k1o0 committed Jan 26, 2019
    Configuration menu
    Copy the full SHA
    7ad3bab View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2019

  1. Bug fix for timeplot

    @k1o0
    k1o0 committed Jan 27, 2019
    Configuration menu
    Copy the full SHA
    7ae8813 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2019

  1. add signals 'tutorials' folder to paths

    jaib1 committed Jan 28, 2019
    Configuration menu
    Copy the full SHA
    5dcb828 View commit details
    Browse the repository at this point in the history

  2. Merge remote branch 'dev' into local

    jaib1 committed Jan 28, 2019
    Configuration menu
    Copy the full SHA
    fec3ac2 View commit details
    Browse the repository at this point in the history

  3. Revert "add signals 'tutorials' folder to paths" 

    This reverts commit 5dcb828.
    jaib1 committed Jan 28, 2019
    Configuration menu
    Copy the full SHA
    808d565 View commit details
    Browse the repository at this point in the history

  4. Update only occurs once on scheduled day

    @k1o0
    k1o0 committed Jan 28, 2019
    Configuration menu
    Copy the full SHA
    3d90407 View commit details
    Browse the repository at this point in the history

  5. additional comments for git.update

    Jai Bhagat authored Jan 28, 2019
    Configuration menu
    Copy the full SHA
    0ff7427 View commit details
    Browse the repository at this point in the history

  6. updated git.update from commit 0ff742 in 'dev'

    Jai Bhagat authored Jan 28, 2019
    Configuration menu
    Copy the full SHA
    2a5185d View commit details
    Browse the repository at this point in the history

  7. Fix'd incorrect brackets

    @k1o0
    k1o0 committed Jan 28, 2019
    Configuration menu
    Copy the full SHA
    c9c27a2 View commit details
    Browse the repository at this point in the history

  8. Fix'd incorrect brackets

    @k1o0
    k1o0 committed Jan 28, 2019
    Configuration menu
    Copy the full SHA
    cbb1313 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2019

  1. Attempt to integrate new Parameter Editor into mc

    @k1o0
    k1o0 committed Jan 30, 2019
    Configuration menu
    Copy the full SHA
    b36cadb View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2019

  1. Updates for GUILT compatibility

    @k1o0
    k1o0 committed Feb 5, 2019
    Configuration menu
    Copy the full SHA
    04a8a3d View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2019

  1. New infer params

    @k1o0
    k1o0 committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    e47f462 View commit details
    Browse the repository at this point in the history

  2. Check for reserved params

    @k1o0
    k1o0 committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    0f4bff2 View commit details
    Browse the repository at this point in the history

  3. No more multiple default aud dev names

    @k1o0
    k1o0 committed Feb 8, 2019
    2 Configuration menu
    Copy the full SHA
    c5a2e98 View commit details
    Browse the repository at this point in the history

  4. Bug fix for numRepeats when there's signal char param

    @k1o0
    k1o0 committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    571ee18 View commit details
    Browse the repository at this point in the history

  5. Subjects list disabled during login

    @k1o0
    k1o0 committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    6e19d61 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2019

  1. Field change to water-requirement endpoint

    @k1o0
    k1o0 committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    8522c13 View commit details
    Browse the repository at this point in the history

  2. Pagination support

    @k1o0
    k1o0 committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    210c848 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of https://github.com/cortex-lab/Rigbox into dev

    @k1o0
    k1o0 committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    6ae6b1e View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2019

  1. Field change to water-requirement endpoint

    @k1o0
    k1o0 committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    4ff9735 View commit details
    Browse the repository at this point in the history

  2. Pagination support

    @k1o0
    k1o0 committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    1845292 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2019

  1. Modify Alyx login to use newid instead of inputdlg. This makes the 'e… 

    …nter' key on the keyboard synonymous with the 'ok' button
    @kevin-j-miller
    kevin-j-miller committed Feb 15, 2019
    Configuration menu
    Copy the full SHA
    b5ea66e View commit details
    Browse the repository at this point in the history

  2. Modify Alyx login to use newid instead of inputdlg. This makes the 'e… 

    …nter' key on the keyboard synonymous with the 'ok' button
    @kevin-j-miller
    kevin-j-miller committed Feb 15, 2019
    Configuration menu
    Copy the full SHA
    e9c2f5e View commit details
    Browse the repository at this point in the history

  3. Expose the AlyxPanel property of the MControl object, so that the log… 

    …in method can be invoked from the command line. I want to do this so that I can put a batch file on the desktop of the computer that runs MC to help streamline the workflow.
    @kevin-j-miller
    kevin-j-miller committed Feb 15, 2019
    Configuration menu
    Copy the full SHA
    5f2fb58 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2019

  1. modified alyx-matlab with more convenient textboxes and desktop short… 

    …cuts for common use-cases
    @kevin-j-miller
    kevin-j-miller committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    9b56e4f View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2019

  1. Bug fix for turning empty objects into struct

    @k1o0
    k1o0 committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    64416dd View commit details
    Browse the repository at this point in the history

  2. Added error msgID and tests

    @k1o0
    k1o0 committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    4fda5c0 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2019

  1. modify alyx_matlab

    @kevin-j-miller
    kevin-j-miller committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    de7c0c2 View commit details
    Browse the repository at this point in the history

  2. move alyxpanel property to private setaccess

    @kevin-j-miller
    kevin-j-miller committed Feb 20, 2019
    Configuration menu
    Copy the full SHA
    fde8177 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #105 from cortex-lab/dev_kevin 

    Usability tweaks to MC
    Jai Bhagat authored Feb 20, 2019
    Configuration menu
    Copy the full SHA
    ce9c36d View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2019

  1. Merge pull request #106 from cortex-lab/obj2json_fix 

    Bug fix for turning empty objects into struct
    Jai Bhagat authored Feb 21, 2019
    Configuration menu
    Copy the full SHA
    53bbb8c View commit details
    Browse the repository at this point in the history

  2. Bugfix for registering hw info

    @k1o0
    k1o0 committed Feb 21, 2019
    Configuration menu
    Copy the full SHA
    6f07fc8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'hwInfo_bug' into dev

    jaib1 committed Feb 21, 2019
    Configuration menu
    Copy the full SHA
    0e4ed52 View commit details
    Browse the repository at this point in the history

  4. bugfix for registering hw.info

    Jai Bhagat authored Feb 21, 2019
    Configuration menu
    Copy the full SHA
    6bceeea View commit details
    Browse the repository at this point in the history

  5. Merge pull request #112 from cortex-lab/hwInfo_bug 

    Bugfix for registering hw info
    Jai Bhagat authored Feb 21, 2019
    Configuration menu
    Copy the full SHA
    7d04c62 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #113 from cortex-lab/hwInfo_bugMaster 

    bugfix for registering hw.info
    Jai Bhagat authored Feb 21, 2019
    Configuration menu
    Copy the full SHA
    9298f12 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2019

  1. Merge branch 'dev' of https://github.com/cortex-lab/Rigbox into local 

    dev
    jaib1 committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    c3b0f78 View commit details
    Browse the repository at this point in the history

  2. added test for 'vis.sinusoidLayer' and updated 'alyx' (dev) and 'sign… 

    …als' (dev) submodules
    jaib1 committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    9b5cb2a View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2019

  1. Update readme 

    Added coverage badge
    @k1o0
    k1o0 authored Feb 25, 2019
    Configuration menu
    Copy the full SHA
    5f1a10e View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2019

  1. Started AlyxPanel tests

    @k1o0
    k1o0 committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    aa123db View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2019

  1. Change to validation params

    @k1o0
    k1o0 committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    cf9a2c2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'inferParams' into dev

    @ahcf
    ahcf committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    199a894 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2019

  1. Fix for xlim when single water restricted weight

    @k1o0
    k1o0 committed Feb 28, 2019
    Configuration menu
    Copy the full SHA
    6d78c2c View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2019

  1. Bug fix for differing def fun paths

    @k1o0
    k1o0 committed Mar 5, 2019
    Configuration menu
    Copy the full SHA
    4f0cf69 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2019

  1. Rebased 'TestPanelClasses' onto 'dev' at diverge point c9c27a2 after … 

    …pull request changes

Test Panel as Classes modeled off SignalsExp & MControl

variable name changes to exp.SignalsExp

added 'cprintf.m'

updated signals submodule

updated signals submodule

updates submodule signals

updates signals submodule (TestPanelClasses branch)

updated submodule signals (TestPanelClasses branch)

MControl and mc commits to match dev branch

alyx-related commits to match dev branch

updated submodule signals (TestPanelClasses branch)

updated submodule signals (TestPanelClasses branch)

updated signals submodule (to 'TestPanelClasses' branch) and alyx-matlab(to 'dev' branch) and improved 'namedArg'

updated signals submodule ('TestPanelClasses') after rebasing that branch in that submodule

typo fix in 'hw.devices'

made changes for Miles

updated signals (TestPanelClasses) submodule

Rebased 'TestPanelClasses' onto 'dev' at diverge point after pull request changes

Rebased 'TestPanelClasses' onto 'dev' at diverge point

Test Panel as Classes modeled off SignalsExp & MControl

variable name changes to exp.SignalsExp

added 'cprintf.m'

updated signals submodule

updated signals submodule

updates submodule signals

updates signals submodule (TestPanelClasses branch)

updated submodule signals (TestPanelClasses branch)

MControl and mc commits to match dev branch

alyx-related commits to match dev branch

updated submodule signals (TestPanelClasses branch)

updated submodule signals (TestPanelClasses branch)

updated signals submodule (to 'TestPanelClasses' branch) and alyx-matlab(to 'dev' branch) and improved 'namedArg'

updated signals submodule ('TestPanelClasses') after rebasing that branch in that submodule

typo fix in 'hw.devices'

made changes for Miles

updated signals (TestPanelClasses) submodule

updated signals (TestPannelClasses) submodule after incorporating pull request changes

undid variable name changes for Miles
    jaib1 authored and jaib1 committed Mar 6, 2019
    Configuration menu
    Copy the full SHA
    35a3870 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2019

  1. updated signals (dev) submodule

    jaib1 committed Mar 7, 2019
    Configuration menu
    Copy the full SHA
    86fcbbb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'inferParams' into dev

    jaib1 committed Mar 7, 2019
    Configuration menu
    Copy the full SHA
    ccd828c View commit details
    Browse the repository at this point in the history

  3. updated signals (TestPanelClasses) submodule

    jaib1 committed Mar 7, 2019
    Configuration menu
    Copy the full SHA
    b6b47db View commit details
    Browse the repository at this point in the history

  4. updated signals (dev, merged into from TestPanelClasses) submodule

    jaib1 committed Mar 7, 2019
    Configuration menu
    Copy the full SHA
    6238fda View commit details
    Browse the repository at this point in the history

  5. Merge branch 'TestPanelClasses' into dev

    jaib1 committed Mar 7, 2019
    Configuration menu
    Copy the full SHA
    d4968cc View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2019

  1. Added tests and bug fix for timer deletion

    @k1o0
    k1o0 committed Mar 8, 2019
    Configuration menu
    Copy the full SHA
    5be5059 View commit details
    Browse the repository at this point in the history

  2. Last weight used in calculation for subject history plots

    @k1o0
    k1o0 committed Mar 8, 2019
    Configuration menu
    Copy the full SHA
    447eb42 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2019

  1. Revert irrelevent commits

    @k1o0
    k1o0 committed Mar 10, 2019
    Configuration menu
    Copy the full SHA
    df607ec View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2019

  1. Merge branch 'dev' of https://github.com/cortex-lab/Rigbox into paramUI

    @k1o0
    k1o0 committed Mar 11, 2019
    Configuration menu
    Copy the full SHA
    67e3de3 View commit details
    Browse the repository at this point in the history

  2. Updates to signals

    @k1o0
    k1o0 committed Mar 11, 2019
    Configuration menu
    Copy the full SHA
    f93f73b View commit details
    Browse the repository at this point in the history

  3. Added config file for todo bot

    @k1o0
    k1o0 committed Mar 11, 2019
    Configuration menu
    Copy the full SHA
    9babd51 View commit details
    Browse the repository at this point in the history

  4. Hack for resize issue and fix for makeConditional()

    @k1o0
    k1o0 committed Mar 11, 2019
    Configuration menu
    Copy the full SHA
    09deaf1 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2019

  1. Added some tests and minor modifications

    @k1o0
    k1o0 committed Mar 12, 2019
    Configuration menu
    Copy the full SHA
    29266f0 View commit details
    Browse the repository at this point in the history

  2. Complete Parameters test; parameters deals with strings better; added… 

    … test for repelems
    @k1o0
    k1o0 committed Mar 12, 2019
    Configuration menu
    Copy the full SHA
    ad16e6f View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2019

  1. Bug fixes for numRepeats behaviour, more tests

    @k1o0
    k1o0 committed Mar 13, 2019
    Configuration menu
    Copy the full SHA
    57ba45c View commit details
    Browse the repository at this point in the history

  2. Better coverage of Changed event

    @k1o0
    k1o0 committed Mar 13, 2019
    Configuration menu
    Copy the full SHA
    335642a View commit details
    Browse the repository at this point in the history

  3. Added full documentation

    @k1o0
    k1o0 committed Mar 13, 2019
    Configuration menu
    Copy the full SHA
    d9fc48d View commit details
    Browse the repository at this point in the history

  4. Added performance test and tooltip strings

    @k1o0
    k1o0 committed Mar 13, 2019
    Configuration menu
    Copy the full SHA
    8272c01 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2019

  1. Added test for login; bug fix for round

    @k1o0
    k1o0 committed Mar 14, 2019
    Configuration menu
    Copy the full SHA
    cb4f2ff View commit details
    Browse the repository at this point in the history

  2. Protected some methods

    @k1o0
    k1o0 committed Mar 14, 2019
    Configuration menu
    Copy the full SHA
    618c79c View commit details
    Browse the repository at this point in the history

  3. Removed some comments and command promt output, renamed tests

    @k1o0
    k1o0 committed Mar 14, 2019
    Configuration menu
    Copy the full SHA
    53e23fe View commit details
    Browse the repository at this point in the history

  4. Update readme.md 

    Recommended to use --recurse-submodules flag instead
    @k1o0
    k1o0 authored Mar 14, 2019
    Configuration menu
    Copy the full SHA
    7162d92 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2019

  1. Changed RearrangeableColumns from true to 'on'

    @k1o0
    k1o0 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    c8f7eb6 View commit details
    Browse the repository at this point in the history

  2. reorganized test folder structure, plus added some comments

    jaib1 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    d1ded06 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2019

  1. renamed folder 'helpers' to 'fixtures'; added 'SharedTestFixtures' to… 

    … test classes
    jaib1 committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    4c9b67f View commit details
    Browse the repository at this point in the history

  2. Documentation for launchSubjectURL

    @k1o0
    k1o0 committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    ef551b9 View commit details
    Browse the repository at this point in the history

  3. HOTFIX: double-check experiment isn't already running before starting… 

    … another
    @k1o0
    k1o0 committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    5d28fb1 View commit details
    Browse the repository at this point in the history

  4. HOTFIX: 'ExpRunnning' changed to 'ExpRunning'

    Jai Bhagat committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    e0eca9e View commit details
    Browse the repository at this point in the history

  5. HOTFIX: updated 'eui.MControl/beginExp' to not run exp on rig already… 

    … running exp
    Jai Bhagat committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    c5ac87a View commit details
    Browse the repository at this point in the history

  6. HOTFIX: double-check experiment isn't already running before starting… 

    … another
    @k1o0
    k1o0 committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    866cd9d View commit details
    Browse the repository at this point in the history

  7. Added mocking framework for input dialogs, reorganized

    @k1o0
    k1o0 committed Mar 19, 2019
    Configuration menu
    Copy the full SHA
    177b442 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2019

  1. HOTFIX Update to ALF extraction

    @k1o0
    k1o0 committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    228a016 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #119 from cortex-lab/paramUI 

    Param ui into dev
    Jai Bhagat authored Mar 20, 2019
    Configuration menu
    Copy the full SHA
    b85f8f8 View commit details
    Browse the repository at this point in the history

  3. Added config YAML for todo bot

    @k1o0
    k1o0 committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    9f20d25 View commit details
    Browse the repository at this point in the history

  4. Added config YAML for todo bot

    @k1o0
    k1o0 committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    8820651 View commit details
    Browse the repository at this point in the history

  5. Added config YAML for todo bot

    @k1o0
    k1o0 committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    73a8494 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2019

  1. Started documenting expServer and Communicator

    @k1o0
    k1o0 committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    7483cdb View commit details
    Browse the repository at this point in the history

  2. Added test for cellflat

    @k1o0
    k1o0 committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    7ed3427 View commit details
    Browse the repository at this point in the history

  3. Bonus cellflat test

    @k1o0
    k1o0 committed Mar 21, 2019
    Configuration menu
    Copy the full SHA
    45e1a62 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2019

  1. Added docs folder for package demos

    @k1o0
    k1o0 committed Mar 23, 2019
    1 Configuration menu
    Copy the full SHA
    a83c437 View commit details
    Browse the repository at this point in the history

  2. Tests for posting weight and launching subject url; bug fix for <70% … 

    …label
    @k1o0
    k1o0 committed Mar 23, 2019
    1 Configuration menu
    Copy the full SHA
    da69e8f View commit details
    Browse the repository at this point in the history

  3. Tests for weight button

    @k1o0
    k1o0 committed Mar 23, 2019
    Configuration menu
    Copy the full SHA
    d0fb53b View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2019

  1. Finished all AlyxPanel tests

    @k1o0
    k1o0 committed Mar 24, 2019
    Configuration menu
    Copy the full SHA
    1176532 View commit details
    Browse the repository at this point in the history

  2. Bug fixes for round and launchSessionUrl

    @k1o0
    k1o0 committed Mar 24, 2019
    Configuration menu
    Copy the full SHA
    83ae2b6 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2019

  1. Added contributing guidlines

    @k1o0
    k1o0 committed Mar 25, 2019
    1 Configuration menu
    Copy the full SHA
    3b81095 View commit details
    Browse the repository at this point in the history

  2. Moved UML to doc folder

    @k1o0
    k1o0 committed Mar 25, 2019
    1 Configuration menu
    Copy the full SHA
    cb6f91e View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2019

  1. added images branch from signals

    @k1o0
    k1o0 committed Mar 27, 2019
    Configuration menu
    Copy the full SHA
    ff248c9 View commit details
    Browse the repository at this point in the history

  2. corrected submodule update to only change signals, not alyx-matlab

    @kevin-j-miller
    kevin-j-miller committed Mar 27, 2019
    Configuration menu
    Copy the full SHA
    f3bdf55 View commit details
    Browse the repository at this point in the history

  3. trying again to get the submodules right

    @kevin-j-miller
    kevin-j-miller committed Mar 27, 2019
    Configuration menu
    Copy the full SHA
    b7c406b View commit details
    Browse the repository at this point in the history

  4. Hack-fixed a bug that caused string parameters to not be editable

    @kevin-j-miller
    kevin-j-miller committed Mar 27, 2019
    Configuration menu
    Copy the full SHA
    b319789 View commit details
    Browse the repository at this point in the history

  5. updated signals submodule (merged 'images' and 'voidsignal_fix' into … 

    …'dev')
    @peterzh
    peterzh committed Mar 27, 2019
    Configuration menu
    Copy the full SHA
    7259eef View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2019

  1. bug fix for uicontextmenu in Condition and Field Panels

    jaib1 committed Mar 29, 2019
    3 Configuration menu
    Copy the full SHA
    64b81ab View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2019

  1. updated 'signals' (hotfix updates) and 'alyx-matlab' (merged 'Tests' … 

    …into 'dev') submodules
    Jai Bhagat committed Apr 1, 2019
    Configuration menu
    Copy the full SHA
    5795d47 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2019

  1. Merge branch 'dev_kevin' into dev

    jaib1 committed Apr 12, 2019
    Configuration menu
    Copy the full SHA
    2f91915 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #131 from cortex-lab/documentation 

    Documentation
    Jai Bhagat authored Apr 12, 2019
    Configuration menu
    Copy the full SHA
    6ec0de1 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2019

  1. updated signals (merged 'cleanup' into 'dev') submodule

    jaib1 committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    4cf439b View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2019

  1. updated signals submodule

    Jai Bhagat committed Apr 24, 2019
    Configuration menu
    Copy the full SHA
    9521b66 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2019

  1. Fix for expStop error and bug where event updates twice

    @k1o0
    k1o0 committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    816b2ff View commit details
    Browse the repository at this point in the history

  2. Storing/referencing figure now more efficient

    @k1o0
    k1o0 committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    f442efa View commit details
    Browse the repository at this point in the history

  3. Added full string support in ParamEditor

    @k1o0
    k1o0 committed Apr 29, 2019
    Configuration menu
    Copy the full SHA
    0206c4d View commit details
    Browse the repository at this point in the history

Commits on May 2, 2019

  1. Merge pull request #146 from cortex-lab/ParamStrings 

    Added full string support in ParamEditor
    Jai Bhagat authored May 2, 2019
    Configuration menu
    Copy the full SHA
    2bbd932 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2019

  1. merge 'devUpdateContributing' into 'dev'

    Jai committed May 6, 2019
    Configuration menu
    Copy the full SHA
    6c52421 View commit details
    Browse the repository at this point in the history

  2. add 'contributing.md' link and author emails to 'readme'

    Jai Bhagat authored May 6, 2019
    Configuration menu
    Copy the full SHA
    d8d691e View commit details
    Browse the repository at this point in the history

Commits on May 7, 2019

  1. Merge pull request #149 from cortex-lab/expStop 

    Fix for expStop error and bug where event updates twice
    Jai Bhagat authored May 7, 2019
    Configuration menu
    Copy the full SHA
    3c48d57 View commit details
    Browse the repository at this point in the history

  2. updated submodule signals (merged 'tutorialsForPaper' into 'dev')

    Jai committed May 7, 2019
    Configuration menu
    Copy the full SHA
    89f1854 View commit details
    Browse the repository at this point in the history

  3. Revert "Merge pull request #149 from cortex-lab/expStop" 

    This reverts commit 3c48d57, reversing
changes made to d8d691e.
    Jai committed May 7, 2019
    Configuration menu
    Copy the full SHA
    c7dd26c View commit details
    Browse the repository at this point in the history

Commits on May 8, 2019

  1. updated 'expStop' issue after testing

    Jai Bhagat committed May 8, 2019
    Configuration menu
    Copy the full SHA
    bc3f9c0 View commit details
    Browse the repository at this point in the history

  2. Update README.md

    Jai Bhagat authored May 8, 2019
    Configuration menu
    Copy the full SHA
    e5683cd View commit details
    Browse the repository at this point in the history

Commits on May 9, 2019

  1. merged 'documentation' into dev

    @k1o0
    k1o0 authored and jaib1 committed May 9, 2019
    Configuration menu
    Copy the full SHA
    781d366 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2019

  1. updated signals and alyx-matlab submodules (just documentation)

    jaib1 committed May 10, 2019
    Configuration menu
    Copy the full SHA
    7cc8fd4 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2019

  1. Update to submodule

    @k1o0
    k1o0 committed May 13, 2019
    Configuration menu
    Copy the full SHA
    a0478f1 View commit details
    Browse the repository at this point in the history

  2. Update to submodule

    @k1o0
    k1o0 committed May 13, 2019
    Configuration menu
    Copy the full SHA
    a1947e3 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2019

  1. Weight changed for test; may be an Alyx bug

    @k1o0
    k1o0 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    b6fd9a2 View commit details
    Browse the repository at this point in the history

  2. Merged 'paramUI' into 'dev' after adding 'sortByColumn' and 

    'randomiseConditions' functionality
Added sort by column functionality

Fix for set values function

Added tests for sortByColumn and randomiseConditions
    @k1o0
    k1o0 authored and jaib1 committed May 14, 2019
    Configuration menu
    Copy the full SHA
    6b727d3 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2019

  1. Updated submodules

    @k1o0
    k1o0 committed May 21, 2019
    Configuration menu
    Copy the full SHA
    19018b4 View commit details
    Browse the repository at this point in the history

  2. Merge into dev

    @k1o0
    k1o0 committed May 21, 2019
    Configuration menu
    Copy the full SHA
    221a872 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2019

  1. HOTFIX: Revert mistaken changes

    @k1o0
    k1o0 committed May 22, 2019
    Configuration menu
    Copy the full SHA
    d6fc065 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2019

  1. added readthedocs files

    jaib1 committed May 24, 2019
    Configuration menu
    Copy the full SHA
    ad95aad View commit details
    Browse the repository at this point in the history

  2. Create index.rst 

    Added bare-bones index file
    @k1o0
    k1o0 authored May 24, 2019
    Configuration menu
    Copy the full SHA
    5f5eac7 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2019

  1. AlyxPanel automatically actived when databaseURL field is defined in … 

    …paths file
    @k1o0
    k1o0 committed May 28, 2019
    Configuration menu
    Copy the full SHA
    8904582 View commit details
    Browse the repository at this point in the history

  2. updated signals submodule (added '+audstream' source code)

    jaib1 committed May 28, 2019
    Configuration menu
    Copy the full SHA
    5cf2270 View commit details
    Browse the repository at this point in the history

  3. added java websocket source code

    jaib1 committed May 28, 2019
    Configuration menu
    Copy the full SHA
    0ab61b1 View commit details
    Browse the repository at this point in the history

  4. started 'paths_config' and updated 'readme'

    jaib1 committed May 28, 2019
    Configuration menu
    Copy the full SHA
    06c9846 View commit details
    Browse the repository at this point in the history

  5. AlyxPanel automatically actived when databaseURL field is defined in … 

    …paths file
    @k1o0
    k1o0 authored and jaib1 committed May 28, 2019
    Configuration menu
    Copy the full SHA
    279192a View commit details
    Browse the repository at this point in the history

  6. Merge branch 'autoAlyxPanel' into dev

    jaib1 committed May 28, 2019
    Configuration menu
    Copy the full SHA
    b82ab11 View commit details
    Browse the repository at this point in the history

  7. updated submodules (merged dev -> master for alyx-matlab and signals)

    jaib1 committed May 28, 2019
    Configuration menu
    Copy the full SHA
    963f64e View commit details
    Browse the repository at this point in the history

  8. Merge branch 'dev'

    jaib1 committed May 28, 2019
    Configuration menu
    Copy the full SHA
    0c799d6 View commit details
    Browse the repository at this point in the history

  9. Update README.md

    Jai Bhagat authored May 28, 2019
    Configuration menu
    Copy the full SHA
    dfae06d View commit details
    Browse the repository at this point in the history

Commits on May 29, 2019

  1. Changed name to "LICENSE.md"

    Jai Bhagat authored May 29, 2019
    Configuration menu
    Copy the full SHA
    02de05f View commit details
    Browse the repository at this point in the history

  2. re-initialized and re-built readTheDocs files

    jaib1 committed May 29, 2019
    Configuration menu
    Copy the full SHA
    eecf01f View commit details
    Browse the repository at this point in the history

Commits on May 30, 2019

  1. hotfix for activating AlyxPanel in MC

    jaib1 committed May 30, 2019
    Configuration menu
    Copy the full SHA
    63bfdd0 View commit details
    Browse the repository at this point in the history

  2. now requires 2017b or later

    jaib1 committed May 30, 2019
    Configuration menu
    Copy the full SHA
    cfe2e40 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2019

  1. hotfix to SignalsExp for ending experiments

    jaib1 committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    f43146f View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2019

  1. Added script for testing entire repo

    @k1o0
    k1o0 committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    92d5ec6 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2019

  1. setValuesTest (#162) squash and rebase onto dev 

    * Started setVals test for param editor

* Finished ParamEditor tests; changed Timeline flags to switches
    @k1o0
    k1o0 authored and Jai Bhagat committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    c2d3ab5 View commit details
    Browse the repository at this point in the history

  2. add Nick's changes from #164

    Jai Bhagat committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    f27cc6f View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2019

  1. updated doc for 'Window'

    Jai Bhagat committed Jul 1, 2019
    Configuration menu
    Copy the full SHA
    2a473d2 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2019

  1. changes to daq channels for gamma cal

    Jai Bhagat committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    4abd394 View commit details
    Browse the repository at this point in the history

  2. quit exp server after gamma cal

    Jai Bhagat committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    090af94 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2019

  1. #4, #128, #164

    Jai Bhagat committed Jul 8, 2019
    Configuration menu
    Copy the full SHA
    94183e8 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2019

  1. WIP on updating 'hw.Window' and 'hw.ptb.Window'

    jaib1 committed Aug 9, 2019
    Configuration menu
    Copy the full SHA
    b707bcf View commit details
    Browse the repository at this point in the history