Permalink
Switch branches/tags
Nothing to show
Commits on Mar 31, 2015
  1. Merge pull request #3 from rlr/OOOOPS

    kumar303 committed Mar 31, 2015
    Fix #facepalm overwriting json var.
  2. Fix #facepalm overwriting json var.

    rlr committed Mar 31, 2015
  3. Merge pull request #2 from rlr/django-17

    kumar303 committed Mar 31, 2015
    Use builtin json.
  4. Use builtin json.

    rlr committed Mar 31, 2015
    Django no longer ships with simplejson since v1.7.
Commits on Mar 23, 2014
  1. Merge pull request #1 from rlr/django16

    kumar303 committed Mar 23, 2014
    Fix imports for django 1.6
Commits on Mar 19, 2014
  1. Fix imports for django 1.6

    rlr committed Mar 19, 2014
Commits on Dec 8, 2010
  1. Merge branch 'master' of https://github.com/codysoyland/django-qunit

    kumar303 committed Dec 8, 2010
    Conflicts:
    	django_qunit/media/qunit/qunit.css
    	django_qunit/media/qunit/qunit.js
    
    (conflicts were from previously pulled commits, overriding them with the latest qunit)
Commits on Dec 7, 2010
Commits on Nov 5, 2010
Commits on Jun 12, 2010
Commits on Apr 2, 2010
  1. Add support for "subsuites" and "suite.json" config files.

    codysoyland committed Apr 2, 2010
    - Scan directories to include links to suites.
    - Link to parent directory.
    - Support "suite.json" to name the suite and add additional javascript includes.
    - Rename 'run_tests.sh' to 'runserver.sh' and remove webbrowser loading (annoying).
Commits on Apr 1, 2010
  1. Fix error in license file.

    codysoyland committed Apr 1, 2010
  2. Initial commit.

    codysoyland committed Apr 1, 2010