Commits · 19356ffd4b0dae1bccd76613717fb8d95365acdd · edx / edx-platform · GitLab

23 Sep, 2014 4 commits
- Puts course listings in a sane order · 19356ffd
  Piotr Mitros committed Sep 23, 2014
  
  19356ffd Browse Files
- Merge pull request #5048 from Stanford-Online/jbau/edx/custom-response-fractional-grades · 83c54d4e
```
capa custom response support for decimal grades
```
  Jason Bau committed Sep 23, 2014
  83c54d4e Browse Files
- Merge pull request #5331 from edx/clytwynec/disable_flaky_video_times_test · 1e6084b9
```
disabling test_video_start_time_and_end_time
```
  clytwynec committed Sep 23, 2014
  1e6084b9 Browse Files
- disabling test_video_start_time_and_end_time · 28871213
  Christine Lytwynec committed Sep 23, 2014
  
  28871213 Browse Files
22 Sep, 2014 15 commits
- Merge pull request #5316 from rocha/use-default-locale-in-openid-claim · 874c3381
```
Use default locale to OpenID profile claims.
```
  Carlos Andrés Rocha committed Sep 22, 2014
  874c3381 Browse Files
- Merge pull request #5314 from rocha/configurable-oauth-enforce-secure · c35f4bf7
```
Allow SSL enforcement for OAuth2 provider to be configurable
```
  Carlos Andrés Rocha committed Sep 22, 2014
  c35f4bf7 Browse Files
- capa custom response support for decimal grades · 637f5541
  Jason Bau committed Sep 22, 2014
  
  637f5541 Browse Files
- Use default locale to OpenID profile claims. · 5500cc68
```
If the user has not selected a default locale, then return the default one.
```
  Carlos Andrés Rocha committed Sep 22, 2014
  5500cc68 Browse Files
- Merge pull request #5315 from rocha/fix-fullname-in-oauth2-handler · e04c6c2a
```
Return OpenID Connect user name from user profile.
```
  Carlos Andrés Rocha committed Sep 22, 2014
  e04c6c2a Browse Files
- Merge pull request #5318 from edx/markhoeber-doc936 · c9357985
```
Content experiments update
```
  Mark Hoeber committed Sep 22, 2014
  c9357985 Browse Files
- Merge pull request #5295 from edx/adam/add-simple-help-modal-test · ef525f28
```
add simple help-modal-test
```
  Adam committed Sep 22, 2014
  ef525f28 Browse Files
- Content experiments update · 7889585c
```
comments from Anant
```
  Mark Hoeber committed Sep 22, 2014
  7889585c Browse Files
- Return OpenID Connect user name from user profile. · 19f95f00
  Carlos Andrés Rocha committed Sep 22, 2014
  
  19f95f00 Browse Files
- Allow SSL enforcement for OAuth2 provider to be configurable · 37d604a9
  Carlos Andrés Rocha committed Sep 22, 2014
  
  37d604a9 Browse Files
- add simple help-modal-test · 5fa38cb5
  Adam Palay committed Sep 22, 2014
  
  5fa38cb5 Browse Files
- Merge pull request #5277 from edx/waheed/tnl413-fix-course-id-kwarg-on-merge-wiki · 03d9a6fd
```
Fixed wiki merge url regex.
```
  Waheed Ahmed committed Sep 22, 2014
  03d9a6fd Browse Files
- Fixed wiki merge url regex. · 3e64faea
```
TNL-413
```
  Waheed Ahmed committed Sep 22, 2014
  3e64faea Browse Files
- Merge pull request #4460 from edx/waheed/lms6617-disable-student-view-if-course-is-not-released · f827c538
```
Disabled student view if course is not yet released for students.
```
  Waheed Ahmed committed Sep 22, 2014
  f827c538 Browse Files
- Disabled student view if course is not yet released for students. · 3c8eacd4
```
LMS-6617
```
  Waheed Ahmed committed Sep 22, 2014
  3c8eacd4 Browse Files
19 Sep, 2014 11 commits
- Merge pull request #5302 from edx/release · 4aa2dc52
```
Release merge - post hotfix-2014-09-19-1
```
  John Eskew committed Sep 19, 2014
  4aa2dc52 Browse Files
- Merge pull request #5281 from edx/adam/hide-tabs-if-not-enrolled-rebase-2 · 81d8c40e
```
Deployed as hotfix
```
  John Eskew committed Sep 19, 2014
  81d8c40e Browse Files
- Merge pull request #5248 from edx/renzo/cleanup-translated-strings · 135ce249
```
Clean up translated strings in registration page, dashboard, and track selection flow
```
  Renzo Lucioni committed Sep 19, 2014
  135ce249 Browse Files
- Merge pull request #5284 from edx/sylvia/docs/DOC-866 · afc07cda
```
Sylvia/docs/doc 866
```
  srpearce committed Sep 19, 2014
  afc07cda Browse Files
- Added note about video URLs hidden by default · e00fa34f
  Sylvia Pearce committed Sep 19, 2014
  
  e00fa34f Browse Files
- Merge pull request #5188 from edx/insights-staff-only · a5237a85
```
Hiding Insights link for non-staff users
```
  Clinton Blackburn committed Sep 19, 2014
  a5237a85 Browse Files
- Hiding Insights link for non-staff users · 87056947
  Clinton Blackburn committed Sep 19, 2014
  
  87056947 Browse Files
- Merge pull request #4898 from edx/danielli/recommender_pyfs · 4d640ee7
```
RecommenderXBlock with pyfs, better UX, and modification of logging
```
  Piotr Mitros committed Sep 19, 2014
  4d640ee7 Browse Files
- update number of queries in embargo test · 0a385544
  Adam Palay committed Sep 19, 2014
  
  0a385544 Browse Files
- only load tabs if user is enrolled in course (TNL-286) · ac862b7a
```
add tests for static tabs
```
  Adam Palay committed Sep 19, 2014
  ac862b7a Browse Files
- move to s3fs and handle one time url · 165b015f
  swdanielli committed Sep 19, 2014
  
  165b015f Browse Files
18 Sep, 2014 10 commits
- Merge pull request #5129 from edx/ned/python-zip-assets · 10bd2b00
```
Python zip file importable from an asset
```
  Ned Batchelder committed Sep 18, 2014
  10bd2b00 Browse Files
- Importable python_lib.zip assets · 616bbbab
```
Lots of plumbing to allow an asset named python_lib.zip to be imported
by jailed Python code.

This function can find the "python_lib.zip" asset, and is passed down
through ModuleSystem and LoncapaSystem so that capa problems have access
to the zipfile.
```
  Ned Batchelder committed Sep 18, 2014
  616bbbab Browse Files
- Merge pull request #5287 from edx/sylvia/docs/relnotes918revision · c2c65c5d
```
Correct name of video option
```
  srpearce committed Sep 18, 2014
  c2c65c5d Browse Files
- Correct name of video option · 586d3ba4
  Sylvia Pearce committed Sep 18, 2014
  
  586d3ba4 Browse Files
- Merge pull request #4697 from edx/db/update-multiple-deps · 6325206d
```
Upgrade scipy, lxml, boto, edx-ora2
```
  David Baumgold committed Sep 18, 2014
  6325206d Browse Files
- Merge pull request #5282 from edx/benp/js-test-timeouts · 9f573f34
```
Disable flaky javascript tests TE-485
```
  Ben Patterson committed Sep 18, 2014
  9f573f34 Browse Files
- Disable flaky javascript tests TL-439 · c875f715
  Ben Patterson committed Sep 18, 2014
  
  c875f715 Browse Files
- Update ora2 and submissions · 649288fc
  David Baumgold committed Sep 18, 2014
  
  649288fc Browse Files
- Merge branch 'release' into 'master' after successful rc/2014-09-17 deploy. · 9e830d08
  John Eskew committed Sep 18, 2014
  
  9e830d08 Browse Files
- Merge pull request #5258 from edx/waheed/tnl265-fix-fullscreen-functionality · 22785e96
```
Fixed full screen functionality for image module in HTMLModule.
```
  Waheed Ahmed committed Sep 18, 2014
  22785e96 Browse Files