forked from openedx/edx-platform
-
Notifications
You must be signed in to change notification settings - Fork 18
Release Notes 2014 09 18
stv edited this page Jul 12, 2018
·
1 revision
commit 4294908f0f089d63a7b0dfb67b2d133cab4d6562 (tag: edx-west/release-20140918, origin/release, release)
Merge: 8a09409 24b4813
Author: Jason Bau <[email protected]>
Date: Thu Sep 18 16:08:46 2014 -0700
Merge branch 'rc' into release
We merged upstream from tag hotfix-2014-09-12
.
Main feature merged seems to be the discussion forum supporting questions and discussions as distinct thread types.
commit 24b48133ff28ffd01bda37c7f7f8d61bede6b046
Author: Kevin Luo <[email protected]>
Date: Mon Sep 15 10:58:09 2014 -0700
Remove unicode conversion of email since it should always be unicode
commit c1cde7e79079394bb107d25089ebacd646f35b80
Author: Kevin Luo <[email protected]>
Date: Fri Sep 12 17:50:30 2014 -0700
Convert unicode emails to byte strings for CSV grade reports
commit 8c525d7618ca22525dfd7c41bc3cfb56475eddf9
Author: Ned Batchelder <[email protected]>
Date: Tue Sep 16 16:13:41 2014 -0400
Revert "username and email request for lti module"
This reverts commit 3f159ea52bc2bec2de436d25b1c6e61e02c375dd.
Conflicts:
common/lib/xmodule/xmodule/lti_module.py
lms/djangoapps/courseware/tests/test_lti_integration.py