Commits · Henry_Branch_SQL_Testing · Henry Fang (hef052) / Better Than Sliced Bread

04 Apr, 2020 15 commits
- overwriting accidental merge · 7df5fd15
  Tyler Vogel (tjv255) authored Apr 04, 2020
  
  7df5fd15
- Merge remote-tracking branch 'origin/Henry_Branch_SQL_Testing' into Henry_Branch_SQL_Testing · 849e81c6
  Tyler Vogel (tjv255) authored Apr 04, 2020
  
  849e81c6
- Merge branch 'revert-57497c65' into 'Henry_Branch_SQL_Testing' · 0d535526
  Tyler Vogel (tjv255) authored Apr 04, 2020
```
Revert "Hopefully the DB now works"

See merge request !6
```
  0d535526
- Revert "Hopefully the DB now works" · c7333b4a
  Tyler Vogel (tjv255) authored Apr 04, 2020
```
This reverts commit 57497c65
```
  c7333b4a
- Merge remote-tracking branch 'origin/Henry_Branch_SQL_Testing' into Henry_Branch_SQL_Testing · cc01a776
  Tyler Vogel (tjv255) authored Apr 04, 2020
```
# Conflicts:
#	BTSBFXML/src/sample/Bar.java
#	BTSBFXML/src/sample/BarsView.java
#	BTSBFXML/src/sample/Controller.java
#	BTSBFXML/src/sample/GameViewController.java
#	BTSBFXML/src/sample/Games.java
#	BTSBFXML/src/sample/HomeViewController.java
#	BTSBFXML/src/sample/Main.java
#	BTSBFXML/src/sample/Model.java
#	BTSBFXML/src/sample/ProfileViewController.java
#	BTSBFXML/src/sample/ReviewBarsView.java
#	BTSBFXML/src/sample/ReviewEditViewController.java
#	BTSBFXML/src/sample/ReviewView.java
#	BTSBFXML/src/sample/ReviewViewController.java
#	BTSBFXML/src/sample/StudioViewController.java
```
  cc01a776
- overwriting accidental merge · 263c80af
  Tyler Vogel (tjv255) authored Apr 04, 2020
  
  263c80af
- Merge branch 'revert-d63ffcf6' into 'Henry_Branch_SQL_Testing' · 3656ab9c
  Thomas McKeith (thm614) authored Apr 04, 2020
```
Revert "Merge branch 'Henry_Branch_SQL_Testing' of git.cs.usask.ca:hef052/better-than-sliced-bread"

See merge request !5
```
  3656ab9c
- Revert "Merge branch 'Henry_Branch_SQL_Testing' of git.cs.usask.ca:hef052/better-than-sliced-bread" · 9a3a1873
  Thomas McKeith (thm614) authored Apr 04, 2020
```
This reverts commit d63ffcf6
```
  9a3a1873
- Merge branch 'Henry_Branch_SQL_Testing' of git.cs.usask.ca:hef052/better-than-sliced-bread · d63ffcf6
  Thomas McKeith (thm614) authored Apr 04, 2020
```
I'm just trying to pull the remote branch
```
  d63ffcf6
- Got the DB Working · ad623ebb
  Thomas McKeith (thm614) authored Apr 04, 2020
  
  ad623ebb
- Hopefully the DB now works · 57497c65
  Thomas McKeith (thm614) authored Apr 04, 2020
  
  57497c65
- Replace 360DB3.db · a8fc025d
  Thomas McKeith (thm614) authored Apr 04, 2020
  
  a8fc025d
- Add db · 9983baac
  Thomas McKeith (thm614) authored Apr 04, 2020
  
  9983baac
- Add new db · 5f1d1049
  Thomas McKeith (thm614) authored Apr 04, 2020
  
  5f1d1049
- Update SQLConnector.java · b06dbf0f
  Thomas McKeith (thm614) authored Apr 04, 2020
  
  b06dbf0f
02 Apr, 2020 4 commits
- Created ReviewView, popup content for when review bar is clicked · 4812e0cc
  Tyler Vogel (tjv255) authored Apr 02, 2020
  
  4812e0cc
- fixed filter methods, work now! · 8cbdf5b9
  Tyler Vogel (tjv255) authored Apr 02, 2020
  
  8cbdf5b9
- added event when clicking review bar · 53cb02b2
  Tyler Vogel (tjv255) authored Apr 02, 2020
  
  53cb02b2
- Separated Bar and ReviewBar · 13b78f22
  Tyler Vogel (tjv255) authored Apr 02, 2020
  
  13b78f22
26 Mar, 2020 3 commits
- added different click event when review bars are pressed · 58fbb6f0
  Tyler Vogel (tjv255) authored Mar 26, 2020
  
  58fbb6f0
- Updated ProfileView, so it looks similar to StudioView · 88834e8e
  Tyler Vogel (tjv255) authored Mar 26, 2020
  
  88834e8e
- Tidied up StudioView.fxml · af51a670
  Tyler Vogel (tjv255) authored Mar 26, 2020
  
  af51a670
25 Mar, 2020 18 commits
- Update README.md · 2d047c52
  Tyler Vogel (tjv255) authored Mar 25, 2020
  
  2d047c52
- Update README.md · 3ff3b01d
  Tyler Vogel (tjv255) authored Mar 25, 2020
  
  3ff3b01d
- Update README.md · c2b750f0
  Jared Espenant (jae608) authored Mar 25, 2020
  
  c2b750f0
- Update README.md · 3cbe5a70
  Tyler Vogel (tjv255) authored Mar 25, 2020
  
  3cbe5a70
- Tyler: adding stuff I implemented in from a different branch · 661bc683
  Tyler Vogel (tjv255) authored Mar 25, 2020
  
  661bc683
- DB hooked up but not querying properly · 27119db9
  Jared Espenant (jae608) authored Mar 25, 2020
  
  27119db9
- Update SQLConnector.java · 30ae7c99
  Thomas McKeith (thm614) authored Mar 25, 2020
  
  30ae7c99
- Merge remote-tracking branch 'origin/Henry_Branch_SQL_Testing' into Henry_Branch_SQL_Testing · c783f7a7
  Jared Espenant (jae608) authored Mar 25, 2020
  
  c783f7a7
- We think we got the database hooked up (yay) · 1bd5c8a2
  Jared Espenant (jae608) authored Mar 25, 2020
  
  1bd5c8a2
- Upload New File · cc944fa9
  Thomas McKeith (thm614) authored Mar 25, 2020
  
  cc944fa9
- Added javafx libs and SQL connector code · 43f776ed
  Jared Espenant (jae608) authored Mar 25, 2020
  
  43f776ed
- Moves SQL to lib folder · 12659683
  Jared Espenant (jae608) authored Mar 25, 2020
  
  12659683
- Upload New File · bb050e3f
  Thomas McKeith (thm614) authored Mar 25, 2020
  
  bb050e3f
- Delete mysql-connector-java-8.0.19.jar · 37dd405c
  Thomas McKeith (thm614) authored Mar 25, 2020
  
  37dd405c
- Upload New File · 38dc822f
  Thomas McKeith (thm614) authored Mar 25, 2020
  
  38dc822f
- Delete mysql-connector-java-8.0.19.jar · 90f548bc
  Thomas McKeith (thm614) authored Mar 25, 2020
  
  90f548bc
- Add Libraries, to contain modules for java · ba46c79b
  Thomas McKeith (thm614) authored Mar 25, 2020
  
  ba46c79b
- Merge remote-tracking branch 'origin/Henry_branch' into Henry_branch · afced733
  ClamBakery authored Mar 25, 2020
  
  afced733