Permalink
Switch branches/tags
Nothing to show
Commits on Apr 20, 2012
  1. Merge branch 'master' of https://github.com/madchicken/portfolios

    Daniel Francesconi committed Apr 20, 2012
    Conflicts:
    	src/main/webapp/WEB-INF/views/project/view.jsp
  2. Merged rating with head

    Ale committed Apr 20, 2012
  3. Merged rating with head

    Ale committed Apr 20, 2012
  4. Added rating through ajax!

    Ale committed Apr 20, 2012
  5. Upgrade voteDAO

    maurizio committed Apr 20, 2012
  6. Added missing pages

    maurizio committed Apr 20, 2012
  7. Merge branch 'master' of https://github.com/madchicken/portfolios.git

    Daniel Francesconi committed Apr 20, 2012
    Conflicts:
    	src/main/java/it/redoddity/portfolios/controller/ApplicationController.java
  8. modified view.jsp

    daniel committed Apr 20, 2012
  9. Merge branch 'master' of github.com:madchicken/portfolios

    maurizio committed Apr 20, 2012
    Conflicts:
    	src/main/webapp/template.jsp
  10. Added user profile and gravatar image

    maurizio committed Apr 20, 2012
  11. Merge branch 'master' of https://github.com/madchicken/portfolios

    Daniel Francesconi committed Apr 20, 2012
    Conflicts:
    	src/main/webapp/template.jsp
  12. Merge branch 'master' of github.com:madchicken/portfolios

    Maurizio Zampieri committed with maurizio Apr 20, 2012
    Conflicts:
    	src/main/java/it/redoddity/portfolios/controller/LoginController.java
    	src/main/java/it/redoddity/portfolios/dao/UserDAO.java
    	src/main/resources/database.xml
    	src/main/webapp/template.jsp
  13. Added profile update

    maurizio committed Apr 20, 2012
  14. Fixed CL/RF for winzoz

    Ale committed Apr 20, 2012
  15. Re-removed database.xml

    Ale committed Apr 20, 2012
    Added try-catch bocks in controllers
  16. Added create method

    Ale committed Apr 20, 2012
  17. Merge branch 'master' of github.com:madchicken/portfolios

    madchicken committed Apr 20, 2012
    Conflicts:
    	src/main/java/it/redoddity/portfolios/dao/ProjectDAO.java
  18. Fixed a projectDAO query

    Ale committed Apr 20, 2012
    Merged with head
  19. Added simple VoteDAO

    madchicken committed Apr 20, 2012
  20. Fixed a projectDAO query

    Ale committed Apr 20, 2012
    Merged with head
  21. Removed database.xml from repository

    Daniel Francesconi committed Apr 20, 2012
  22. Merge branch 'master' of https://github.com/madchicken/portfolios

    Daniel Francesconi committed Apr 20, 2012
  23. changes done in index.jsp & view.jsp

    daniel committed Apr 20, 2012