Commits · e34870bf325ef9e894c6dc9fb7e3b01b106894bc · edx / edx-platform

21 May, 2014 1 commit
- update ORA2 version · e34870bf
  Giulio Gratta committed May 21, 2014
  
  e34870bf Browse Files
20 May, 2014 5 commits
- Merge pull request #3801 from edx/jbau/edx-west/fix-thirdparty-tests · c01e8321
```
Jbau/edx west/fix thirdparty tests
```
  Jason Bau committed May 20, 2014
  c01e8321 Browse Files
- Fixes third_party_auth tests by removing logout b4 login · 3ba7af1b
  Jason Bau committed May 20, 2014
  
  3ba7af1b Browse Files
- Text Changes to Help Modal · eb7f9e67
  Giulio Gratta committed May 20, 2014
  
  eb7f9e67 Browse Files
- Merge pull request #3783 from edx/jbau/edx-west/jbau/shib-activate-on-acct-linking · 54c00248
```
    Autoactivate inactive users on external_auth login
```
  Jason Bau committed May 20, 2014
  54c00248 Browse Files
- Autoactivate inactive users on external_auth login · b806ce82
```
Conditional on existing flag BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH
```
  Jason Bau committed May 19, 2014
  b806ce82 Browse Files
13 May, 2014 1 commit
- Rename Check/Submit button for Stanford branch · 704e03d8
  Nick Parlante committed May 12, 2014
  
  704e03d8 Browse Files
12 May, 2014 3 commits

lti 2.0 result service rest endpoint · ff62e794
```
Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py
```
Jason Bau committed May 12, 2014
ff62e794 Browse Files
Changes for Help Modal to work on Stanford Site · 8f279623
```
- moved zendesk endpoint to new condition
- some help modal styling
```
Giulio Gratta committed May 12, 2014
8f279623 Browse Files

The bug is with the case of multiple-questions with targeted
feedback within a single problem.

Refactor the targeted-feedback tests to house
the most common xml in external files.

Move the capa test load_fixture function to __init__.py so it
can be used generally.

committed May 12, 2014

466836ae Browse Files

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 3 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