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

Deploy Circuit Browser - Don't merge yet #1030

Merged
merged 202 commits into from
Jun 22, 2021
Merged

Deploy Circuit Browser - Don't merge yet #1030

merged 202 commits into from
Jun 22, 2021

Conversation

Robbie1977
Copy link
Contributor

  • Add coverage for whatever new functionality, to a JUnit test if it's backend, to a Casper Test if it's frontend
  • Make sure both push and pr travis builds are passing before asking for a review

Robbie1977 and others added 30 commits October 23, 2020 12:39
@Robbie1977
Merge pull request #716 from VirtualFlyBrain/development
ae37ec6 
Development
@Robbie1977
Merge pull request #726 from VirtualFlyBrain/development
5bdc23e 
switching to specific servers
@Robbie1977
Merge pull request #752 from VirtualFlyBrain/development
6fa16e4 
latest from Development
@Robbie1977
Merge pull request #757 from VirtualFlyBrain/development
5f1b406 
Pre release tweaks
@Robbie1977
Merge pull request #792 from VirtualFlyBrain/pipeline2-sync-f89b
867da0f 
sync: pipeline2  with pipeline2-sync-f89b
@Robbie1977
Merge pull request #798 from VirtualFlyBrain/pipeline2-sync-7314
9bb90e5 
sync: pipeline2  with pipeline2-sync-7314
@Robbie1977
Merge pull request #805 from VirtualFlyBrain/pipeline2-sync-10a6
a498c2b 
sync: pipeline2  with pipeline2-sync-10a6
@Robbie1977
Merge pull request #811 from VirtualFlyBrain/pipeline2-sync-1b2e
c3b3223 
sync: pipeline2  with pipeline2-sync-1b2e
@Robbie1977
Merge pull request #816 from VirtualFlyBrain/pipeline2-sync-9391
8d44177 
sync: pipeline2  with pipeline2-sync-9391
@Robbie1977
Merge pull request #821 from VirtualFlyBrain/pipeline2-sync-2453
073178c 
sync: pipeline2  with pipeline2-sync-2453
@Robbie1977
Merge pull request #845 from VirtualFlyBrain/pipeline2-sync-7e2e
9ce728b 
sync: pipeline2  with pipeline2-sync-7e2e
@Robbie1977
Merge pull request #852 from VirtualFlyBrain/pipeline2-sync-39f5
c383e58 
sync: pipeline2  with pipeline2-sync-39f5
@Robbie1977
Merge pull request #858 from VirtualFlyBrain/pipeline2-sync-42d7
77d40da 
sync: pipeline2  with pipeline2-sync-42d7
@Robbie1977
Merge pull request #864 from VirtualFlyBrain/pipeline2-sync-3068
2f196ba 
sync: pipeline2  with pipeline2-sync-3068
@Robbie1977
Merge pull request #870 from VirtualFlyBrain/pipeline2-sync-8302
6387f55 
sync: pipeline2  with pipeline2-sync-8302
@Robbie1977
Merge pull request #942 from VirtualFlyBrain/pipeline2-sync-49ed
8bfcc38 
sync: pipeline2  with pipeline2-sync-49ed
@Robbie1977
Merge pull request #953 from VirtualFlyBrain/pipeline2-sync-7092
618950e 
sync: pipeline2  with pipeline2-sync-7092
@Robbie1977
Merge pull request #959 from VirtualFlyBrain/pipeline2-sync-a239
f56f05d 
sync: pipeline2  with pipeline2-sync-a239
@Robbie1977
Merge pull request #965 from VirtualFlyBrain/pipeline2-sync-6863
e0d6614 
sync: pipeline2  with pipeline2-sync-6863
@Robbie1977
Merge pull request #971 from VirtualFlyBrain/pipeline2-sync-6e9f
a41e243 
sync: pipeline2  with pipeline2-sync-6e9f
@Robbie1977
Merge pull request #977 from VirtualFlyBrain/pipeline2-sync-e09a
60961dd 
sync: pipeline2  with pipeline2-sync-e09a
@Robbie1977
Merge pull request #993 from VirtualFlyBrain/pipeline2-sync-55cc
ca511c0 
sync: pipeline2  with pipeline2-sync-55cc
@Robbie1977
Merge pull request #999 from VirtualFlyBrain/pipeline2-sync-2355
a5385ae 
sync: pipeline2  with pipeline2-sync-2355
@jrmartin
#984 selection of Term Context node triggers addVFBID and changes UI,
79c9995 
but doesn't update the Term Context component unless user presses sync
button
@jrmartin
#987 Update query for Circuit Browser. Makes Circuit Browser component
a3ed21c 
visible.
@jrmartin
#987 Fix eslint issues
56eecc2
@Robbie1977
Merge pull request #1013 from VirtualFlyBrain/pipeline2-sync-ec0d
4dc87cc 
sync: pipeline2  with pipeline2-sync-ec0d
@Robbie1977
Merge pull request #1009 from VirtualFlyBrain/development-sync-ec0d
1bc56da 
sync: development  with development-sync-ec0d
@jrmartin
#985 Plugs in SOLR to Circuit Browser search fields, and selection of
34a67bc 
instances is done by instance name (#986)
@jrmartin
#985 Clean code
fd4e2a0
jrmartin and others added 27 commits May 21, 2021 19:51
@jrmartin
#1114 Improve circuit browser layout
6f7e184
@jrmartin
#1114 Fixing bug with circuit browser
412b4ec
@jrmartin
#1114 Adjust destination spacing
0efd6e5
@Robbie1977
fix to avoid extraneous relationships
5c0fc5a
@Robbie1977
Merge branch 'pipeline2' into pipeline2-sync-00f2
3b36f0d
@Robbie1977
Merge pull request #1130 from VirtualFlyBrain/pipeline2-sync-00f2
88b2a8f 
sync: pipeline2  with pipeline2-sync-00f2
@Robbie1977
Merge branch 'pipeline2' into feature/1114
a4af954
@jrmartin
#1119 If circuit browser is launched form term info, the full label is
65437b5 
displayed and not just the ID. Improves autocomplete.
@jrmartin
#1119 space
68b028b
@jrmartin
Merge remote-tracking branch 'origin/feature/1119' into feature/1114
9814251
@jrmartin
#1114 Fix eslint
3fbfb77
@ddelpiano
#1016 invalid id handler in redux state
8e930dc
@jrmartin
#1138 Check for undefined objects to avoid crashes
15f7cfc
@jrmartin
#1140 Fix hide/show controls behavior in layers component to match
6c3c4d5 
behavior in term info's button bar controls.
@jrmartin
#727 Term Info section collapse/expand
1a068e1
@jrmartin
#727 Prevent click on term info section titles using css
b522add
@jrmartin
#727 Remove classes not needed anymore
1a09034
@jrmartin
#1140 Fix eslint
c1e92af
@jrmartin
#1140 eslint fix
384eef5
@jrmartin
#1140 eslint fix
64f7b71
@Robbie1977
Merge pull request #1132 from VirtualFlyBrain/feature/1114
4b2f1fb 
Improve Layout and Links on Circuit Browser
@Robbie1977
Merge pull request #1137 from VirtualFlyBrain/feature/1016
94bd1ca 
#1016 invalid id handler in redux state
@ddelpiano
Merge pull request #1142 from VirtualFlyBrain/feature/727
033c654 
Feature/727 - Term Info section collapse/expand
@ddelpiano
Merge pull request #1141 from VirtualFlyBrain/feature/1140
c5ee920 
Feature/1140 - Layers component hide/show control fix
@Robbie1977
replacing all pdb varients
9acf7e7
@Robbie1977
swapping to v4 version
ff89300
@Robbie1977
defaulting to v4
3a39403
@Robbie1977 Robbie1977 changed the base branch from debug to master June 22, 2021 13:22
@Robbie1977 Robbie1977 marked this pull request as ready for review June 22, 2021 13:45
@Robbie1977 Robbie1977 merged commit 4efa425 into master Jun 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Robbie1977 Robbie1977

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Robbie1977 @jrmartin @ddelpiano