Commits · d4201f028e4d7f34f4a27e694f945f407188644e · edx / edx-platform · GitLab

22 Apr, 2014 18 commits
- Merge pull request #3413 from edx/bugfix/ichuang/multiple-choice-question-hints · d4201f02
```
bugfix: allow multiple choice questions to display hints

Thanks, @sarina, @pmitros
```
  ichuang committed Apr 22, 2014
  d4201f02 Browse Files
- Merge pull request #3420 from edx/ora2/release-2014-04-22T15.15 · 28e2bf3f
```
Release for Apr 22, 2014
```
  Stephen Sanchez committed Apr 22, 2014
  28e2bf3f Browse Files
- Merge pull request #3421 from edx/renzo/segment-io-identify-fix · 26fdf5d2
```
Correct ordering of Segment.io identify and page calls
```
  Renzo Lucioni committed Apr 22, 2014
  26fdf5d2 Browse Files
- Correct ordering of Segment.io identify and page calls · cfd841b8
  Renzo Lucioni committed Apr 22, 2014
  
  cfd841b8 Browse Files
- Release for Apr 22, 2014 · cd412448
  Stephen Sanchez committed Apr 22, 2014
  
  cd412448 Browse Files
- Merge pull request #3416 from edx/sarina/042214-language-update · deb9eb82
```
Sarina/042214 language update
```
  Sarina Canelake committed Apr 22, 2014
  deb9eb82 Browse Files
- Update translations (autogenerated message) · 3953b97c
  Sarina Canelake committed Apr 22, 2014
  
  3953b97c Browse Files
- Merge pull request #3415 from edx/dcs/codejail-version · 00c7100e
```
Update codejail to enable logging
```
  Dave St.Germain committed Apr 22, 2014
  00c7100e Browse Files
- Add new languages from Transifex · f4332bb4
  Sarina Canelake committed Apr 22, 2014
  
  f4332bb4 Browse Files
- Update codejail to enable logging · 5bd944a3
  Dave St.Germain committed Apr 22, 2014
  
  5bd944a3 Browse Files
- Merge pull request #3405 from edx/ahodges/documentation/pythonsnippets · 54081d74
```
DOC-279, correct add discussion category steps
```
  Alison Hodges committed Apr 22, 2014
  54081d74 Browse Files
- DOC-279, correct add discussion category steps · 6b26c82c
```
also removed "static" for pages
```
  Alison Hodges committed Apr 22, 2014
  6b26c82c Browse Files
- Merge pull request #3397 from edx/sarina/lms-2551 · a52540c8
```
Wording for batch beta email add with autoenroll (LMS-2551)
```
  Sarina Canelake committed Apr 22, 2014
  a52540c8 Browse Files
- Merge pull request #3407 from edx/ahodges/documentation/DOC264 · bed7f2c8
```
Ahodges/documentation/doc264
```
  Alison Hodges committed Apr 22, 2014
  bed7f2c8 Browse Files
- DOC-264, clarify that students can opt out of email · 03da681d
  Alison Hodges committed Apr 22, 2014
  
  03da681d Browse Files
- Merge pull request #3414 from edx/anton/i18n-choice-response · 581716cb
```
MultipleChoiceResponse i18n.
```
  Anton Stupak committed Apr 22, 2014
  581716cb Browse Files
- BLD-717: MultipleChoiceResponse i18n. · ca93855f
  polesye committed Apr 22, 2014
  
  ca93855f Browse Files
- bugfix: allow multiple choice questions to display hints · f91b9656
  ichuang committed Apr 21, 2014
  
  f91b9656 Browse Files
19 Apr, 2014 1 commit
- Merge pull request #3094 from yarko/yarko/fix-paver-env-assets · b44ed806
```
ensure SERVICE_VARIANT set; pass theme to coffeescript;
```
  David Baumgold committed Apr 18, 2014
  b44ed806 Browse Files
18 Apr, 2014 9 commits
- fix class var; set SERVICE_VARIANT to lms by default if unset (helps "paver --help" work cleanly) · 97ecc7a7
  yarko committed Apr 18, 2014
  
  97ecc7a7 Browse Files
- remove theme_paths var, per @sefk · cc86b656
  yarko committed Apr 18, 2014
  
  cc86b656 Browse Files
- Merge pull request #3387 from edx/zoldak/update_page_objects · a78b3225
```
Update bok-choy page definitions
```
  Jay Zoldak committed Apr 18, 2014
  a78b3225 Browse Files
- set reasonable SERVICE_VARIANT based on command line; ensure theme passed to coffeescript also; · 59106f23
  yarko committed Apr 18, 2014
  
  59106f23 Browse Files
- Merge pull request #3385 from edx/adam/add-event · cc67c07d
```
pass event to callback functions in membership.coffee (LMS-2547)
```
  Adam committed Apr 18, 2014
  cc67c07d Browse Files
- Merge pull request #3366 from IONISx/missing-translations · c854ec5c
```
Missing translations
```
  David Baumgold committed Apr 18, 2014
  c854ec5c Browse Files
- Wording for batch beta email add with autoenroll (LMS-2551) · d408f174
  Sarina Canelake committed Apr 18, 2014
  
  d408f174 Browse Files
- Update bok-choy page definitions · 5e1964dd
  Jay Zoldak committed Apr 18, 2014
  
  5e1964dd Browse Files
- Merge pull request #3392 from edx/release · 19b6718c
```
Release
```
  Diana Huang committed Apr 18, 2014
  19b6718c Browse Files
17 Apr, 2014 9 commits
- Merge pull request #3389 from edx/hotfix/2014-04-17a · 5c94a3d1
```
Render markup in inline threads on expand/collapse
```
  Greg Price committed Apr 17, 2014
  5c94a3d1 Browse Files
- Render markup in inline threads on expand/collapse · 92151e3b
```
This was a bug in 3af90ef2.
```
  Greg Price committed Apr 17, 2014
  92151e3b Browse Files
- Merge branch 'release' · 639c42db
  Diana Huang committed Apr 17, 2014
  
  639c42db Browse Files
- Merge pull request #3386 from edx/hotfix/2014-04-17 · 77ccf688
```
Show full body when expanding inline forum thread
```
  Diana Huang committed Apr 17, 2014
  77ccf688 Browse Files
- Merge pull request #3383 from edx/adam/ui-disabled-fix · 03d85761
```
change .ui-disabled to .is-disabled
```
  Adam committed Apr 17, 2014
  03d85761 Browse Files
- Show full body when expanding inline forum thread · 862a16ca
```
This was a bug in 3af90ef2.

JIRA: FOR-559
```
  Greg Price committed Apr 17, 2014
  862a16ca Browse Files
- Fix missing call to translate in receipt page · 8ef6a41d
  William Desloge committed Apr 17, 2014
  
  8ef6a41d Browse Files
- pass event to callback functions in membership.coffee (LMS-2547) · 82142a49
  Adam Palay committed Apr 17, 2014
  
  82142a49 Browse Files
- change .ui-disabled to .is-disabled · 6d356a45
  Adam Palay committed Apr 17, 2014
  
  6d356a45 Browse Files
16 Apr, 2014 3 commits
- Merge branch 'release' · 79fea620
```
Conflicts:
	lms/static/coffee/src/instructor_dashboard/membership.coffee
	lms/templates/instructor/instructor_dashboard_2/membership.html
	requirements/edx/github.txt
```
  Diana Huang committed Apr 16, 2014
  79fea620 Browse Files
- Merge pull request #3101 from edx/talbs/ui-disabled · afd82771
```
UI: Disabled Utility Classes
```
  Adam committed Apr 16, 2014
  afd82771 Browse Files
- Merge pull request #3377 from edx/sylvia/docs/DOC-293 · ce330374
```
Update "Transcripts in Additional Languages" in Video section
```
  srpearce committed Apr 16, 2014
  ce330374 Browse Files