Permalink
Switch branches/tags
Commits on Oct 12, 2012
  1. Merge pull request #1092 from Stanford-Online/jbau-exception-snippet

    wescott committed Oct 12, 2012
    adding User agent to exception snippet
  2. Merge pull request #1091 from Stanford-Online/wescott-master-khan-bug…

    Jason Bau committed Oct 12, 2012
    …fixes
    
    Wescott master khan bugfixes (Issue #641)
  3. more consistency in variable assignment

    Jason Bau committed Oct 12, 2012
  4. adding User agent to exception snippet

    Jason Bau committed Oct 12, 2012
  5. Merge branch 'master' of https://github.com/Stanford-Online/class2go

    wescott committed Oct 12, 2012
    …into wescott-master-khan-bugfixes
  6. Hide player until everything is ready and loaded

    wescott committed Oct 12, 2012
    playerdiv is set to display:none in CSS, and displayed with
    jQuery show() after other stuff is init-ed
    	modified:   khan/static/latestKhan/css/c2g-khan.css
    	modified:   templates/videos/view.html
  7. Merge pull request #1088 from Stanford-Online/sef-work

    wescott committed Oct 12, 2012
    Nightly bug report improvements: closed bugs, revised dev list (master) (#1080)
  8. revise dev list; closed yesterday (#1080)

    sefk committed Oct 12, 2012
    Also some general code goodness, especially factoring out the quirky
    code figuring out yesterday
  9. Merge pull request #1085 from Stanford-Online/jbau-exception-snippet

    wescott committed Oct 12, 2012
    #1050 turn off 404 reporting via email
Commits on Oct 11, 2012
  1. #1050 turn off 404 reporting via email

    Jason Bau committed Oct 11, 2012
  2. Merge pull request #1083 from Stanford-Online/jbau-reorder-hotfix

    wescott committed Oct 11, 2012
    #1081 fixes exercise reordering
  3. #1081 accidentally commented something out

    Jason Bau committed Oct 11, 2012
  4. #1081 fixes exercise reordering

    Jason Bau committed Oct 11, 2012
  5. Merge pull request #1079 from tiffanyl/master

    Jason Bau committed Oct 11, 2012
    Changed email address to c2g-techsupport
  6. Merge pull request #1068 from Stanford-Online/sef-work

    Jason Bau committed Oct 11, 2012
    Configure snippets in database.py (#1050)
  7. Merge pull request #1030 from Stanford-Online/jinpa-work

    sefk committed Oct 11, 2012
    Change wording on "previous" and "next" buttons to include the word "vid...
  8. Merge pull request #1051 from Stanford-Online/jbau-exception-snippet

    sefk committed Oct 11, 2012
    implements #1050 short snippets for exceptions
  9. Merge pull request #1056 from nveid/master

    sefk committed Oct 11, 2012
    Portable Login Process
  10. Merge pull request #1066 from Stanford-Online/jbau-prev-next-bug

    sefk committed Oct 11, 2012
    #1065 patches for making prev/next respect delete/livedate
  11. Merge pull request #1055 from Stanford-Online/jbau-len-to-count

    sefk committed Oct 11, 2012
    Expensive len(QuerySet) ops -> use count() and exists() (#1054)
Commits on Oct 10, 2012
  1. Converted file tabs to spaces per project coding standard in user_pro…

    web102 committed Oct 10, 2012
    …filing_middleware.py
  2. Merge pull request #1063 from Stanford-Online/dca_working

    Jason Bau committed Oct 10, 2012
    Optimize video code on materials page3. (#1024)
  3. better formatting for snippets #1050

    Jason Bau committed Oct 10, 2012
  4. Merge branch 'master' of http://github.com/Stanford-Online/class2go i…

    U-dcadams-lt\David committed Oct 10, 2012
    …nto dca_working
  5. Merge pull request #1048 from Stanford-Online/wescott-master-khan-bug…

    Jason Bau committed Oct 10, 2012
    …fixes
    
    Wescott master khan bugfixes
  6. Merge pull request #1057 from Stanford-Online/sef-work

    wescott committed Oct 10, 2012
    small sprint-16 enh
  7. Add dev env to deploy-reset deploy step

    sefk committed Oct 10, 2012
    Easy to miss this if you're testing on dev
  8. #1050 adding middleware files

    Jason Bau committed Oct 10, 2012
  9. Expensive len(QuerySet) ops -> use count() and exists() (#1054)

    Jason Bau committed Oct 10, 2012
    Also cleaned up
    * In views.py remove assignment to object field that's not defined
      in the model, which means it would never get saved anyway--NO-OP
    * Remove propagation in settings.py for database logs, which were
      causing duplicate lines per log entry