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

Development #128

Merged
merged 86 commits into from
Sep 29, 2024
Merged

Development #128

merged 86 commits into from
Sep 29, 2024

Commits on Sep 25, 2024

  1. feature/UpdatedNeuralNet 

    Added newest 3 emotion neural net model. Currently gives error.
    @Ian-u22488864
    Ian-u22488864 committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    fe648d1 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. feature/UpdatedNeuralNet 

    updated NeuralNetService for better debugging
    @Ian-u22488864
    Ian-u22488864 committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    69e7124 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2024

  1. Navbar test for Home Page working.

    @JimmyBee1
    JimmyBee1 committed Sep 28, 2024
    Configuration menu
    Copy the full SHA
    cf5d5eb View commit details
    Browse the repository at this point in the history

  2. Home page Widget Working on Navbar Test.

    @JimmyBee1
    JimmyBee1 committed Sep 28, 2024
    Configuration menu
    Copy the full SHA
    e2976ce View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2024

  1. testing_rhevan: camera page widget tests

    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    f82b288 View commit details
    Browse the repository at this point in the history

  2. testing_rhevan: auth service unit testing

    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    394ab78 View commit details
    Browse the repository at this point in the history

  3. testing_rhevan: log in page unit testing

    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    f4569fe View commit details
    Browse the repository at this point in the history

  4. testing_rhevan: added SQL database testing

    @GerritPotgieter
    GerritPotgieter committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    0c7d029 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/testing_rhevan' into testing_rhevan

    @GerritPotgieter
    GerritPotgieter committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    aafd79b View commit details
    Browse the repository at this point in the history

  6. Audio Integration

    @PineCone85
    PineCone85 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    6c2c567 View commit details
    Browse the repository at this point in the history

  7. testing_rhevan: added pubspec yaml dependancy for the database tests

    @GerritPotgieter
    GerritPotgieter committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    63a2633 View commit details
    Browse the repository at this point in the history

  8. testing_rhevan: sing up unit testing

    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    331a4ff View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/testing_rhevan' into testing_rhevan

    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    889756a View commit details
    Browse the repository at this point in the history

  10. Navbar test for Home Page working.

    @JimmyBee1 @RhevanKruger
    JimmyBee1 authored and RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    f7ca4b0 View commit details
    Browse the repository at this point in the history

  11. Home page Widget Working on Navbar Test.

    @JimmyBee1 @RhevanKruger
    JimmyBee1 authored and RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    c9dfe1c View commit details
    Browse the repository at this point in the history

  12. testing_rhevan: camera page widget tests

    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    6edd44a View commit details
    Browse the repository at this point in the history

  13. testing_rhevan: auth service unit testing

    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    ed8684e View commit details
    Browse the repository at this point in the history

  14. testing_rhevan: log in page unit testing

    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    c4be430 View commit details
    Browse the repository at this point in the history

  15. testing_rhevan: sing up unit testing

    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    0511f30 View commit details
    Browse the repository at this point in the history

  16. testing_rhevan: added SQL database testing

    @GerritPotgieter @RhevanKruger
    GerritPotgieter authored and RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    a2b8360 View commit details
    Browse the repository at this point in the history

  17. Audio Integration

    @PineCone85 @RhevanKruger
    PineCone85 authored and RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    83810d4 View commit details
    Browse the repository at this point in the history

  18. testing_rhevan: added pubspec yaml dependancy for the database tests

    @GerritPotgieter @RhevanKruger
    GerritPotgieter authored and RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    a27167a View commit details
    Browse the repository at this point in the history

  19. Merge remote-tracking branch 'origin/testing_rhevan' into testing_rhevan

    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    4f2ba8e View commit details
    Browse the repository at this point in the history

  20. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    7289324 View commit details
    Browse the repository at this point in the history

  21. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    c29d96f View commit details
    Browse the repository at this point in the history

  22. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    4ae60bf View commit details
    Browse the repository at this point in the history

  23. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    0fe1989 View commit details
    Browse the repository at this point in the history

  24. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    0222248 View commit details
    Browse the repository at this point in the history

  25. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    82dbce3 View commit details
    Browse the repository at this point in the history

  26. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    3da56ee View commit details
    Browse the repository at this point in the history

  27. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    574d341 View commit details
    Browse the repository at this point in the history

  28. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    38b99ab View commit details
    Browse the repository at this point in the history

  29. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    895a3d8 View commit details
    Browse the repository at this point in the history

  30. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    59337d2 View commit details
    Browse the repository at this point in the history

  31. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    1c4c3b5 View commit details
    Browse the repository at this point in the history

  32. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    104487c View commit details
    Browse the repository at this point in the history

  33. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    fe4972e View commit details
    Browse the repository at this point in the history

  34. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    b31995c View commit details
    Browse the repository at this point in the history

  35. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    42d032b View commit details
    Browse the repository at this point in the history

  36. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    10d6d72 View commit details
    Browse the repository at this point in the history

  37. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    59bb289 View commit details
    Browse the repository at this point in the history

  38. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    e1c14e5 View commit details
    Browse the repository at this point in the history

  39. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    da893de View commit details
    Browse the repository at this point in the history

  40. testing_rhevan: non static spotify auth for testing

    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    14d65f6 View commit details
    Browse the repository at this point in the history

  41. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    361a6c7 View commit details
    Browse the repository at this point in the history

  42. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    bda26b2 View commit details
    Browse the repository at this point in the history

  43. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    18b9f7c View commit details
    Browse the repository at this point in the history

  44. Added updated model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    7eab1a8 View commit details
    Browse the repository at this point in the history

  45. Added new test model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    4cbf3b7 View commit details
    Browse the repository at this point in the history

  46. Added new test model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    2cc3727 View commit details
    Browse the repository at this point in the history

  47. Added new test model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    9e0ba10 View commit details
    Browse the repository at this point in the history

  48. Added saved model in res/raw

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    8207f33 View commit details
    Browse the repository at this point in the history

  49. Added saved model in res/raw

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    5c7d573 View commit details
    Browse the repository at this point in the history

  50. Added saved model in res/raw

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    04fd1b4 View commit details
    Browse the repository at this point in the history

  51. testing_rhevan: user profile unit testing

    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    553753c View commit details
    Browse the repository at this point in the history

  52. Added TensorFlow dependency

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    0c36a88 View commit details
    Browse the repository at this point in the history

  53. Changed NeuralNetService to use tensorflow models

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    020f3d4 View commit details
    Browse the repository at this point in the history

  54. Added tensorflow test model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    64fbd4e View commit details
    Browse the repository at this point in the history

  55. Added tensorflow stress test model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    d82eb32 View commit details
    Browse the repository at this point in the history

  56. Added tensorflow version of original deeplearning4j model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    eb4a4ea View commit details
    Browse the repository at this point in the history

  57. Added current best tensorflow model

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    43cb0e4 View commit details
    Browse the repository at this point in the history

  58. Deleted bad deeplearning4j models

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    a7154bd View commit details
    Browse the repository at this point in the history

  59. Cleaned NeuralNetService.java to use tensorflow models

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    27d3c4f View commit details
    Browse the repository at this point in the history

  60. Copied old NeuralNetService.java as NeuralNetService_old.java

    @Ian-u22488864
    Ian-u22488864 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    13c8f18 View commit details
    Browse the repository at this point in the history

  61. testing_rhevan: user playlist testing

    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    d179fca View commit details
    Browse the repository at this point in the history

  62. Merge pull request #120 

    UpdatedNeuralNet
    @Ian-u22488864
    Ian-u22488864 authored Sep 29, 2024
    Configuration menu
    Copy the full SHA
    1192912 View commit details
    Browse the repository at this point in the history

  63. Audio Integration

    @PineCone85
    PineCone85 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    7093ed7 View commit details
    Browse the repository at this point in the history

  64. Audio Integration

    @PineCone85
    PineCone85 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    caeea9f View commit details
    Browse the repository at this point in the history

  65. Audio Integration

    @PineCone85
    PineCone85 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    105ae9d View commit details
    Browse the repository at this point in the history

  66. Merge pull request #121 from COS301-SE-2024/testing_rhevan 

    Testing Rhevan+Alex
    @PineCone85
    PineCone85 authored Sep 29, 2024
    Configuration menu
    Copy the full SHA
    1fea01b View commit details
    Browse the repository at this point in the history

  67. cleanup/generalFinalization: overflow fix

    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    9b7912f View commit details
    Browse the repository at this point in the history

  68. Merge pull request #122 from COS301-SE-2024/cleanup/generalFinalization 

    cleanup/generalFinalization: overflow fix
    @RhevanKruger
    RhevanKruger authored Sep 29, 2024
    Configuration menu
    Copy the full SHA
    d4a7db6 View commit details
    Browse the repository at this point in the history

  69. testing_rhevan: removed unused imports for linting purposes

    @GerritPotgieter
    GerritPotgieter committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    9307cc7 View commit details
    Browse the repository at this point in the history

  70. Merge pull request #123 

    testing_rhevan
    @GerritPotgieter
    GerritPotgieter authored Sep 29, 2024
    Configuration menu
    Copy the full SHA
    9fabb4c View commit details
    Browse the repository at this point in the history

  71. testing_rhevan: removed database prints

    @GerritPotgieter
    GerritPotgieter committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    b16f0d4 View commit details
    Browse the repository at this point in the history

  72. Merge pull request #124 

    testing_rhevan
    @GerritPotgieter
    GerritPotgieter authored Sep 29, 2024
    Configuration menu
    Copy the full SHA
    6fc6039 View commit details
    Browse the repository at this point in the history

  73. Audio Integration

    @PineCone85
    PineCone85 committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    bc6ff6e View commit details
    Browse the repository at this point in the history

  74. Merge pull request #125 from COS301-SE-2024/NonFuncTesting 

    Audio Integration
    @PineCone85
    PineCone85 authored Sep 29, 2024
    Configuration menu
    Copy the full SHA
    b782c45 View commit details
    Browse the repository at this point in the history

  75. cleanup/generalFinalization: fixed first time video capturing not sho… 

    …wing audio mood
    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    c063ef7 View commit details
    Browse the repository at this point in the history

  76. Merge branch 'development' into cleanup/generalFinalization

    @RhevanKruger
    RhevanKruger authored Sep 29, 2024
    Configuration menu
    Copy the full SHA
    bbe5bcc View commit details
    Browse the repository at this point in the history

  77. cleanup/generalFinalization: disabled recording button during loading… 

    … times
    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    b980f0a View commit details
    Browse the repository at this point in the history

  78. Merge pull request #126 from COS301-SE-2024/cleanup/generalFinalization 

    cleanup/generalFinalization: fixed first time video capturing not sho…
    @RhevanKruger
    RhevanKruger authored Sep 29, 2024
    Configuration menu
    Copy the full SHA
    c84bb8b View commit details
    Browse the repository at this point in the history

  79. Merge remote-tracking branch 'origin/cleanup/generalFinalization' int… 

    …o cleanup/generalFinalization
    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    9ad0ea6 View commit details
    Browse the repository at this point in the history

  80. Merge pull request #127 from COS301-SE-2024/cleanup/generalFinalization 

    Cleanup/general finalization
    @RhevanKruger
    RhevanKruger authored Sep 29, 2024
    Configuration menu
    Copy the full SHA
    685702a View commit details
    Browse the repository at this point in the history

  81. testing updates

    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    3a774f2 View commit details
    Browse the repository at this point in the history

  82. Merge remote-tracking branch 'origin/development' into development

    @RhevanKruger
    RhevanKruger committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    327ef02 View commit details
    Browse the repository at this point in the history