1. 19 Jun, 2013 2 commits
  2. 18 Jun, 2013 26 commits
  3. 14 Jun, 2013 2 commits
    • Merge remote-tracking branch 'origin/feature/nate/simple-chat' into… · 886c9880
      Merge remote-tracking branch 'origin/feature/nate/simple-chat' into edx-west/release-candidate-20130613
      
      Conflicts:
      	lms/templates/courseware/accordion.html
      	lms/templates/courseware/course_navigation.html
      	lms/templates/courseware/progress.html
      	lms/templates/navigation.html
      Jason Bau committed
    • Use /dev/urandom, not /dev/random · 9263f554
      /dev/random blocks if there is not enough entropy to return the
      requested number of bytes, and this turns out to hang our AWS
      servers. When generating random bytes for Jabber passwords, use
      /dev/urandom instead. We figure that this will be "secure enough,"
      since we'll have bigger problems if someone manages to get ahold
      of our /dev/urandom's seed value.
      Nate Hardison committed
  4. 12 Jun, 2013 1 commit
  5. 11 Jun, 2013 9 commits