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

76 multiple graphs placement of objects #93

Merged
merged 129 commits into from
Mar 28, 2024
Merged

76 multiple graphs placement of objects #93

merged 129 commits into from
Mar 28, 2024

Conversation

gr812b
Copy link
Collaborator

@gr812b gr812b commented Mar 26, 2024

No description provided.

camdnnn and others added 30 commits December 27, 2023 14:22
@camdnnn
Add video modal components
71eb222
@camdnnn
Add video modal to App.js and Topbar.js
8a78fd1
@camdnnn
Add videos directory to .gitignore
e5ebaec
@camdnnn
Remove videos directory from .gitignore
5739f63
@camdnnn
added video controller
622761d
@gr812b
Added more root location support
e95e33a 
Wrong branch but whatever, actually using upload dir as it should be
@camdnnn
updated store and getHeaders
eeec2d0
@camdnnn
sort uploads into csv and mp4 folders
ccc2a5f
@camdnnn
added folder query
4fa63a9
@camdnnn
Merge branch 'main' into 68-sync-video-to-data
7147710
@camdnnn
allow mp4 upload on modal
a8d42b6
@camdnnn
added .mov support converting them to mp4
285eef9
@camdnnn
Merge branch 'main' of https://github.com/McMaster-Baja-Racing/Better…
1ddc5be 
…-Data-Viewer into 68-sync-video-to-data
@camdnnn
Add getTimespan method to StorageService
a0f0963
@gr812b
Fixed resizer to be a bit better
77f8c66 
Next stop is to add drag and drop and a UI editor of sorts before getting ready with the options of UI formats and then getting graphs to fit in with it all
@camdnnn
Added timestamp endpoint
8cf6926
@camdnnn
reduced zero time calculations
0c4275f
@camdnnn
return video timespans in GMT
999b25a
@gr812b
Added charts component
a7d9a0b
@gr812b
Quick changes
d3b6565
@gr812b
Multiple charts layout
4ce9cd1
@gr812b
Fixed resizer to be a bit better
ab0b451 
Next stop is to add drag and drop and a UI editor of sorts before getting ready with the options of UI formats and then getting graphs to fit in with it all
@gr812b
Added charts component
3c87a3a
@gr812b
Quick changes
cde0f62
@gr812b
Multiple charts layout
e0d4b11
@gr812b
Updated ChartJS with better structure
33af79e
@t-wing11
Merge branch '76-multiple-graphs-placement-of-objects' of https://git…
2b43a42 
…hub.com/McMaster-Baja-Racing/Better-Data-Viewer into 76-multiple-graphs-placement-of-objects
@gr812b
Added multiple graphs back
786e78e
@camdnnn
added video select into create graph modal
e80cb0e
@camdnnn
Merge branch 'main' into 68-sync-video-to-data
0015589
camdnnn and others added 13 commits March 23, 2024 09:08
JAWalmsley
JAWalmsley approved these changes Mar 27, 2024
View reviewed changes
Copy link
Contributor

@JAWalmsley JAWalmsley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All is good :D

hydrowoxy
hydrowoxy approved these changes Mar 27, 2024
View reviewed changes
Copy link
Contributor

@hydrowoxy hydrowoxy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!!

boktroioi
boktroioi approved these changes Mar 27, 2024
View reviewed changes
Copy link
Contributor

@boktroioi boktroioi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice, I think the overlapping graphs are especially cool!

camdnnn
camdnnn approved these changes Mar 27, 2024
View reviewed changes
Copy link
Contributor

@camdnnn camdnnn left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything looks good besides the stuff we agreed we would fix later

@gr812b gr812b added this to the Data Viewer 1.1 milestone Mar 28, 2024
@gr812b gr812b merged commit d6aad9e into main Mar 28, 2024
@gr812b gr812b deleted the 76-multiple-graphs-placement-of-objects branch April 2, 2024 20:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JAWalmsley JAWalmsley JAWalmsley approved these changes

@camdnnn camdnnn camdnnn approved these changes

@hydrowoxy hydrowoxy hydrowoxy approved these changes

@boktroioi boktroioi boktroioi approved these changes

@t-wing11 t-wing11 Awaiting requested review from t-wing11

@Anonymus1 Anonymus1 Awaiting requested review from Anonymus1

@ArielWolle ArielWolle Awaiting requested review from ArielWolle

@marktfahmy marktfahmy Awaiting requested review from marktfahmy

@GrahamMo GrahamMo Awaiting requested review from GrahamMo

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Data Viewer 1.1
Development

Successfully merging this pull request may close these issues.
7 participants
@gr812b @JAWalmsley @camdnnn @hydrowoxy @boktroioi @t-wing11 @Anonymus1