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

latest queries and websocket fixes #1017

Merged
merged 59 commits into from
Feb 26, 2021
Merged

latest queries and websocket fixes #1017

merged 59 commits into from
Feb 26, 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 December 18, 2020 12:54
@Robbie1977
Merge pull request #841 from VirtualFlyBrain/development-sync-7e2e
87a7f4a 
sync: development  with development-sync-7e2e
@Robbie1977
Merge branch 'development' into development-sync-39f5
bfd9be2
@Robbie1977
Merge pull request #848 from VirtualFlyBrain/development-sync-39f5
f46f39d 
sync: development  with development-sync-39f5
@Robbie1977
Merge pull request #854 from VirtualFlyBrain/development-sync-42d7
caa8126 
sync: development  with development-sync-42d7
@Robbie1977
Merge pull request #860 from VirtualFlyBrain/development-sync-3068
99589bc 
sync: development  with development-sync-3068
@Robbie1977
Merge pull request #866 from VirtualFlyBrain/development-sync-8302
184eb49 
sync: development  with development-sync-8302
@Robbie1977
Merge pull request #938 from VirtualFlyBrain/development-sync-49ed
09adfd5 
sync: development  with development-sync-49ed
@Robbie1977
Merge pull request #955 from VirtualFlyBrain/development-sync-a239
4102eba 
sync: development  with development-sync-a239
@Robbie1977
Merge pull request #961 from VirtualFlyBrain/development-sync-6863
3ac0b5e 
sync: development  with development-sync-6863
@Robbie1977
Merge pull request #973 from VirtualFlyBrain/development-sync-e09a
db9a299 
sync: development  with development-sync-e09a
@Robbie1977
Merge pull request #978 from VirtualFlyBrain/debug
a73a11c 
Testing latest Debug changes
@Robbie1977
Merge pull request #979 from VirtualFlyBrain/debug
caa3977 
testing updates from Debug
@Robbie1977
Merge pull request #980 from VirtualFlyBrain/debug
0fb0163 
Forcing Image header Centred
@Robbie1977
Merge pull request #981 from VirtualFlyBrain/debug
a51d03b 
not neeing to be forced
@Robbie1977
Merge pull request #989 from VirtualFlyBrain/development-sync-55cc
6416869 
sync: development  with development-sync-55cc
@Robbie1977
Merge pull request #996 from VirtualFlyBrain/debug-sync-2355
824130f 
sync: debug  with debug-sync-2355
@Robbie1977
Merge pull request #995 from VirtualFlyBrain/development-sync-2355
4622fb7 
sync: development  with development-sync-2355
@jrmartin
#775 fix layers components css issues
3ec759a
@jrmartin
Remove alert statement from debug
bb2dd60
@ddelpiano
#983 fix for eye icon to follow the instance behaviour, plus removed …
6ae37a6 
…circularProgress component unused
@Robbie1977
Merge pull request #1002 from VirtualFlyBrain/feature/983
629881b 
#983 fix for eye icon to follow the instance behaviour
@Robbie1977
Merge pull request #1001 from VirtualFlyBrain/fix/remove_alert
ae78aab 
Remove alert statement from debug
@Robbie1977
Merge pull request #1003 from VirtualFlyBrain/development
f2d2c01 
testing in debug
@Robbie1977
Merge pull request #1000 from VirtualFlyBrain/feature/775
d42540b 
Fixes Layers Component CSS Issues
@Robbie1977
Merge pull request #1005 from VirtualFlyBrain/development
4dd1b58 
Development
@Robbie1977
stagger loading
c6352d3
@Robbie1977
Merge pull request #1010 from VirtualFlyBrain/debug-sync-ec0d
c9c7386 
sync: debug  with debug-sync-ec0d
@Robbie1977
batching into 10s
e4a4aee
@Robbie1977
Merge branch 'debug' of https://github.com/VirtualFlyBrain/geppetto-vfb…
c31d653 
… into debug
@Robbie1977
Revert "batching into 10s"
0ca6cb4 
This reverts commit e4a4aee.
@Robbie1977
Revert "stagger loading"
2a1d63d 
This reverts commit c6352d3.
@Robbie1977
adding loading message
e6181cb
@Robbie1977
lint fix
d77bd33
@Robbie1977
Revert "lint fix"
d2884b0 
This reverts commit d77bd33.
@Robbie1977
Revert "adding loading message"
ed40056 
This reverts commit e6181cb.
@Robbie1977
updating images of Class query to standard
48bdb74
@Robbie1977
correcting for individual per line
d859d0e
@Robbie1977
restricting to images
48cfcb1
@Robbie1977
simplifying
afe5cf8
@Robbie1977
removing extras
f01bd0c
@Robbie1977
removing extra columns
7071819
@Robbie1977
Revert "removing extras"
cb2b461 
This reverts commit f01bd0c.
@Robbie1977
adding has_similar_morphology_to
50f8353
@Robbie1977
marking as manual query
e3867b7
@Robbie1977
removing old queries
32562a3
@Robbie1977
adding clarification
091f6c8
@Robbie1977
adding extra space
3d355f3
@Robbie1977
tweaking wording
08d1d02
@Robbie1977
logic fix
6f0b25e
@Robbie1977
logic fix
8386cc2
@Robbie1977
targeting fixed icon
cccd8ed
@Robbie1977
id update for new query
75184f3
@Robbie1977
syntax fix
483ac05
@Robbie1977
typo fix
34599de
@Robbie1977
forcing reconnect
e0edf36
@Robbie1977
using attempts to time reload
883732a
@Robbie1977
adding better logging
f7c3ad5
@Robbie1977
using full retries
1d1c411
@Robbie1977
simplifying reload
4b61f30
@Robbie1977 Robbie1977 merged commit 1607eb3 into master Feb 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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