Commits · 0797f1842e18fa34d5f7d8919179c898f79249ed · edx / edx-platform

07 May, 2014 9 commits

remove queryable_student_module · 0797f184

Even though not running in Stanford production, was causing tests to
fail.  We can resurrect sometime later if/when it's useful.

committed May 07, 2014

0797f184 Browse Files

Merge tag 'hotfix-2014-05-02' into edx-west/rc-20140509 · 7531afdd

Pick up last few weeks of edX changes up to (and including) last week's
hotfix.

Conflicts:
	common/djangoapps/student/models.py
	common/djangoapps/student/views.py
	common/lib/xmodule/xmodule/capa_base.py
	common/lib/xmodule/xmodule/tabs.py
	docs/en_us/developers/source/xblocks.rst
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/views.py
	lms/envs/common.py
	lms/templates/courseware/course_about.html
	lms/templates/courseware/course_navigation.html
	lms/templates/instructor/instructor_dashboard_2/metrics.html
	lms/templates/problem.html
	lms/templates/register.html
	requirements/edx/github.txt

committed May 07, 2014

7531afdd Browse Files

Revert "Multiple-choice features" · 259edef9
```
This reverts commit 377f91e9.

Conflicts:
	common/lib/xmodule/xmodule/capa_base.py
```
Jason Bau committed May 07, 2014
259edef9 Browse Files
Revert "HACK capa timed-test on capa_base.py" · 25210843
```
This reverts commit 8e1ed573.

Conflicts:
	lms/templates/problem.html
```
Jason Bau committed May 07, 2014
25210843 Browse Files
Revert "Rename Check/Submit button for Stanford branch" · c0e1347f
```
This reverts commit e32c27af.
```
Jason Bau committed May 07, 2014
c0e1347f Browse Files
Revert "Fix bug with multiple responses per problem" · 65f96cbb
```
This reverts commit f1151eeb.
```
Jason Bau committed May 07, 2014
65f96cbb Browse Files
Revert "Fix randomization bug for multiple questions per problem" · cce63f6e
```
This reverts commit 0c583d9e.
```
Jason Bau committed May 07, 2014
cce63f6e Browse Files
Revert "Turn off capa name masking" · f4837d91
```
This reverts commit 951e4378.
```
Jason Bau committed May 07, 2014
f4837d91 Browse Files
Revert "Fix markdown bug multiple multiplechoice" · 33ce7102
```
This reverts commit d6bb2bda.
```
Jason Bau committed May 07, 2014
33ce7102 Browse Files

01 May, 2014 1 commit
- puts GA id in quotes · 80f57846
  Adam Palay committed May 01, 2014
  
  80f57846 Browse Files
30 Apr, 2014 1 commit
- Merge pull request #3531 from edx/jrbl/certs_pass_course_name · e6195ea8
```
Stanford only: pass course name on queue
Merging for our release to stage
```
  Joe Blaylock committed Apr 30, 2014
  e6195ea8 Browse Files
29 Apr, 2014 5 commits
- WIP: pass course name on queue · 6408c9f5
```
Conflicts:

	lms/djangoapps/certificates/queue.py
```
  Joe Blaylock committed Apr 29, 2014
  6408c9f5 Browse Files
- Merge pull request #3505 from edx/adam/google-analytics · a2817d9c
```
factor out google analytics ids (LMS-2555)
```
  Adam committed Apr 29, 2014
  a2817d9c Browse Files
- Merge pull request #3514 from edx/waheed/stud1514-toggle-cheatsheet-not-working · edabab34
```
Fixed advanced editor not working due to cheatsheet undefined.
```
  Waheed Ahmed committed Apr 29, 2014
  edabab34 Browse Files
- Fixed advanced editor not working due to cheatsheet undefined. · a02f3f73
```
STUD-1514
```
  Waheed Ahmed committed Apr 29, 2014
  a02f3f73 Browse Files
- Revert "remove location of item from loc_mapper and cache" · 643e82ac
```
This reverts commit d2b8b4f0.
```
  zubair-arbi committed Apr 29, 2014
  643e82ac Browse Files
28 Apr, 2014 11 commits
- factor out google analytics ids (LMS-2555) · 8ad4cdb3
  Adam Palay committed Apr 28, 2014
  
  8ad4cdb3 Browse Files
- Merge branch 'release' · b95966e9
```
Conflicts:
	CHANGELOG.rst
```
  David Baumgold committed Apr 28, 2014
  b95966e9 Browse Files
- Merge pull request #3494 from edx/sarina/fix-video-i18n · cba08d0b
```
Fix i18n of video transcript
```
  Sarina Canelake committed Apr 28, 2014
  cba08d0b Browse Files
- Merge pull request #3476 from edx/usman/lms2556-wiki-urls · 23ee963c
```
Fixed transform_url function in WikiAccessMiddleware.
```
  Adam committed Apr 28, 2014
  23ee963c Browse Files
- Fix i18n of video transcript · e76f6dc8
  Sarina Canelake committed Apr 28, 2014
  
  e76f6dc8 Browse Files
- Fixed transform_url function in WikiAccessMiddleware. · f591b1db
```
In the current implementation if the path prefix contains the
wiki_path value it gets deleted. For example if the prefix is
'/courses/edx/math101/2014' and wiki_path is '101/' the final
prefix becomes '/courses/edx/math2014'.

LMS-2556
```
  Usman Khalid committed Apr 28, 2014
  f591b1db Browse Files
- Merge pull request #3438 from edx/sarina/fix-video-i18n · 7a513820
```
Don't scrape unnecessary strings for i18n
```
  Sarina Canelake committed Apr 28, 2014
  7a513820 Browse Files
- Merge pull request #3478 from edx/sylvia/docs/TIM-476 · e4c5eb4d
```
Add info about removing prompt
```
  srpearce committed Apr 28, 2014
  e4c5eb4d Browse Files
- Merge pull request #3434 from edx/db/dev-process · 73c30e95
```
Document our development/review process
```
  David Baumgold committed Apr 28, 2014
  73c30e95 Browse Files
- Merge pull request #3440 from edx/ammar/config-youtube-stub-for-bok-choy · dfa45eac
```
Configure youtube stub for bok-choy
```
  muhammad-ammar committed Apr 28, 2014
  dfa45eac Browse Files
- Merge pull request #3483 from edx/ora2/release-2014-04-27T20.17 · 37cb0052
```
Release for Apr 27, 2014
```
  Stephen Sanchez committed Apr 28, 2014
  37cb0052 Browse Files
27 Apr, 2014 5 commits
- Merge pull request #3484 from edx/sarina/042914-language-update · 4800811f
```
Sarina/042914 language update
```
  Sarina Canelake committed Apr 27, 2014
  4800811f Browse Files
- Update translations (autogenerated message) · 51188099
  Sarina Canelake committed Apr 27, 2014
  
  51188099 Browse Files
- Update how translations are pulled · 3422fcfe
  Sarina Canelake committed Apr 27, 2014
  
  3422fcfe Browse Files
- Release for Apr 27, 2014 · c9f707f4
  Stephen Sanchez committed Apr 27, 2014
  
  c9f707f4 Browse Files
- Correct native spelling of Armenian language · cb590405
  Sarina Canelake committed Apr 27, 2014
  
  cb590405 Browse Files
25 Apr, 2014 8 commits
- Merge pull request #3450 from johncox-google/johncox/feature/buttons · 82bd46d5
```
Change signin control from text list to buttons.
```
  Ned Batchelder committed Apr 25, 2014
  82bd46d5 Browse Files
- Update changelog · 441055d8
  John Cox committed Apr 25, 2014
  
  441055d8 Browse Files
- Merge pull request #2780 from FiloSottile/progress_success_button · 5edae3ed
```
Show a success button at the top of the Progress page
```
  David Baumgold committed Apr 25, 2014
  5edae3ed Browse Files
- Fix acceptance tests · 0379bd34
  John Cox committed Apr 25, 2014
  
  0379bd34 Browse Files
- Merge pull request #3479 from edx/sylvia/docs/DOC-345 · b38a9236
```
Correct copy/paste error in Adaptive Hint section
```
  srpearce committed Apr 25, 2014
  b38a9236 Browse Files
- Correct copy/paste error in Adaptive Hint section · cc892d64
  Sylvia Pearce committed Apr 25, 2014
  
  cc892d64 Browse Files
- Add info about removing prompt · 3671b91a
  Sylvia Pearce committed Apr 25, 2014
  
  3671b91a Browse Files
- Merge pull request #2810 from edx/marco/discussions/styling-cleanup · a15e43f5
```
Forums visual styling adjustments
```
  marcotuts committed Apr 25, 2014
  a15e43f5 Browse Files