Commits · 44129cc4b47893bda629be4e6eec464c3d39d5e6 · edx / edx-platform

14 Jul, 2014 2 commits
- Merge branch 'release' into old-master-probably · 44129cc4
```
Conflicts:
	requirements/edx/base.txt
    (taking requests==2.3.0 in preference to 1.2.3,
     requests-oauthlib==0.4.0 in preference to 0.4.1)
```
  Joe Blaylock committed Jul 14, 2014
  44129cc4 Browse Files
- Merge branch 'rc' into release · b48eded0
```
Installed on 2014/07/14
```
  Joe Blaylock committed Jul 14, 2014
  b48eded0 Browse Files
11 Jul, 2014 5 commits
- Merge pull request #70 from Stanford-Online/jbau/timed-exam-hack · 14044ea0
```
HACK capa timed-test on capa_base.py
```
  Joe Blaylock committed Jul 11, 2014
  14044ea0 Browse Files
- Merge pull request #73 from Stanford-Online/stv/rc-comments · cc34a0f0
```
Remove commented-out deprecated lines
```
  Joe Blaylock committed Jul 11, 2014
  cc34a0f0 Browse Files
- Remove commented-out deprecated lines · 84e831d6
  stv committed Jul 11, 2014
  
  84e831d6 Browse Files
- Fixing the last (?) unit test failure in rc · c05ad2a4
  Joe Blaylock committed Jul 11, 2014
  
  c05ad2a4 Browse Files
- Merge pull request #71 from Stanford-Online/stv/munge · ecc619c1
```
Fix failing munge_tabs test
```
  Joe Blaylock committed Jul 11, 2014
  ecc619c1 Browse Files
10 Jul, 2014 1 commit

This replaces all remaining occurrences of 'Open Ended Panel' with
'Assessment Panel'.

This was originally introduced in
cf95f7fa

(cherry picked from commit 19f4de48)

committed Jul 10, 2014

b1c3b707 Browse Files

09 Jul, 2014 3 commits
- HACK capa timed-test on capa_base.py · 846ab440
```
Conflicts:
	common/lib/xmodule/xmodule/capa_base.py
	lms/templates/problem.html
```
  Jason Bau committed Jul 09, 2014
  846ab440 Browse Files
- Merge pull request #69 from Stanford-Online/giulio/change-password-reset-text · ae5c71dc
```
change wording of password reset pages
```
  Giulio Gratta committed Jul 09, 2014
  ae5c71dc Browse Files
- change wording of password reset pages · 389c09a5
  Giulio Gratta committed Jul 09, 2014
  
  389c09a5 Browse Files
08 Jul, 2014 7 commits
- Merge pull request #67 from Stanford-Online/stv/rc-munge · 06a47933
```
Fix failing forked test
```
  Joe Blaylock committed Jul 08, 2014
  06a47933 Browse Files
- Fix failing forked test · 9ae85fff
```
We had fixed this previously, so I think we just took the wrong side of
a conflict when merging from upstream.
```
  stv committed Jul 08, 2014
  9ae85fff Browse Files
- Fixing caption tests after a9213509 · 9a5df72e
  Joe Blaylock committed Jul 08, 2014
  
  9a5df72e Browse Files
- Merge pull request #66 from Stanford-Online/giulio/limit-year-dropdown · 1fe0408f
```
modify YoB dropdown to limit valid years
```
  Joe Blaylock committed Jul 08, 2014
  1fe0408f Browse Files
- Merge pull request #65 from Stanford-Online/jbau/fix-sneakpeek-deeplink-test · 73b7f1eb
```
Fix broken import in deeplink_middleware app
```
  Joe Blaylock committed Jul 08, 2014
  73b7f1eb Browse Files
- modify YoB dropdown to limit valid years · e5de02cd
  Giulio Gratta committed Jul 08, 2014
  
  e5de02cd Browse Files
- Fix broken import in deeplink_middleware app · c38f84fb
  Jason Bau committed Jul 07, 2014
  
  c38f84fb Browse Files
07 Jul, 2014 1 commit
- Updating paths to CourseKey and friends · 524813b6
  Joe Blaylock committed Jul 07, 2014
  
  524813b6 Browse Files
03 Jul, 2014 2 commits
- Added caption utility to checklist for Instructors · 30188680
  Giulio Gratta committed Jul 03, 2014
  
  30188680 Browse Files
- Merge pull request #60 from Stanford-Online/giulio/add-caption-utility-checklist · cf9d1e11
```
Added caption utility to checklist for Instructors
```
  Giulio Gratta committed Jul 03, 2014
  cf9d1e11 Browse Files
02 Jul, 2014 7 commits

Resolving merge conflicts from upstream/release · 4930f780

* CMS Global header will continue to send people to edx-code for help.
* LMS Course Navigation to keep changes from upstream and local changes
  (for sneakpeak)

committed Jul 02, 2014

4930f780 Browse Files

Merge pull request #63 from Stanford-Online/stv/munge · 3b58e408
```
Fix failing munge_tabs test
```
Steven Burch committed Jul 02, 2014
3b58e408 Browse Files

Fix failing munge_tabs test · 19f4de48

This replaces all remaining occurrences of 'Open Ended Panel' with
'Assessment Panel'.

This was originally introduced in
cf95f7fa

committed Jul 02, 2014

19f4de48 Browse Files

Merge pull request #64 from Stanford-Online/stv/pin-request-oauthlib · c1c2be11
```
Lock version of requests-oauthlib to 0.4.0
```
Steven Burch committed Jul 02, 2014
c1c2be11 Browse Files

Merge remote-tracking branch 'upstream/release' into rc-201407009 · db74df72

Conflicts:
	cms/djangoapps/contentstore/views/checklist.py
	cms/templates/widgets/header.html
	lms/djangoapps/certificates/management/commands/regenerate_user.py
	lms/djangoapps/class_dashboard/views.py
	lms/djangoapps/courseware/tests/test_lti_integration.py
	lms/djangoapps/instructor/views/api.py
	lms/templates/courseware/course_navigation.html

Conflicts Remaining in:
	cms/templates/widgets/header.html
	lms/templates/courseware/course_navigation.html

committed Jul 02, 2014

db74df72 Browse Files

Merge pull request #4281 from edx/usman/lms6634-support-page-url-matching · 9322714d
```
Fixed urlpatterns regex for support views in dashboard app.
```
Will Daly committed Jul 02, 2014
9322714d Browse Files
Fixed urlpatterns regex for support views in dashboard app. · c201d78c
```
LMS-6634
```
Usman Khalid committed Jul 02, 2014
c201d78c Browse Files

01 Jul, 2014 6 commits
- locking version of requests-oauthlib to 0.4.0 · 20dfaf62
```
requests version 1.2.3 does not appear to be compatible with the
new version of requests-oauthlib.

requests-oathlib tries to import to_native_string in util.py:

```
  File
  "/root/.virtualenvs/edx-platform/local/lib/python2.7/site-packages/requests_oauthlib/oauth1_auth.py",
  line 10, in <module>
      from requests.utils import to_native_string
  ImportError: cannot import name to_native_string
```

(cherry picked from commit c54b8db6)
```
  John Jarvis committed Jul 01, 2014
  20dfaf62 Browse Files
- Merge pull request #4268 from edx/usman/lms6631-certificate-mode · a2786975
```
Moved GeneratedCertificates.MODES back inside model.
```
  Usman Khalid committed Jul 01, 2014
  a2786975 Browse Files
- Moved GeneratedCertificates.MODES back inside model. · 446270c0
```
LMS-6631
```
  Usman Khalid committed Jul 01, 2014
  446270c0 Browse Files
- Merge pull request #4262 from edx/usman/lms2920-no-refund-if-given-certificate · 1fad1d73
```
Do not refund student if a certificate entry already exists for them.
```
  Usman Khalid committed Jul 01, 2014
  1fad1d73 Browse Files
- Do not refund student if a certificate entry already exists for them. · 6a3d5eb0
```
LMS-2920
```
  Usman Khalid committed Jul 01, 2014
  6a3d5eb0 Browse Files
- Get active student count from new analytics data API · d118fb8c
```
Disabled by default.
```
  Clinton Blackburn committed Jul 01, 2014
  d118fb8c Browse Files
30 Jun, 2014 6 commits
- Merge pull request #62 from Stanford-Online/dcadams/metrics_problem_types · 09bcb807
```
Add LTI type to metrics tab grade reports
```
  David Adams committed Jun 30, 2014
  09bcb807 Browse Files
- Uses ModuleStoreEnum in is_xblock_visible_to_students · d00e2b74
  Ben McMorran committed Jun 30, 2014
  
  d00e2b74 Browse Files
- Add LTI type to metrics tab grade reports · 24c5bbda
  David Adams committed Jun 30, 2014
  
  24c5bbda Browse Files
- Merge pull request #4229 from edx/studio/uses-mixed-modulestore-xblock-visibility · 09908bde
```
Adds is_xblock_visible_to_students
```
  Ben McMorran committed Jun 30, 2014
  09908bde Browse Files
- Merge pull request #4252 from edx/will/ora2-release-2014-06-30T13.39 · 46469209
```
ORA2 release-2014-06-30T13.39
```
  Will Daly committed Jun 30, 2014
  46469209 Browse Files
- Merge pull request #4215 from edx/waheed/lms2892-ie-security-warning-fixed · cb3355b9
```
Fixed IE security warning on course page.
```
  Waheed Ahmed committed Jun 30, 2014
  cb3355b9 Browse Files