Commits · 994ac6da6df0f1bf63dd7b4d11ae319b02680a90 · edx / edx-platform · GitLab

30 Oct, 2014 1 commit
- Fixes for MOB-836 and MOB-766 and MA-96. · 994ac6da
  Nimisha Asthagiri committed Oct 29, 2014
  
  994ac6da Browse Files
28 Oct, 2014 6 commits
- Merge pull request #5745 from edx/will/third-party-auth-fixes · 9f441d22
```
Third Party Auth Fixes
```
  Diana Huang committed Oct 28, 2014
  9f441d22 Browse Files
- Merge pull request #5761 from edx/tim/mktg-iframe-fix · 30681367
```
Do not show middle-click href in marketing iframe for logged in users
```
  Tim Babych committed Oct 28, 2014
  30681367 Browse Files
- Update tests to match new text. · 92b0bf10
  Diana Huang committed Oct 28, 2014
  
  92b0bf10 Browse Files
- Fix to marketing iframe middle-click href: course does not always have openable url. · 960f7b20
  Tim Babych committed Oct 28, 2014
  
  960f7b20 Browse Files
- Merge pull request #5751 from edx/usman/tnl367-transaction-level-decorator-3 · ee559484
```
Added commit_on_success_with_read_committed decorator to courseware.views.index
```
  Usman Khalid committed Oct 28, 2014
  ee559484 Browse Files
- Redirect users to the track selection page or ?next page when using third party auth · f9b5a917
```
Set marketing site logged in cookie from third party auth.
```
  Will Daly committed Oct 28, 2014
  f9b5a917 Browse Files
27 Oct, 2014 18 commits
- Merge pull request #5747 from edx/adam/update-ora2 · 1a1ad791
```
update ora2 to fix TNL-680
```
  Adam committed Oct 27, 2014
  1a1ad791 Browse Files
- update ora2 to fix TNL-680 · 4e628ad2
  Adam Palay committed Oct 27, 2014
  
  4e628ad2 Browse Files
- Merge pull request #5735 from edx/will/update-release-10-27 · 5a1df635
```
Merge release into master (with changes from Friday 10/24/14)
```
  Will Daly committed Oct 27, 2014
  5a1df635 Browse Files
- Merge pull request #5737 from edx/sarina/102714-translations-update · 25a74552
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Oct 27, 2014
  25a74552 Browse Files
- Added commit_on_success_with_read_committed decorator to courseware.views.index. · ca65b686
```
TNL-367
```
  Usman Khalid committed Oct 27, 2014
  ca65b686 Browse Files
- Update translations (autogenerated message) · e4bfa0f9
  Sarina Canelake committed Oct 27, 2014
  
  e4bfa0f9 Browse Files
- Merge pull request #5723 from edx/dhm/split_assetstore · 22cbe0c4
```
Implement asset metadata storage in Split - per-asset functionality
```
  Don Mitchell committed Oct 27, 2014
  22cbe0c4 Browse Files
- Merge pull request #5732 from edx/benp/optimize-run-quality · ed2ca508
```
Optimize run_quality calls
```
  Ben Patterson committed Oct 27, 2014
  ed2ca508 Browse Files
- Fix pylint violations · 0cac6ea2
  Will Daly committed Oct 27, 2014
  
  0cac6ea2 Browse Files
- Merge remote-tracking branch 'origin/release' · 7f54af3b
  Will Daly committed Oct 27, 2014
  
  7f54af3b Browse Files
- Merge pull request #5722 from edx/renzo/third-party-auth-no-prof-ed-autoenroll · cafea307
```
Prohibit automatic enrollment in prof ed courses when user authenticates via third-party auth
```
  Will Daly committed Oct 27, 2014
  cafea307 Browse Files
- Moved assetstore tests to own file and ddt'd across stores · f48289cc
```
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
```
  Don Mitchell committed Oct 27, 2014
  f48289cc Browse Files
- Implement asset metadata storage in Split - per-asset functionality · b6fac239
```
PLAT-40

Conflicts:
	common/lib/xmodule/xmodule/assetstore/__init__.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
```
  Don Mitchell committed Oct 27, 2014
  b6fac239 Browse Files
- Merge pull request #5684 from edx/markhoeber-documentation-doc3 · 0064d29d
```
Fixed Text Input Template
```
  Mark Hoeber committed Oct 27, 2014
  0064d29d Browse Files
- Fixed Text Input Template · 7ad5561a
  Mark Hoeber committed Oct 27, 2014
  
  7ad5561a Browse Files
- Merge pull request #5692 from edx/markhoeber-doc935 · fa93a692
```
Fixed code sample for python grader
```
  Mark Hoeber committed Oct 27, 2014
  fa93a692 Browse Files
- Fixed code sample for python grader · c2428c72
```
Just a missing “
```
  Mark Hoeber committed Oct 27, 2014
  c2428c72 Browse Files
- Optimize run_quality calls · 9642468c
```
Leverages recent changes in diff-cover to reduce number of diff-quality runs
```
  Ben Patterson committed Oct 27, 2014
  9642468c Browse Files
24 Oct, 2014 15 commits
- Merge pull request #5650 from edx/benp/TE-555 · ff4a1755
```
run_quality should run both quality reports in the case of a threshold breach
```
  Ben Patterson committed Oct 24, 2014
  ff4a1755 Browse Files
- Merge pull request #5583 from edx/sylvia/docs/SFD_Discussions · 686ca3d7
```
Sylvia/docs/sfd discussions
```
  srpearce committed Oct 24, 2014
  686ca3d7 Browse Files
- Add discussion info to SFD · 850c3a90
  Sylvia Pearce committed Oct 24, 2014
  
  850c3a90 Browse Files
- Merge pull request #5721 from edx/zoldak/fix-easy-access-test · 26c01dff
```
Fix test page definition for course group configurations page
```
  Jesse Zoldak committed Oct 24, 2014
  26c01dff Browse Files
- Prohibit automatic enrollment in prof ed courses when user authenticates via third-party auth · 05cb2a07
  Renzo Lucioni committed Oct 24, 2014
  
  05cb2a07 Browse Files
- Merge pull request #5719 from edx/frances/fix/rtl-dashboard-fixes · 93425a7c
```
small UI fixes on dashboard for RTL
```
  frances botsford committed Oct 24, 2014
  93425a7c Browse Files
- Fix test page definition for course group configurations page · af3d911a
```
TNL-685
```
  Jesse Zoldak committed Oct 24, 2014
  af3d911a Browse Files
- Merge pull request #5696 from Stanford-Online/giulio/course-about-font-awesomize · 60bb6a10
```
Convert icons on course_about to font awesome
```
  frances botsford committed Oct 24, 2014
  60bb6a10 Browse Files
- small UI fixes on dashboard for RTL · 13b97e36
  Frances Botsford committed Oct 24, 2014
  
  13b97e36 Browse Files
- Merge pull request #4854 from edx/jeskew/assetstore_modulestore_work · 5ffc6ac2
```
Phase 1 of adding asset metadata saving to old Mongo
```
  John Eskew committed Oct 24, 2014
  5ffc6ac2 Browse Files
- Merge pull request #5595 from Stanford-Online/caijim/resetbutton · 3d1c54fe
```
Support and tests for adding a reset button to units
```
  Sarina Canelake committed Oct 24, 2014
  3d1c54fe Browse Files
- Phase 1 of adding asset metadata saving to old Mongo · b857a0ed
  John Eskew committed Oct 24, 2014
  
  b857a0ed Browse Files
- paver run_quality should run both pep8 and pylint diffs with -p flag · a8c0c2b7
```
TE-555
```
  Ben Patterson committed Oct 24, 2014
  a8c0c2b7 Browse Files
- Merge pull request #5596 from edx/zub/bugfix/tnl-537-persistvideospeed · 98c9880d
```
reload video on change speed only if value is '1.0'
```
  zubair-arbi committed Oct 24, 2014
  98c9880d Browse Files
- reload video in setPlaybackRate only if speed of video is '1.0' · 4ea6323d
```
TNL-537
```
  zubair-arbi committed Oct 24, 2014
  4ea6323d Browse Files