Commits · 09972c7973627094852192c3fd160d5a54cc0f83 · edx / edx-platform

09 Apr, 2014 1 commit
- Message changed for course import when timeout. · 09972c79
```
STUD-1283
```
  Waheed Ahmed committed Apr 09, 2014
  09972c79 Browse Files
08 Apr, 2014 35 commits
- Merge pull request #3270 from edx/gprice/openid-dialog-text · 4b25f4e6
```
Update OpenID dialog text
```
  Greg Price committed Apr 08, 2014
  4b25f4e6 Browse Files
- Merge pull request #3268 from edx/ned/fix-terman-name · 5673a6a9
```
Fix Chris Terman's email address
```
  Ned Batchelder committed Apr 08, 2014
  5673a6a9 Browse Files
- Update OpenID dialog text · e1de25e1
```
We want to indicate more clearly that the information that we transmit
to the third party is governed by their terms of service and privacy
policy.
```
  Greg Price committed Apr 08, 2014
  e1de25e1 Browse Files
- Fix Chris Terman's email address · db747dfd
  Ned Batchelder committed Apr 08, 2014
  
  db747dfd Browse Files
- Merge pull request #2775 from edx/dcs/wiki-no-middleware · e5d79768
```
Refactored course_nav middleware to isolate the django-wiki hack, remove unnecessary code, and clarify what it's doing.
```
  Dave St.Germain committed Apr 08, 2014
  e5d79768 Browse Files
- Refactored course_nav middleware to isolate the django-wiki hack, · 66024420
```
remove unnecessary code, and clarify what it's doing.
```
  Dave St.Germain committed Apr 08, 2014
  66024420 Browse Files
- Merge pull request #3261 from edx/jarv/limit-to-active-users · b591455d
```
Only display active users for the certificate report
```
  John Jarvis committed Apr 08, 2014
  b591455d Browse Files
- Merge pull request #3260 from edx/sylvia/documentation/DOC-228 · 344a6d13
```
Remove "Appendix E" from doc title; add warning re: identical URLs for O...
```
  srpearce committed Apr 08, 2014
  344a6d13 Browse Files
- Small correction · 9e82f4c6
  Sylvia Pearce committed Apr 08, 2014
  
  9e82f4c6 Browse Files
- Merge pull request #3214 from edx/sarina/remove-weird-i18n-strings · 0d1545a8
```
Sarina/remove weird i18n strings
```
  Sarina Canelake committed Apr 08, 2014
  0d1545a8 Browse Files
- Only display active users for the certificate report · ff8c14e8
```
Also removes the unnecessary pre-fetch.
For certificate generations we will continue to generate certs for
both active and inactive users.

For the report we only display active users since it was confusing
due to the instructor dashboard only displaying active users.
```
  John Jarvis committed Apr 08, 2014
  ff8c14e8 Browse Files
- Unicode support for course names in reverification flow · 9a352b91
  Sarina Canelake committed Apr 08, 2014
  
  9a352b91 Browse Files
- Put mailto and em tags outside i18n strings · 034105d2
```
Signup modal

Contact us form

courseware-error message
```
  Sarina Canelake committed Apr 08, 2014
  034105d2 Browse Files
- Fix i18n'd strings to be easier for translators to understand · 2d08b3a3
```
Signup modal

Just translate discussion sr text

Markdown editor help

Help modal and reverify dash
```
  Sarina Canelake committed Apr 08, 2014
  2d08b3a3 Browse Files
- Merge pull request #3238 from marcore/master · b18a0675
```
The link to TECH_SUPPORT_EMAIL should have a mailto: protocol !
```
  David Baumgold committed Apr 08, 2014
  b18a0675 Browse Files
- Remove "Appendix E" from doc title; add warning re: identical URLs for ORA · 8e08275b
  Sylvia Pearce committed Apr 08, 2014
  
  8e08275b Browse Files
- Merge pull request #3252 from edx/anton/disable-flaky-acceptance-tests · ac49101e
```
Video: Disable flaky acceptance tests.
```
  Anton Stupak committed Apr 08, 2014
  ac49101e Browse Files
- Update testing.md file. · acff3cbe
```
Added information on output folder for auto screenshots.
```
  Valera Rozuvan committed Apr 08, 2014
  acff3cbe Browse Files
- Update testing.md file. · e7a2349c
```
How to better debug acceptance tests in local Vagrant dev.
```
  Valera Rozuvan committed Apr 08, 2014
  e7a2349c Browse Files
- Disable flaky acceptance tests. · 6c72cce5
  polesye committed Apr 08, 2014
  
  6c72cce5 Browse Files
- Merge pull request #3248 from edx/sanchez/ora2-2014-04-08 · 7e8d9206
```
Updating ORA2 requirements for patch fix
```
  Stephen Sanchez committed Apr 08, 2014
  7e8d9206 Browse Files
- Merge pull request #3242 from edx/will/studio-import-private-fix · ffeb2f22
```
Allow import of native XBlocks in draft
```
  Will Daly committed Apr 08, 2014
  ffeb2f22 Browse Files
- Updating ORA2 requirements for patch fix · 3f184082
  Stephen Sanchez committed Apr 08, 2014
  
  3f184082 Browse Files
- Merge pull request #3247 from edx/anton/disable-flaky-video-test · f2dd6eac
```
Disable flaky acceptance test.
```
  Anton Stupak committed Apr 08, 2014
  f2dd6eac Browse Files
- Merge pull request #3245 from edx/oleg/fix-doublequoting · cd839063
```
Fix doublequoting. BLD-812.
```
  Oleg Marshev committed Apr 08, 2014
  cd839063 Browse Files
- Disable flaky test. · a9b26afd
  polesye committed Apr 08, 2014
  
  a9b26afd Browse Files
- Remove double quoting. · 015bd57d
  Oleg Marshev committed Apr 08, 2014
  
  015bd57d Browse Files
- Merge pull request #3052 from edx/oleg/add-context-id · d66e6cbc
```
LTI context_id. BLD-584.
```
  Oleg Marshev committed Apr 08, 2014
  d66e6cbc Browse Files
- Allow import of native XBlocks in draft · 08413afd
```
Added tests for importing a pure XBlock
```
  Will Daly committed Apr 08, 2014
  08413afd Browse Files
- Add context_id. · 8a202424
  Oleg Marshev committed Apr 08, 2014
  
  8a202424 Browse Files
- Merge pull request #3040 from edx/oleg/fix-resource-link-id · be4e9cb5
```
LTI resource_link_id. BLD-768.
```
  Alexander Kryklia committed Apr 08, 2014
  be4e9cb5 Browse Files
- Change resource_link_id on import (BLD-768). · 882a1e0f
```
LTI: Update resource_link_id to change on import to another system or context (BLD-768).
```
  Oleg Marshev committed Apr 08, 2014
  882a1e0f Browse Files
- Add my name! · cc7b13a8
  marcore committed Apr 08, 2014
  
  cc7b13a8 Browse Files
- Merge pull request #3173 from edx/valera/emerald_bay · 28f366a9
```
Adding ability to capture auto screenshots on demand
```
  Valera Rozuvan committed Apr 08, 2014
  28f366a9 Browse Files
- Add auto screenshot functionality. · 668c476a
  Valera Rozuvan committed Apr 08, 2014
  
  668c476a Browse Files
07 Apr, 2014 4 commits
- Merge pull request #3188 from edx/ahodges/documentation/UTF8 · 05d02e5a
```
Ahodges/documentation/utf8
```
  Alison Hodges committed Apr 07, 2014
  05d02e5a Browse Files
- DOC-117, Jennifer Akana's review comments · 92de6ddd
  Alison Hodges committed Apr 07, 2014
  
  92de6ddd Browse Files
- Merge pull request #3225 from edx/will/studio-import-xblock-fixes · 5b305476
```
Explicitly re-save XBlock fields during import
```
  Will Daly committed Apr 07, 2014
  5b305476 Browse Files
- Merge pull request #3235 from edx/sarina/040714-language-update · c51d4181
```
Sarina/040714 language update
```
  Sarina Canelake committed Apr 07, 2014
  c51d4181 Browse Files