Permalink
Commits on Mar 11, 2012
  1. Merge branch 't6_ajax' into t7_reversed

    Conflicts:
    	testsobol/mainapp/tests.py
    	testsobol/mainapp/utils.py
    committed Mar 11, 2012
  2. Merge branch 't5_forms_and_auth' into t6_ajax

    Conflicts:
    	testsobol/mainapp/tests.py
    	testsobol/mainapp/views.py
    committed Mar 11, 2012
  3. Merge branch 't4_settings_in_context' into t5_forms_and_auth

    Conflicts:
    	testsobol/mainapp/models.py
    	testsobol/mainapp/tests.py
    	testsobol/mainapp/views.py
    	testsobol/templates/index.html
    	testsobol/urls.py
    committed Mar 11, 2012
  4. Merge branch 't2_request_middleware' into t4_settings_in_context

    Conflicts:
    	testsobol/mainapp/tests.py
    committed Mar 11, 2012
  5. Merge branch 't1_show_bio' into t2_request_middleware

    Conflicts:
    	testsobol/mainapp/tests.py
    	testsobol/mainapp/views.py
    	testsobol/urls.py
    committed Mar 11, 2012
  6. many fixes

    committed Mar 11, 2012
Commits on Feb 28, 2012
  1. tests pass

    committed Feb 28, 2012
  2. tests fail

    committed Feb 28, 2012
  3. Merge branch 't6_ajax'

    committed Feb 28, 2012
  4. tests pass

    committed Feb 28, 2012
  5. tests fail

    committed Feb 28, 2012
  6. tests pass

    committed Feb 28, 2012
  7. tests fail

    committed Feb 28, 2012
Commits on Feb 22, 2012
  1. tests pass

    committed Feb 22, 2012
  2. tests fail

    committed Feb 22, 2012
  3. tests pass

    committed Feb 22, 2012
  4. tests fail

    committed Feb 22, 2012
  5. Merge branch 't1_show_bio'

    committed Feb 22, 2012
  6. tests pass

    committed Feb 22, 2012
  7. tests fail

    committed Feb 22, 2012
  8. Init commit

    committed Feb 22, 2012