Oliver Kleinecke kleineckeol72024
Repositories Public Activity Starred Repositories
Loading Heatmap…

kleineckeol72024 pushed to master at siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

11 months ago

kleineckeol72024 pushed to master at siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

11 months ago

kleineckeol72024 pushed to master at siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

  • 0948d7f44f - added audio and motion detection again

11 months ago

kleineckeol72024 pushed to master at siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

  • c8b947bb57 - added video detection again
  • 4a1c554a09 - 'removed' files added to project
  • eb1629a700 removed Fragment classes from MainActivity - work in Progress
  • b97c494427 Merge branch 'master' into prepareMaster # Conflicts: # app/src/main/java/com/example/ueberwachungssystem/Detection/DetectionReport.java # app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java # app/src/main/java/com/example/ueberwachungssystem/Detection/MicrophoneDetector.java # app/src/main/java/com/example/ueberwachungssystem/Detection/VideoDetector.java # app/src/main/java/com/example/ueberwachungssystem/MainActivity.java # app/src/main/java/com/example/ueberwachungssystem/WifiCommunication.java # app/src/main/res/layout/activity_main.xml
  • 6a251fbb27 removed Fragment classes from MainActivity - removed fragments - removed unnecessary classes - removed unnecessary code
  • Compare 6 commits »

11 months ago

kleineckeol72024 pushed to prepareMaster at siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

11 months ago

kleineckeol72024 pushed to prepareMaster at siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

  • eb1629a700 removed Fragment classes from MainActivity - work in Progress
  • b97c494427 Merge branch 'master' into prepareMaster # Conflicts: # app/src/main/java/com/example/ueberwachungssystem/Detection/DetectionReport.java # app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java # app/src/main/java/com/example/ueberwachungssystem/Detection/MicrophoneDetector.java # app/src/main/java/com/example/ueberwachungssystem/Detection/VideoDetector.java # app/src/main/java/com/example/ueberwachungssystem/MainActivity.java # app/src/main/java/com/example/ueberwachungssystem/WifiCommunication.java # app/src/main/res/layout/activity_main.xml
  • 5007623acc Version 4.1 with new PopUpClass
  • 3d9e6b7a3e Merge branch 'ms_service_copie'
  • 61cad34931 Version 4 working
  • Compare 20 commits »

11 months ago

kleineckeol72024 pushed to prepareMaster at siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

  • 6a251fbb27 removed Fragment classes from MainActivity - removed fragments - removed unnecessary classes - removed unnecessary code

11 months ago

kleineckeol72024 pushed to koLayoutTest at siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

  • 076db89147 removed Fragment classes from MainActivity - changed buttons, added fragments

11 months ago

kleineckeol72024 pushed to koLayoutTest at siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

11 months ago

kleineckeol72024 pushed to master at siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

  • 061646a7d6 Merge remote-tracking branch 'origin/master' # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/example/ueberwachungssystem/MainActivity.java # app/src/main/res/layout/activity_main.xml
  • 746eec18ba removed Fragment classes from MainActivity
  • 44e056b5fe Merge branch 'ko' # Conflicts: # app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
  • df1fefef5f added Toggle Button to start Cam Detection
  • 5bcd465ecc Merge branch 'master' into ko # Conflicts: # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/res/layout/activity_main.xml # gradle/wrapper/gradle-wrapper.properties
  • Compare 12 commits »

11 months ago

kleineckeol72024 pushed to ko at siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

11 months ago

kleineckeol72024 pushed to master at siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

  • 44e056b5fe Merge branch 'ko' # Conflicts: # app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
  • df1fefef5f added Toggle Button to start Cam Detection
  • 5bcd465ecc Merge branch 'master' into ko # Conflicts: # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/res/layout/activity_main.xml # gradle/wrapper/gradle-wrapper.properties
  • a6fdf3f774 added landscape xml file
  • b46db4cdfc reworked Button Positions
  • Compare 10 commits »

11 months ago

kleineckeol72024 pushed to ko at siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

  • df1fefef5f added Toggle Button to start Cam Detection
  • 5bcd465ecc Merge branch 'master' into ko # Conflicts: # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/res/layout/activity_main.xml # gradle/wrapper/gradle-wrapper.properties
  • 11dbcd0362 Merge branch 'bk_video' of siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1 into master
  • 047d45f1cb Added comments to VideoDetector class
  • 95919a6602 preparing branch for merge
  • Compare 35 commits »

11 months ago

kleineckeol72024 pushed to ko at siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

11 months ago

kleineckeol72024 pushed to ko at siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

11 months ago

kleineckeol72024 pushed to ko at siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

  • 74eb3e0d98 Added Toggle Buttons for Detection Mode Added Scrollview for alarm

11 months ago

kleineckeol72024 pushed to ko at siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

11 months ago

kleineckeol72024 pushed to ko at siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1

1 year ago