Skip to content
Permalink
Branch: master
Commits on Apr 21, 2017
  1. changes made

    afortuna2016
    afortuna2016 committed Apr 21, 2017
  2. Merge branch 'master' of

    Joe Hill
    Joe Hill committed Apr 21, 2017
    https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
    
    Conflicts:
    	bin/model/FinancialStatement.class
    	bin/view/CharityWindow$2.class
    	src/model/FinancialStatement.java
  3. Just trying to pull..... AGAIN

    Joe Hill
    Joe Hill committed Apr 21, 2017
  4. getters added, updated mostof FS Statement

    Sara-Sadiya Sara-Sadiya
    Sara-Sadiya authored and Sara-Sadiya committed Apr 21, 2017
  5. getters for FS

    Joe Hill
    Joe Hill committed Apr 21, 2017
  6. Merge branch 'master' of

    Joe Hill
    Joe Hill committed Apr 21, 2017
    https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
    
    Conflicts:
    	bin/.gitignore
    	bin/view/FSWindow$1.class
    	bin/view/FSWindow.class
  7. a;dljfaldksf

    Sara-Sadiya Sara-Sadiya
    Sara-Sadiya authored and Sara-Sadiya committed Apr 21, 2017
  8. sup

    Joe Hill
    Joe Hill committed Apr 21, 2017
  9. hi

    Sara-Sadiya Sara-Sadiya
    Sara-Sadiya authored and Sara-Sadiya committed Apr 21, 2017
Commits on Apr 19, 2017
  1. Update FSWindow.java

    vip14008 committed Apr 19, 2017
  2. stuff

    Joe Hill
    Joe Hill committed Apr 19, 2017
Commits on Apr 16, 2017
  1. Merge branch 'master' of

    Joe Hill
    Joe Hill committed Apr 16, 2017
Commits on Apr 14, 2017
  1. Just tryna pull

    Joe Hill
    Joe Hill committed Apr 14, 2017
  2. lotsa stuff

    jackie
    jackie committed Apr 14, 2017
Commits on Apr 11, 2017
  1. sup

    Joe Hill
    Joe Hill committed Apr 11, 2017
Commits on Apr 9, 2017
  1. gameboard gui

    jackie
    jackie committed Apr 9, 2017
Commits on Apr 8, 2017
Commits on Apr 7, 2017
  1. forgot to make this before

    sss13010 committed Apr 7, 2017
  2. Create FSWindow.java

    sss13010 committed Apr 7, 2017
    Ignore everything. I just threw stuff from the other classes as a reference code for now.
  3. Just changed the view class names

    Joe Hill
    Joe Hill committed Apr 7, 2017
  4. Merge branch 'master' of

    Joe Hill
    Joe Hill committed Apr 7, 2017
    https://github.uconn.edu/joh13010/2102-Group-Project-Spring-2017.git
    
    Conflicts:
    	bin/model/CharityTile.class
    	bin/model/ChildTile.class
    	bin/model/DoodadTile.class
    	bin/model/FinancialStatement.class
  5. Just trying to pull

    Joe Hill
    Joe Hill committed Apr 7, 2017
  6. Create SDStockCard.java

    sss13010 committed Apr 7, 2017
  7. Create DoodadCard.java

    sss13010 committed Apr 7, 2017
  8. Create ChildCard.java

    sss13010 committed Apr 7, 2017
  9. Create DealCard.java

    sss13010 committed Apr 7, 2017
  10. Create CharityCard.java

    vip14008 committed Apr 7, 2017
    This is the charity card pop up
  11. todo

    afortuna2016
    afortuna2016 committed Apr 7, 2017
You can’t perform that action at this time.