Commits · 24b48133ff28ffd01bda37c7f7f8d61bede6b046 · edx / edx-platform

18 Sep, 2014 2 commits
- Remove unicode conversion of email since it should always be unicode · 24b48133
  Kevin Luo committed Sep 17, 2014
  
  24b48133 Browse Files
- Convert unicode emails to byte strings for CSV grade reports · c1cde7e7
  Kevin Luo committed Sep 17, 2014
  
  c1cde7e7 Browse Files
17 Sep, 2014 3 commits
- fix embargo middleware test (expect 13 sql queries, not 12) · 7f7f2045
  Jason Bau committed Sep 16, 2014
  
  7f7f2045 Browse Files
- Revert "username and email request for lti module" · 8c525d76
```
This reverts commit 3f159ea5.

Conflicts:
	common/lib/xmodule/xmodule/lti_module.py
	lms/djangoapps/courseware/tests/test_lti_integration.py
```
  Ned Batchelder committed Sep 16, 2014
  8c525d76 Browse Files
- skip Bulk Settings test · 1a67b4fd
  Jason Bau committed Sep 16, 2014
  
  1a67b4fd Browse Files
16 Sep, 2014 2 commits

temporary theme hack (revert to old global header class) · 6dfed9ee
Jason Bau committed Sep 15, 2014

6dfed9ee Browse Files

Merge tag 'hotfix-2014-09-12' into rc · 2fc34276

Hotfix for Sep 12, 2014

Conflicts:
	AUTHORS
	cms/djangoapps/contentstore/views/course.py
	cms/envs/test.py
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/student/views.py
	common/lib/xmodule/xmodule/lti_module.py
	common/lib/xmodule/xmodule/modulestore/tests/test_cross_modulestore_import_export.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py
	common/static/coffee/src/discussion/views/discussion_thread_view_inline.coffee
	lms/djangoapps/courseware/tests/test_lti_integration.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/shoppingcart/processors/CyberSource2.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource2.py
	lms/djangoapps/verify_student/tests/test_views.py
	lms/djangoapps/verify_student/views.py
	lms/envs/common.py
	lms/envs/devstack.py
	lms/static/sass/multicourse/_account.scss
	lms/templates/main_django.html
	lms/templates/navigation.html
	lms/templates/registration/password_reset_complete.html
	lms/templates/registration/password_reset_confirm.html
	lms/urls.py
	pavelib/utils/test/utils.py
	requirements/edx/base.txt
	requirements/edx/github.txt

committed Sep 15, 2014

2fc34276 Browse Files

15 Sep, 2014 1 commit
- Merge remote-tracking branch 'origin/master' into rc · 70a8e36f
  Jason Bau committed Sep 15, 2014
  
  70a8e36f Browse Files
12 Sep, 2014 2 commits
- Update platform to use the latest ORA release · 04595a7b
  Andy Armstrong committed Sep 12, 2014
  
  04595a7b Browse Files
- Backport release to master · 05b52a55
```
from Stanford-Online:release
into Stanford-Online:master
```
  stv committed Sep 11, 2014
  05b52a55 Browse Files
11 Sep, 2014 11 commits

Release to production · 8a09409a
```
from Stanford-Online:rc
into Stanford-Online:release
```
stv committed Sep 11, 2014
8a09409a Browse Files
Cut release candidate · 358a39a0
```
from Stanford-Online:master
into Stanford-Online:rc
```
stv committed Sep 11, 2014
358a39a0 Browse Files
Merge pull request #120 · e4990860
```
from Stanford-Online:jbau/cybersource2
into Stanford-Online:master
```
stv committed Sep 11, 2014
e4990860 Browse Files
Merge pull request #121 · 9137bb54
```
from stvstnfrd:discuss/xss
into Stanford-Online:master
```
stv committed Sep 11, 2014
9137bb54 Browse Files

Patch XSS vulnerability in Discussions · 94be6cf8

This ports the upstream patch [1] into our fork. This change is made
manually, instead of cherry-picking, as we currently lack the most
recent changes to the discussions product [2].

We will pick up the recent changes (and patch tests) the next time we
merge from upstream.

[1] https://github.com/edx/edx-platform/commit/58553a7fb8fbc33dfd40c8e7ca39b0f896fb5b32
[2] https://github.com/edx/edx-platform/commit/988e4e6da5bf5f8db1cb269a82cc272c6d73ed72

committed Sep 11, 2014

94be6cf8 Browse Files

edx-west cybersource changes · 0f48fa3e
Jason Bau committed Sep 11, 2014

0f48fa3e Browse Files

Add verification for CyberSource2 implementation. · 490eaf10

Clean up shopping cart processor API.
Fix UUID JSON serialization bug in CyberSource2 implementation.
Update test suite to use new CyberSource2 implementation.
Fix i18n messages in CyberSource2
Enable CyberSource2 implementation by default.

Conflicts:
	lms/envs/dev.py

committed Sep 11, 2014

490eaf10 Browse Files

Merge pull request #5177 from edx/usman/fix-xml-imports · abf5f176
```
Moved imports to startup.py.
```
Adam committed Sep 11, 2014
abf5f176 Browse Files
Backport release to master · 632ef253
```
from Stanford-Online:release
into Stanford-Online:master
```
stv committed Sep 11, 2014
632ef253 Browse Files
Release to production · d03099fe
```
from Stanford-Online:rc
into Stanford-Online:release
```
stv committed Sep 11, 2014
d03099fe Browse Files
Moved imports to startup.py. · fc895fe8
Usman Khalid committed Sep 11, 2014

fc895fe8 Browse Files

10 Sep, 2014 9 commits
- Cut release candidate · ed5c106f
```
from Stanford-Online:master
into Stanford-Online:rc
```
  stv committed Sep 10, 2014
  ed5c106f Browse Files
- Merge pull request #5166 from edx/cdodge/hotfix-disable-social-auth-for-white-labels · 789193ef
```
make the 'ENABLE_THIRD_PARTY_AUTH' feature flag be microsite aware
```
  chrisndodge committed Sep 10, 2014
  789193ef Browse Files
- Merge pull request #119 · 9fbfd6c5
```
from stvstnfrd:image-modal/noop
into Stanford-Online:master
```
  stv committed Sep 10, 2014
  9fbfd6c5 Browse Files
- Merge pull request #5164 from edx/feanil/revert_gunicorn · 5f4dd7bb
```
Downgrade gunicorn.
```
  Feanil Patel committed Sep 10, 2014
  5f4dd7bb Browse Files
- Downgrade gunicorn. · 8f1a285c
  Feanil Patel committed Sep 10, 2014
  
  8f1a285c Browse Files
- NOOP on setupFullScreenImage · 6deaf667
```
Something appears to have changed, with regards to JavaScript loading
via Studio. The function in-question, `setupFullScreenImage`, still
behaves as intended in LMS. However, it fails in Studio despite being
(seemingly?) present in the compiled `cms-modules-xxx.js` file which is
loaded into Studio pages.

This commit defines an in-line NOOP definition of the function, to
ensure that it is always defined in Studio. The feature degrades
gracefully and will now simply render as an image link that leads
directly to the image URL.

Note: LMS is unaffected by both the problem and temporary solution.

This commit must be reverted once we diagnose and resolve the original
issue.
```
  stv committed Sep 10, 2014
  6deaf667 Browse Files
- make the 'ENABLE_THIRD_PARTY_AUTH' feature flag be microsite aware · 1379158e
  Chris Dodge committed Sep 10, 2014
  
  1379158e Browse Files
- Merge pull request #5157 from edx/will/fix-cc-unicode-error-rc · 0dbd3cd2
```
Fix a unicode error in CyberSource2
```
  Don Mitchell committed Sep 10, 2014
  0dbd3cd2 Browse Files
- Fix a unicode error in CyberSource2 · 5759a3fd
  Will Daly committed Sep 10, 2014
  
  5759a3fd Browse Files
09 Sep, 2014 2 commits
- AWS settings for XBlocks to have filesystem-like storage · 6d914e2b
```
Upgrades to latest pyfs to support auth not through environment variables
```
  Piotr Mitros committed Sep 09, 2014
  6d914e2b Browse Files
- CodeMirror should use monospace fonts. · 92a745b6
```
TNL-197
```
  Usman Khalid committed Sep 09, 2014
  92a745b6 Browse Files
08 Sep, 2014 8 commits
- Merge pull request #5135 from edx/renzo/fix-embargo-middleware-redux · 7c89b931
```
Do not call upper on a profile country code of None
```
  Renzo Lucioni committed Sep 08, 2014
  7c89b931 Browse Files
- Do not call upper on a profile country code of None · 12d5c9b2
  Renzo Lucioni committed Sep 08, 2014
  
  12d5c9b2 Browse Files
- Merge pull request #5130 from edx/renzo/autoreg-no-audit-mode · 80a0744e
```
Skip audit enrollment if user is in the experimental branch
```
  Renzo Lucioni committed Sep 08, 2014
  80a0744e Browse Files
- Skip audit enrollment if user is in the experimental branch · 0b2840ee
  Renzo Lucioni committed Sep 08, 2014
  
  0b2840ee Browse Files
- Merge pull request #5077 from edx/gprice/forum-cohort-selector-test · 3cf2481e
```
Test cohort selector in NewPostView
```
  Greg Price committed Sep 08, 2014
  3cf2481e Browse Files
- Merge pull request #5125 from edx/sarina/2014-09-08-translations · 47a412de
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Sep 08, 2014
  47a412de Browse Files
- Update translations (autogenerated message) · a37ec7a1
  Sarina Canelake committed Sep 08, 2014
  
  a37ec7a1 Browse Files
- Merge pull request #4560 from edx/zub/story/updatestudioimportstatusui · 87e292ba
```
show upload progress on import course view
```
  zubair-arbi committed Sep 08, 2014
  87e292ba Browse Files