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.

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

Google analytics addition merge to production #68

Merged
merged 70 commits into from
Aug 27, 2022
Merged
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
56614d6
Coco POC #8 #9 (#19) (#26)
Mar 12, 2022
3d6829f
removed symlink
Mar 12, 2022
5638685
Merge branch 'aws/trashai-staging' into testing_coco
Mar 12, 2022
40b16a3
Testing coco (#28)
Mar 12, 2022
aa3a62f
Changed upload behaviour
Mar 13, 2022
b3e2234
Merge branch 'aws/trashai-staging' of github.com:code4sac/trash-ai in…
Mar 13, 2022
e5b4f88
Merge branch 'production' into aws/trashai-staging
Mar 13, 2022
457a5c1
Merge branch 'testing_coco' into aws/trashai-staging
Mar 13, 2022
c48befd
Refactored upload dialog / drop area
Mar 13, 2022
5d8db28
Fixed issue with remove / key and array order
Mar 13, 2022
4ed2acb
Removed lab / test for deployed versions of environment
Mar 14, 2022
e206216
Forgot to update the metadata text
Mar 14, 2022
550014e
Yolov5-Taco web model #7 (#30)
Mar 19, 2022
39800da
Testing change to model loading in AWS
Mar 21, 2022
ba36038
Try 2 on loading model
Mar 22, 2022
4f3be20
Try 3 on loading model
Mar 22, 2022
92ae160
Reverting changes (has to do with basic auth url)
Mar 22, 2022
b610d17
Removed old react frontend directory
Mar 30, 2022
50b9714
Removed old react frontend directory (#34)
Mar 31, 2022
877793a
Merge branch 'aws/trashai-staging' of github.com:code4sac/trash-ai in…
Mar 31, 2022
401c426
Moving domain from codefordev to trashai.org
Mar 31, 2022
01e9e7a
Merge branch 'production' into aws/trashai-staging
Apr 6, 2022
9413057
Replaced Backend with python, fixed infa deploy logic # 35
Apr 6, 2022
890d02c
Addresses # 32, added new features amongst them a download all button
Apr 6, 2022
cee6178
Added support for python packages
Apr 6, 2022
b49bd19
Adjusted permission to add/remove layers in the prefix namespace
Apr 7, 2022
56545f8
fixed permissions issue for layers / backend deploy
Apr 7, 2022
58068e2
Added hash and other metadata to the metadata display and hover over …
Apr 7, 2022
45685e4
Fixed metadata download and info button
Apr 7, 2022
2dfc14b
Fixes for #36, #35, #32 + download all feature, and backend refactor …
Apr 7, 2022
ecb7dfa
Fixing file ext name issue with s3 bucket upload on backend
Apr 7, 2022
2c6d994
bugfix on s3 naming with file extension (#40)
Apr 7, 2022
eeb8d72
Merge branch 'production' of github.com:code4sac/trash-ai into aws/tr…
feydan Apr 7, 2022
66fe713
Added magnifying feature for larger images
Apr 14, 2022
a8a5aba
filling out the about page (#45)
feydan Apr 14, 2022
400b3e8
Merge branch 'production' into aws/shollingsworth-root
Apr 14, 2022
18e696c
Made about page default #49
Apr 27, 2022
127d414
Added "Samples" button to upload tab closes #50
Apr 30, 2022
c9e4cb0
Making about updates specified in #48 (#51)
feydan May 4, 2022
5960018
small about update
feydan May 5, 2022
a3352fb
merging production into branch
feydan May 5, 2022
8bfc643
Demoing the CI/CD integration
May 25, 2022
bc9e947
Typescript refactor Version 1
Jul 23, 2022
7a4dacc
Merge branch 'typescript_refactor' into aws/trashai-staging
Jul 23, 2022
4d88705
removed nuxt
Jul 23, 2022
586e818
removed more files
Jul 23, 2022
8dea7eb
adjusted build commands
Jul 23, 2022
45c82da
fixed height issue with uploads
Jul 23, 2022
92e8dd1
re-implemented backend
Jul 23, 2022
002aa03
adjusted frontend deploy stack
Jul 23, 2022
951252d
Merge branch 'typescript_refactor' into aws/shollingsworth-root
Jul 23, 2022
e6ceebd
Added github secret for google maps api key
Jul 23, 2022
3f69bd5
Added dockerfile for frontend
Jul 23, 2022
53da16f
added jszip
Jul 23, 2022
d34b76e
Fixed android upload gps issue, fixed mobile status truncating issue
Jul 24, 2022
8607374
removed uneeded logo files
Jul 24, 2022
25ab380
Typescript refactor (#58)
Aug 4, 2022
2451212
updated deploy scripts
Aug 6, 2022
1454a9a
Merge branch 'update_deploy_scripts' into aws/trashai-staging
Aug 6, 2022
a88f586
testing config update
Aug 6, 2022
4859e4f
added vite
Aug 6, 2022
8d3f418
testing vite
Aug 6, 2022
57e7222
testing vite
Aug 6, 2022
b549c19
testing deploy
Aug 6, 2022
3812a8a
adjusted permissions to allow access to public bucket
Aug 6, 2022
77c137d
still testing
Aug 6, 2022
cb014ff
arg!
Aug 6, 2022
64bc14b
Updating about page (#64)
feydan Aug 18, 2022
30b0058
Merge remote-tracking branch 'upstream/production' into aws/trashai-s…
Aug 18, 2022
d343311
adding google analytics script (#67)
feydan Aug 27, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
removed symlink
  • Loading branch information
Steven Hollingsworth committed Mar 12, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 3d6829f755f3ca9952f584f3600e32f5e8fc5406
1 change: 0 additions & 1 deletion frontend/src/static/web_model

This file was deleted.