Commits · 50300b9a252c1214b3cd7c49560141d789f3a097 · Eilert Tunheim / Bacheloroppgave_2022

Mar 04, 2022
- Merge branch 'Eilerts_branch' into 'master' · 50300b9a
  Eilert Tunheim authored 3 years ago
  
  Updated DB See merge request mesji/bacheloroppgave_2022!24
  50300b9a
- Updated DB · 79653c51
  Eilert Tunheim authored 3 years ago
  
  79653c51
- Merge branch 'Eilerts_branch' into 'master' · e26419c0
  Eilert Tunheim authored 3 years ago
  
  Updated css stylesheet and converted date from numbers to date format See merge request mesji/bacheloroppgave_2022!23
  e26419c0
- Updated css stylesheet and converted date from numbers to date format · 278fe7bc
  Eilert Tunheim authored 3 years ago
  
  278fe7bc
Mar 03, 2022
- Merge branch 'Eilerts_branch' into 'master' · 5150adbf
  Eilert Tunheim authored 3 years ago
  
  Rewritten gui from FXML file to custom JavaFX code. Basic gui with... See merge request mesji/bacheloroppgave_2022!22
  5150adbf
- Rewritten gui from FXML file to custom JavaFX code. Basic gui with... · 11097450
  Eilert Tunheim authored 3 years ago
  
  Rewritten gui from FXML file to custom JavaFX code. Basic gui with functionality to plot graphs to play around with.
  11097450
- Merge branch 'Eilerts_branch' into 'master' · f22da23e
  Eilert Tunheim authored 3 years ago
  
  Updated filepath for json key-file See merge request mesji/bacheloroppgave_2022!21
  f22da23e
- Updated filepath for json key-file · c4df1c96
  Eilert Tunheim authored 3 years ago
  
  c4df1c96
- Deleted Database folder · 85ab412e
  Eilert Tunheim authored 3 years ago
  
  85ab412e
- Merge branch 'Karins_branch' into 'master' · df3e9b7a
  Karin Pettersen authored 3 years ago
  
  Karins branch See merge request mesji/bacheloroppgave_2022!19
  df3e9b7a
- Created getBuilder · 17b8327c
  Karin Pettersen authored 3 years ago
  
  17b8327c
- Merge branch 'master' of git.gvk.idi.ntnu.no:mesji/bacheloroppgave_2022 into Karins_branch · af92e084
  Karin Pettersen authored 3 years ago
  
  Conflicts: src/main/java/com/application/DataBase/DB.java target/classes/com/application/Credentials.class target/classes/com/application/DataBase/DB.class target/classes/com/application/Main.class
  af92e084
- Merge branch 'Eilerts_branch' into 'master' · be2a6836
  Eilert Tunheim authored 3 years ago
  
  Updated the project structure and added comments See merge request mesji/bacheloroppgave_2022!20
  be2a6836
- Updated the project structure and added comments · 5e1eaddd
  Eilert Tunheim authored 3 years ago
  
  5e1eaddd
- Adding sort class · a7a00582
  Karin Pettersen authored 3 years ago
  
  a7a00582
Feb 28, 2022
- Created sort DB file · 7ae82906
  Karin Pettersen authored 3 years ago
  
  7ae82906
Feb 24, 2022
- Merge branch 'Eilerts_branch' into 'master' · 0781a105
  Eilert Tunheim authored 3 years ago
  
  Updated the project structure and added comments See merge request mesji/bacheloroppgave_2022!15
  0781a105
- Updated the project structure and added comments · 9003e73b
  Eilert Tunheim authored 3 years ago
  
  9003e73b
- Merge branch 'Eilerts_branch' into 'master' · 7347e0be
  Eilert Tunheim authored 3 years ago
  
  Eilerts branch See merge request mesji/bacheloroppgave_2022!14
  7347e0be
- Connection established! · fdd73087
  Eilert Tunheim authored 3 years ago
  
  fdd73087
Feb 22, 2022
- Potential contact with bigquery · bde961ad
  Eilert Tunheim authored 3 years ago
  
  bde961ad
- Merge branch 'Karins_branch' into 'master' · 7bbaf9fe
  Karin Pettersen authored 3 years ago
  
  Karins branch See merge request mesji/bacheloroppgave_2022!13
  7bbaf9fe
- Adding input.fxml · 7cef3c79
  Karin Pettersen authored 3 years ago
  
  7cef3c79
- Merge branch 'Eilerts_branch' into 'master' · fc2bacb2
  Eilert Tunheim authored 3 years ago
  
  Added authentication class See merge request mesji/bacheloroppgave_2022!12
  fc2bacb2
- Added authentication class · 8e10b7bb
  Eilert Tunheim authored 3 years ago
  
  8e10b7bb
- Merge branch 'Eilerts_branch' into 'master' · cf39e20e
  Eilert Tunheim authored 3 years ago
  
  added json file See merge request mesji/bacheloroppgave_2022!11
  cf39e20e
- added json file · 0a590bdc
  Eilert Tunheim authored 3 years ago
  
  0a590bdc
- Merge branch 'master' of git.gvk.idi.ntnu.no:mesji/bacheloroppgave_2022 into Karins_branch · 67150b75
  Karin Pettersen authored 3 years ago
  
  67150b75
- changing to master · 685c6ddd
  Karin Pettersen authored 3 years ago
  
  685c6ddd
- Merge branch 'Eilerts_branch' into 'master' · 2ca7d202
  Eilert Tunheim authored 3 years ago
  
  created GUI folder in resources See merge request mesji/bacheloroppgave_2022!10
  2ca7d202
- created GUI folder in resources · b5428f48
  Eilert Tunheim authored 3 years ago
  
  b5428f48
- Merge branch 'Mads_branch' into 'master' · a9060423
  Mads Greni Arnesen authored 3 years ago
  
  Added DB folder and imported bigquery libraries in POM file See merge request mesji/bacheloroppgave_2022!9
  a9060423
- Added DB folder and imported bigquery libraries in POM file · 21ba6b6a
  Mads Greni Arnesen authored 3 years ago
  
  21ba6b6a
- Merge branch 'Eilerts_branch' into 'master' · f99878a8
  Eilert Tunheim authored 3 years ago
  
  Updated GUI with some scalability See merge request mesji/bacheloroppgave_2022!6
  f99878a8
- Updated GUI with some scalability · 6980cbc5
  Eilert Tunheim authored 3 years ago
  
  6980cbc5
Feb 18, 2022
- Merge branch 'Eilerts_branch' into 'master' · 6435967f
  Eilert Tunheim authored 3 years ago
  
  Eilerts branch See merge request mesji/bacheloroppgave_2022!5
  6435967f
- Updated GUI with moelven logos, need to scale correctly · ad83bff3
  Eilert Tunheim authored 3 years ago
  
  ad83bff3
- Updated GUI with moelven logos, need to scale correctly · 0e00eee8
  Eilert Tunheim authored 3 years ago
  
  0e00eee8
- Merge branch 'master' of git.gvk.idi.ntnu.no:mesji/bacheloroppgave_2022 into Karins_branch · a0d1396f
  Karin Pettersen authored 3 years ago
  
  Conflicts: .idea/vcs.xml
  a0d1396f
- fixing master · c686a388
  Karin Pettersen authored 3 years ago
  
  c686a388