Permalink
Commits on Apr 1, 2011
  1. Fixing a bug in settings.js

    committed Apr 1, 2011
  2. Stop tracking config.js

    committed Apr 1, 2011
  3. fixed manually

    nguyentq committed Apr 1, 2011
  4. solved conflicts

    nguyentq committed Apr 1, 2011
  5. Minor fix to compile error.

    ekryski committed Apr 1, 2011
  6. Fix conflict in dbAccess

    jewong committed Apr 1, 2011
  7. review i185

    wwywu committed Apr 1, 2011
  8. review i185

    wwywu committed Apr 1, 2011
  9. Merge branch 'master' of https://github.com/remyd/seng513project into…

    … remyd-master
    
    Conflicts:
    	lib/routes.js
    	node_modules/listIssues.js
    	node_modules/viewIssue.js
    	views/viewIssue.html
    AngelGarcia committed Apr 1, 2011
  10. Fixed if issue has no link

    russkubik committed Apr 1, 2011
  11. Merge remote-tracking branch 'upstream/master' into i185

    Conflicts:
    	lib/routes.js
    	node_modules/editIssue.js
    	node_modules/saveIssue.js
    	views/editIssue.html
    committed Apr 1, 2011
  12. more merge conflicts

    jjcmoore committed Apr 1, 2011
  13. merge conflicts

    jjcmoore committed Apr 1, 2011
  14. Implemented Captcha

    mumansoo committed Apr 1, 2011
Commits on Mar 31, 2011
  1. Merge remote branch 'Andrew/upload' into upload

    Conflicts:
    	db/fixtures/schema.sql
    	node_modules/viewIssue.js
    	views/viewIssue.html
    ekryski committed Mar 31, 2011
  2. viewIssue.js modified

    ynaxu committed Mar 31, 2011
  3. upload mechanism

    andrewxu committed Mar 31, 2011