Skip to content
Snippets Groups Projects
  • Johannes Friedrich's avatar
    1830fe20
    Squashed commit of the following: · 1830fe20
    Johannes Friedrich authored
    commit 028cbab9
    Merge: 48c5fed2 087ce492
    Author: eftychios pnevmatikakis <epnevmatikakis@gmail.com>
    Date:   Mon Sep 23 12:40:32 2019 -0400
    
        Merge pull request #640 from pgunn/dev_add_coverage_caimanmanager_command
    
        Add a caimanmanager command to include coverage
    
    commit 087ce492
    Author: Pat Gunn <pgunn01@gmail.com>
    Date:   Mon Sep 23 11:58:54 2019 -0400
    
        Disable refchecks to make coverage tool happy
    
    commit cd684702
    Merge: 48c5fed2 b6df9074
    Author: Pat Gunn <pgunn01@gmail.com>
    Date:   Mon Sep 23 11:31:03 2019 -0400
    
        Merge branch 'dev_add_coverage_caimanmanager_command' of github.com:pgunn/CaImAn into dev
    
    commit 48c5fed2
    Merge: 20579317 9c0e3bba
    Author: eftychios pnevmatikakis <epnevmatikakis@gmail.com>
    Date:   Mon Sep 23 10:24:21 2019 -0400
    
        Merge pull request #639 from pgunn/yapf-caiman-base
    
        yapfify caiman/base
    
    commit 20579317
    Author: epnev <eap2111@columbia.edu>
    Date:   Mon Sep 23 10:23:48 2019 -0400
    
        set row major in gui
    
    commit b6df9074
    Author: Pat Gunn <pgunn01@gmail.com>
    Date:   Mon Sep 9 16:34:01 2019 -0400
    
        Add a caimanmanager command to include coverage, and add coverage to environment.yml
    
    commit 9c0e3bba
    Author: Pat Gunn <pgunn01@gmail.com>
    Date:   Mon Sep 9 11:49:44 2019 -0400
    
        yapfify caiman/base
    
    commit 5fb432d2
    Author: epnev <eap2111@columbia.edu>
    Date:   Tue Sep 3 15:12:36 2019 -0400
    
        update gui file
    
    commit 52b69d21
    Merge: 4c611263 d27855c0
    Author: epnev <epnevmatikakis@gmail.com>
    Date:   Tue Aug 27 00:17:33 2019 -0400
    
        Merge branch 'master' into dev
    
    commit d27855c0
    Author: epnev <epnevmatikakis@gmail.com>
    Date:   Tue Aug 27 00:14:43 2019 -0400
    
        ensuring dims is always a tuple #636
    
    commit 59a88cb0
    Author: epnev <eap2111@columbia.edu>
    Date:   Mon Aug 26 15:49:45 2019 -0400
    
        handling movies doc
    
    commit d1244a1f
    Author: epnev <eap2111@columbia.edu>
    Date:   Mon Aug 26 11:37:02 2019 -0400
    
        more docs
    
    commit 4c611263
    Author: epnev <eap2111@columbia.edu>
    Date:   Thu Aug 22 12:30:17 2019 -0400
    
        introduce parameter p_patch
    
    commit 90d5ec5d
    Author: eftychios pnevmatikakis <epnevmatikakis@gmail.com>
    Date:   Thu Aug 22 10:06:32 2019 -0400
    
        Update ISSUE_TEMPLATE.md
    
    commit 462be25a
    Merge: 72f9bc40 49110222
    Author: epnev <epnevmatikakis@gmail.com>
    Date:   Thu Aug 22 09:35:17 2019 -0400
    
        Merge branch 'dev'
    
    commit 72f9bc40
    Merge: 5af22564 23718fb1
    Author: epnev <eap2111@columbia.edu>
    Date:   Mon Aug 19 10:49:43 2019 -0400
    
        Merge branch 'dev'
    
    commit 5af22564
    Merge: d1996e36 34a95d82
    Author: eftychios pnevmatikakis <epnevmatikakis@gmail.com>
    Date:   Fri Aug 16 16:46:53 2019 -0400
    
        Merge pull request #630 from flatironinstitute/dev
    
        Dev
    
    commit d1996e36
    Author: Pat Gunn <pgunn01@gmail.com>
    Date:   Fri Aug 16 11:28:18 2019 -0400
    
        Add numpydoc to environment file (for readthedocs)
    1830fe20
    History
    Squashed commit of the following:
    Johannes Friedrich authored
    commit 028cbab9
    Merge: 48c5fed2 087ce492
    Author: eftychios pnevmatikakis <epnevmatikakis@gmail.com>
    Date:   Mon Sep 23 12:40:32 2019 -0400
    
        Merge pull request #640 from pgunn/dev_add_coverage_caimanmanager_command
    
        Add a caimanmanager command to include coverage
    
    commit 087ce492
    Author: Pat Gunn <pgunn01@gmail.com>
    Date:   Mon Sep 23 11:58:54 2019 -0400
    
        Disable refchecks to make coverage tool happy
    
    commit cd684702
    Merge: 48c5fed2 b6df9074
    Author: Pat Gunn <pgunn01@gmail.com>
    Date:   Mon Sep 23 11:31:03 2019 -0400
    
        Merge branch 'dev_add_coverage_caimanmanager_command' of github.com:pgunn/CaImAn into dev
    
    commit 48c5fed2
    Merge: 20579317 9c0e3bba
    Author: eftychios pnevmatikakis <epnevmatikakis@gmail.com>
    Date:   Mon Sep 23 10:24:21 2019 -0400
    
        Merge pull request #639 from pgunn/yapf-caiman-base
    
        yapfify caiman/base
    
    commit 20579317
    Author: epnev <eap2111@columbia.edu>
    Date:   Mon Sep 23 10:23:48 2019 -0400
    
        set row major in gui
    
    commit b6df9074
    Author: Pat Gunn <pgunn01@gmail.com>
    Date:   Mon Sep 9 16:34:01 2019 -0400
    
        Add a caimanmanager command to include coverage, and add coverage to environment.yml
    
    commit 9c0e3bba
    Author: Pat Gunn <pgunn01@gmail.com>
    Date:   Mon Sep 9 11:49:44 2019 -0400
    
        yapfify caiman/base
    
    commit 5fb432d2
    Author: epnev <eap2111@columbia.edu>
    Date:   Tue Sep 3 15:12:36 2019 -0400
    
        update gui file
    
    commit 52b69d21
    Merge: 4c611263 d27855c0
    Author: epnev <epnevmatikakis@gmail.com>
    Date:   Tue Aug 27 00:17:33 2019 -0400
    
        Merge branch 'master' into dev
    
    commit d27855c0
    Author: epnev <epnevmatikakis@gmail.com>
    Date:   Tue Aug 27 00:14:43 2019 -0400
    
        ensuring dims is always a tuple #636
    
    commit 59a88cb0
    Author: epnev <eap2111@columbia.edu>
    Date:   Mon Aug 26 15:49:45 2019 -0400
    
        handling movies doc
    
    commit d1244a1f
    Author: epnev <eap2111@columbia.edu>
    Date:   Mon Aug 26 11:37:02 2019 -0400
    
        more docs
    
    commit 4c611263
    Author: epnev <eap2111@columbia.edu>
    Date:   Thu Aug 22 12:30:17 2019 -0400
    
        introduce parameter p_patch
    
    commit 90d5ec5d
    Author: eftychios pnevmatikakis <epnevmatikakis@gmail.com>
    Date:   Thu Aug 22 10:06:32 2019 -0400
    
        Update ISSUE_TEMPLATE.md
    
    commit 462be25a
    Merge: 72f9bc40 49110222
    Author: epnev <epnevmatikakis@gmail.com>
    Date:   Thu Aug 22 09:35:17 2019 -0400
    
        Merge branch 'dev'
    
    commit 72f9bc40
    Merge: 5af22564 23718fb1
    Author: epnev <eap2111@columbia.edu>
    Date:   Mon Aug 19 10:49:43 2019 -0400
    
        Merge branch 'dev'
    
    commit 5af22564
    Merge: d1996e36 34a95d82
    Author: eftychios pnevmatikakis <epnevmatikakis@gmail.com>
    Date:   Fri Aug 16 16:46:53 2019 -0400
    
        Merge pull request #630 from flatironinstitute/dev
    
        Dev
    
    commit d1996e36
    Author: Pat Gunn <pgunn01@gmail.com>
    Date:   Fri Aug 16 11:28:18 2019 -0400
    
        Add numpydoc to environment file (for readthedocs)