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: labscript-suite/labscript-suite
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: labscript-suite/labscript-suite
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: maintenance/3.0.x
Choose a head ref
  • 1 commit
  • 9 files changed
  • 2 contributors

Commits on Jun 25, 2020

  1. Squashed commit of the following:

    commit 76e7b63
    Author: Phil Starkey <philipstarkey@users.noreply.github.com>
    Date:   Thu Jun 25 20:09:18 2020 +1000
    
        Update dependencies in setup.cfg
    
        Bumped all labscript-suite dependencies to `>=3.0.0`
    
    commit 1567faa
    Merge: 17f02fe e0ac239
    Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
    Date:   Thu Jun 25 15:48:24 2020 +1000
    
        Merge pull request #50 from rpanderson/labscript-profile-dir-docs
    
        Clarify note about labscript-suite/labscript-utils#37
    
    commit e0ac239
    Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
    Date:   Thu Jun 25 15:43:26 2020 +1000
    
        Clarify note about labscript-suite/labscript-utils#37
    
    commit 17f02fe
    Merge: 907619d 90330ba
    Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
    Date:   Mon Jun 22 18:08:23 2020 +1000
    
        Merge pull request #49 from philipstarkey/master
    
        fix docs conf bugs identified in labscript-suite/labscript-utils#57
    
    commit 90330ba
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Sat Jun 20 18:14:39 2020 +1000
    
        fix docs conf bugs identified in labscript-suite/labscript-utils#57
    
    commit 907619d
    Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
    Date:   Fri Jun 19 16:50:41 2020 +1000
    
        64x64 icons per other styling, and https doi badge
    
    commit 25fe511
    Merge: fadeab2 3b8377d
    Author: Phil Starkey <philipstarkey@users.noreply.github.com>
    Date:   Fri Jun 19 16:43:34 2020 +1000
    
        Merge pull request #48 from philipstarkey/master
    
        Added links to other component docs
    
    commit 3b8377d
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Fri Jun 19 15:57:44 2020 +1000
    
        Addressing latest review comments
    
    commit d5e175b
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Fri Jun 19 10:56:52 2020 +1000
    
        Simplified sphinx conf by moving logic into template
    
    commit 6abe116
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Thu Jun 18 19:14:25 2020 +1000
    
        Moved auto generated components.rst to a jinja2 template
    
    commit 8159129
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Thu Jun 18 16:43:21 2020 +1000
    
        Updated .gitignore with latest GitHub defaults
    
    commit d697cb9
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Thu Jun 18 16:40:30 2020 +1000
    
        Relocated custom sphinx gitignore rules (and restored the original)
    
    commit 42172f5
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Thu Jun 18 16:32:45 2020 +1000
    
        reversed order of sections in .gitignore
    
        This is so that custom rules added by git tools will be in the right section when they are appended to the file
    
    commit cb399ec
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Thu Jun 18 16:09:49 2020 +1000
    
        Split out metapackage link in generalised config
        (hidden in docs built for this project)
    
        * also removed metapackage table from components page (since I realised I shouldn't have really added it)
    
    commit a00526b
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Thu Jun 18 13:06:16 2020 +1000
    
        Fixed bug where component docs URLs were alsways using "latest".
    
        * Now use the intersphinx mapping URL already generated
        * Also added entry for metapackage
    
    commit 58ed4fd
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Thu Jun 18 12:31:24 2020 +1000
    
        Added dynamic generation of labscript suite component table
    
    commit b3087a6
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Thu Jun 18 11:10:54 2020 +1000
    
        Implemented some review changes
    
        * fixed typo in labscriptsuite.org URLs
        * Updated to use `pathlib`
        * Updated .gitignore to delineate custom and generic ignore rules
        * renamed component_docs.rst -> components.rst
    
    commit fadeab2
    Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
    Date:   Wed Jun 17 11:38:48 2020 +1000
    
        README.md badges and edits
    
    commit e419ce1
    Author: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
    Date:   Tue Jun 16 21:03:32 2020 +1000
    
        Populated README.md with styling, iconogrpahy, prose, and badges
    
    commit 8e5ea93
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Tue Jun 16 18:08:33 2020 +1000
    
        black formatting
    
    commit 0f0da2e
    Author: philipstarkey <philipstarkey@users.noreply.github.com>
    Date:   Tue Jun 16 18:06:02 2020 +1000
    
        Added links to other component docs
    
    Co-authored-by: Russell Anderson <5637107+rpanderson@users.noreply.github.com>
    philipstarkey and rpanderson committed Jun 25, 2020
    Configuration menu
    Copy the full SHA
    fba5b50 View commit details
    Browse the repository at this point in the history
Loading
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy