Commits · eb1cc23ca5265c7c3ff07125f2293e6db25aac3b · edx / edx-platform · GitLab

08 Mar, 2014 1 commit
- fix capa textline display to leave "inline" alone upon status change · eb1cc23c
  ichuang committed Mar 07, 2014
  
  eb1cc23c Browse Files
07 Mar, 2014 29 commits
- Merge pull request #2863 from edx/sarina/violations · 2da9042c
```
Fix some simple pep8 and pylint violations
```
  Sarina Canelake committed Mar 07, 2014
  2da9042c Browse Files
- Merge pull request #2866 from edx/release · 2eaddefb
```
Release Hotfix-03-06-2014
```
  Han Su Kim committed Mar 07, 2014
  2eaddefb Browse Files
- Merge pull request #2868 from edx/sarina/idash-analytics-wording · 1900f937
```
Minor changes to instructor Analytics tab
```
  Sarina Canelake committed Mar 07, 2014
  1900f937 Browse Files
- Minor changes to instructor Analytics tab · 6be6ec4e
  Sarina Canelake committed Mar 07, 2014
  
  6be6ec4e Browse Files
- Merge branch 'master' into release · f42d42d1
```
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
```
  Han Su Kim committed Mar 07, 2014
  f42d42d1 Browse Files
- Merge pull request #2736 from johncox-google/johncox/feature/auth · 13c076e6
```
Add auth module
```
  Ned Batchelder committed Mar 07, 2014
  13c076e6 Browse Files
- Merge pull request #2864 from edx/cale/fix-crazy-items-error · 68000559
```
Cale/fix crazy items error
```
  Han Su Kim committed Mar 07, 2014
  68000559 Browse Files
- Merge pull request #2844 from edx/jmclaus/feature_download_transcript_button_with_options · 9e88fb15
```
Add .txt and .srt options to the "download transcript" button [BLD-844]
```
  jmclaus committed Mar 07, 2014
  9e88fb15 Browse Files
- BLD-844: Add possibility to download transcripts in different formats. · 3a740c04
  jmclaus committed Mar 07, 2014
  
  3a740c04 Browse Files
- typo error in this file causing it to fail to install · ae562f5e
  Han Su Kim committed Mar 07, 2014
  
  ae562f5e Browse Files
- Fix some simple pep8 and pylint violations · 87495891
  Sarina Canelake committed Mar 07, 2014
  
  87495891 Browse Files
- Delay import of xmodule packages until after sys.path fixup · 6e949195
  Calen Pennington committed Mar 07, 2014
  
  6e949195 Browse Files
- Merge pull request #2811 from edx/andya/container-unit-tests · 2c9585ea
```
Add more tests for the container page
```
  Andy Armstrong committed Mar 07, 2014
  2c9585ea Browse Files
- Normalize the representation of Scope.content data in MongoModulestore FieldData · 5f2de765
```
Without this, the new 'items' field in the course_info xmodule caused
bizarre behavior. If you added the text 'items' to a course_info
section, then the LMS would throw a 500, because the field name isn't
'data', but the stored data is a string, leading to the check of
`key.field_name in self._data`, where key.field_name is the string 'items',
and self._data is the content string.
```
  Calen Pennington committed Mar 07, 2014
  5f2de765 Browse Files
- Update import location of `prefer_xmodules` · 81cfb6c3
  Xavier Antoviaque committed Mar 07, 2014
  
  81cfb6c3 Browse Files
- Only add mentoring application to INSTALLED_APPS when in virtualenv · bde95135
  Xavier Antoviaque committed Mar 07, 2014
  
  bde95135 Browse Files
- Merge pull request #2860 from edx/sarina/lms-2092 · 9ef1fe01
```
Rename "Forum" roles on inst dash LMS-2092
```
  Sarina Canelake committed Mar 07, 2014
  9ef1fe01 Browse Files
- Update discussions documentation LMS-2092 · e7bc771b
  Sarina Canelake committed Mar 07, 2014
  
  e7bc771b Browse Files
- Rename "Forum" roles on inst dash LMS-2092 · 502384b8
  Sarina Canelake committed Mar 07, 2014
  
  502384b8 Browse Files
- Merge pull request #2858 from edx/sarina/lms-2109 · b227c311
```
Adjust wording around grade reports LMS-2109
```
  Sarina Canelake committed Mar 07, 2014
  b227c311 Browse Files
- Merge pull request #2813 from edx/anton/fix-transcript-in-full-screen-mode · 58eaaf29
```
Fix video positioning in full view mode.
```
  Anton Stupak committed Mar 07, 2014
  58eaaf29 Browse Files
- Adjust wording around grade reports LMS-2109 · 69e7b73e
  Sarina Canelake committed Mar 07, 2014
  
  69e7b73e Browse Files
- BLD-852: Fix video positioning in full view mode. · fe8e6026
  polesye committed Mar 07, 2014
  
  fe8e6026 Browse Files
- Merge pull request #2850 from edx/sarina/lms-1548 · c34fef6c
```
Fix "Course started?" display on beta dash LMS-1548
```
  Sarina Canelake committed Mar 07, 2014
  c34fef6c Browse Files
- Merge pull request #2792 from edx/anton/fix-cc-button · b292f6c2
```
Anton/fix cc button
```
  Anton Stupak committed Mar 07, 2014
  b292f6c2 Browse Files
- BLD-896: Fix cc button in HTML5 videos. · 65adb7b2
  polesye committed Mar 07, 2014
  
  65adb7b2 Browse Files
- Add common/djangoapps/third_party_auth; update pylintrc to allow test_* names. · 8ecfa867
```
third_party_auth contains a working settings mechanism, the start of the provider interface + 3 implementations (Google, Mozilla Persona, LinkedIn), and a stub for the auth pipeline. Modified existing lms settings files to use but deactivate the module.
```
  John Cox committed Mar 06, 2014
  8ecfa867 Browse Files
- Fix "Course started?" display on beta dash LMS-1548 · 4121df47
  Sarina Canelake committed Mar 06, 2014
  
  4121df47 Browse Files
- Merge pull request #2846 from edx/sarina/fix-splittest-quality · 78fe797e
```
Clean up quality violations in split_test module
```
  Sarina Canelake committed Mar 06, 2014
  78fe797e Browse Files
06 Mar, 2014 10 commits
- Clean up quality violations in split_test module · 29be1288
  Sarina Canelake committed Mar 06, 2014
  
  29be1288 Browse Files
- Merge pull request #2848 from antoviaque/xblock-mentoring-optionalapp-fix · bf754c86
```
Only add mentoring application to INSTALLED_APPS when in virtualenv
```
  Han Su Kim committed Mar 06, 2014
  bf754c86 Browse Files
- Update import location of `prefer_xmodules` · 76ae57c7
  Xavier Antoviaque committed Mar 06, 2014
  
  76ae57c7 Browse Files
- Merge pull request #2283 from carsongee/cg/feature/git_branch_import · b3ac3b6f
```
Add option for importing a course from a named branch of a git repo
```
  Carson Gee committed Mar 06, 2014
  b3ac3b6f Browse Files
- Fixed bug of checking out the same branch multiple times and code review fixes · b67b89e5
```
Translator comments and language fixes
```
  Carson Gee committed Mar 06, 2014
  b67b89e5 Browse Files
- Only add mentoring application to INSTALLED_APPS when in virtualenv · 62628f6b
  Xavier Antoviaque committed Mar 06, 2014
  
  62628f6b Browse Files
- Merge branch 'release' · 0db4a899
  Han Su Kim committed Mar 06, 2014
  
  0db4a899 Browse Files
- Merge remote-tracking branch 'origin/master' into release, conflicts resolved · bdfd81d2
```
Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt
```
  Han Su Kim committed Mar 06, 2014
  bdfd81d2 Browse Files
- Add option for importing a course from a named branch of a git repo · 9d55c88c
  Carson Gee committed Mar 06, 2014
  
  9d55c88c Browse Files
- Merge pull request #2702 from carsongee/cg/cas_fixes · b0af8ff4
```
Correct misaligned django-cas integration
```
  Carson Gee committed Mar 06, 2014
  b0af8ff4 Browse Files