Commits · 12bc524582435584cfcfb81afc5ca66fef89d935 · edx / edx-platform

26 Aug, 2014 1 commit
- Merge pull request #115 from Stanford-Online/sjang92/bs_fix · 12bc5245
```
Fixed bulksettings test for rc
```
  Jason Bau committed Aug 25, 2014
  12bc5245 Browse Files
25 Aug, 2014 7 commits

Verify children are rendered before allowing drop into collapsed parent. · a0e8606c
```
TNL-56
```
cahrens committed Aug 25, 2014
a0e8606c Browse Files

Fixed bulksettings test for rc · a6e6eb13

Fixed bulksettings tests to accomodate changes made from upstream to urls.py,
and compute_publish_state function

committed Aug 25, 2014

a6e6eb13 Browse Files

Merge remote-tracking branch 'origin/master' into rc-20140825 · 26fbc12c
```
Conflicts:
	requirements/edx/github.txt
```
Jason Bau committed Aug 25, 2014
26fbc12c Browse Files
Merge pull request #112 from Stanford-Online/giulio/fix-big-help-modal-button · a4e6f758
```
fixes URL of big help modal and fix ORA2 requirements SHA
```
Giulio Gratta committed Aug 25, 2014
a4e6f758 Browse Files
update ORA2 sha after rebase · 99ba1c43
Giulio Gratta committed Aug 25, 2014

99ba1c43 Browse Files
fix help modal button URL · 3b997ed2
Giulio Gratta committed Aug 25, 2014

3b997ed2 Browse Files

Merge commit '' into rc · 2c53a83b

edX's 2014-08-14 hotfix release pt 2

Conflicts:
	AUTHORS
	cms/djangoapps/contentstore/views/checklist.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/course.py
	cms/djangoapps/models/settings/course_metadata.py
	common/djangoapps/student/tests/test_password_policy.py
	common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/tests/test_split_draft_modulestore.py
	lms/djangoapps/analytics/basic.py
	lms/envs/common.py
	requirements/edx/base.txt
	requirements/edx/github.txt

committed Aug 25, 2014

2c53a83b Browse Files

22 Aug, 2014 3 commits

Merge branch 'release' · 1154bfd9
```
Conflicts:
	requirements/edx/base.txt
```
Joe Blaylock committed Aug 22, 2014
1154bfd9 Browse Files

Merge branch 'rc' into release · 28a23772

* Release 2014-08-22, picked up:
** Requirements updates for TrackChanges
** edx-submissions version bump
** help center link is a visible button

committed Aug 22, 2014

28a23772 Browse Files

Requirements updates for Track Changes · 0e13f4cf

* Manually update ORA2 version to the TrackChanges SHA1
** Note this should be reverted when the TrackChanges PR merges upstream
* Includes submissions dependency bump to 0.0.7

committed Aug 22, 2014

0e13f4cf Browse Files

21 Aug, 2014 4 commits
- Bump edx-submissions to v0.0.6 · 1fe94c8e
```
This is required following our update to a new version of ORA2.
```
  stv committed Aug 21, 2014
  1fe94c8e Browse Files
- Merge pull request #111 from Stanford-Online/sef/dont-count-direct-access · 37727216
```
direct access: exclude non-registered from enrollments
```
  Sef Kloninger committed Aug 21, 2014
  37727216 Browse Files
- direct access: exclude non-registered from enrollments · 6b017485
```
Direct access introduces a bunch of fake course enrollments.  We
don't want to include those in the counts of students enrolled in
the course, nor in the list of students dumped out in the course
roster.
```
  Sef Kloninger committed Aug 21, 2014
  6b017485 Browse Files
- Merge pull request #109 from stvstnfrd/requirements/edx-submissions · 00ce1d47
```
Bump edx-submissions to v0.0.6
```
  Joe Blaylock committed Aug 21, 2014
  00ce1d47 Browse Files
18 Aug, 2014 1 commit
- Bump edx-submissions to v0.0.6 · 6e136690
```
This is required following our update to a new version of ORA2.
```
  stv committed Aug 18, 2014
  6e136690 Browse Files
15 Aug, 2014 2 commits
- Merge pull request #108 from Stanford-Online/giulio/help-modal-tweaks · f2b94697
```
make help center link a visible button
```
  Giulio Gratta committed Aug 15, 2014
  f2b94697 Browse Files
- make help center link a visible button · a1138bd6
  Giulio Gratta committed Aug 15, 2014
  
  a1138bd6 Browse Files
14 Aug, 2014 17 commits
- jquery.immediateDescendents cannot be loaded until jQuery is loaded. · b5aaf8b0
```
STUD-1999
```
  cahrens committed Aug 14, 2014
  b5aaf8b0 Browse Files
- Ignore errors on rmtree cleanup · eee0d35b
  Jesse Zoldak committed Aug 14, 2014
  
  eee0d35b Browse Files
- Verify loading indicator has been hidden. · 323a23f5
```
STUD-2090
```
  cahrens committed Aug 14, 2014
  323a23f5 Browse Files
- Merge pull request #4833 from edx/waheed/hotfix/2014-08-12 · 0edac154
```
Check REQUEST_CONTEXT.context exists before accessing it.
```
  Adam committed Aug 14, 2014
  0edac154 Browse Files
- Check REQUEST_CONTEXT.context exists before accessing it. · d9ccaa65
```
LMS-11226
```
  Waheed Ahmed committed Aug 14, 2014
  d9ccaa65 Browse Files
- Merge pull request #4827 from edx/ecom/include-optimizely · 1caa8cc4
```
Include Optimizely on the platform
```
  Renzo Lucioni committed Aug 14, 2014
  1caa8cc4 Browse Files
- Merge pull request #4826 from edx/sarina/jsme-hotfix · 9d4a28e9
```
Release edx-jsme 1.0
```
  Sarina Canelake committed Aug 14, 2014
  9d4a28e9 Browse Files
- Factor out Optimizely project ID · 3eaac3b8
  Renzo Lucioni committed Aug 14, 2014
  
  3eaac3b8 Browse Files
- Release edx-jsme 1.0 · db13868f
  Chris Rossi committed Aug 14, 2014
  
  db13868f Browse Files
- Merge pull request #4825 from edx/sarina/annotations-fixes · 3c6a3bac
```
Sarina/annotations fixes
```
  Sarina Canelake committed Aug 14, 2014
  3c6a3bac Browse Files
- Annotation Tools: Adding try-catch in case Annotator is missing from LMS · c5f85eff
  lduarte1991 committed Aug 14, 2014
  
  c5f85eff Browse Files
- Annotation Tools: Adding comments and adding CSS groups · c88bd159
  lduarte1991 committed Aug 14, 2014
  
  c88bd159 Browse Files
- Annotation Tools: Adding Annotator to CMS · e1987854
  lduarte1991 committed Aug 14, 2014
  
  e1987854 Browse Files
- - replaced tabs with 4 spaces · f2b34d80
```
 - fixed spaces after commas, if conditions, braces, operators
 - fixed some typecasting issues as well

 - added missing semicolons
```
  lduarte1991 committed Aug 14, 2014
  f2b34d80 Browse Files
- Annotation Tools: Explicit typecasting === changes and reorganizing plugins · a00a2de8
  lduarte1991 committed Aug 14, 2014
  
  a00a2de8 Browse Files
- Merge branch 'release' · fc16ee9a
```
* release:
  pick up new ora2 (7/21 -> 8/08)
```
  Sef Kloninger committed Aug 13, 2014
  fc16ee9a Browse Files
- Merge branch 'rc' into release · 79598eb1
```
* rc:
  pick up new ora2 (7/21 -> 8/08)
  make unit tests respect mongo port/host settings (with default)
  Fix json_update_videos()       commit (1f5c95ba) to transcript_utils.py changed the sig of download_youtube_subs     from def download_youtube_subs(youtube_subs, item, settings):     to def download_youtube_subs(youtube_id, video_descriptor, settings):
```
  Sef Kloninger committed Aug 13, 2014
  79598eb1 Browse Files
13 Aug, 2014 3 commits
- pick up new ora2 (7/21 -> 8/08) · 1a1c36f5
  Sef Kloninger committed Aug 13, 2014
  
  1a1c36f5 Browse Files
- Merge pull request #4801 from edx/prof-ed-cherry-picked-changes · 9b53c809
```
hotfix-2014-08-12
```
  Julia Hansbrough committed Aug 13, 2014
  9b53c809 Browse Files
- Merge pull request #106 from Stanford-Online/dcadams/fix_vid_transcript_dl · a03d80c6
```
Fix json_update_videos()
```
  David Adams committed Aug 13, 2014
  a03d80c6 Browse Files
12 Aug, 2014 2 commits
- Consider profession ed courses as paid courses. · d60907d7
```
ECOM-63
```
  Diana Huang committed Aug 12, 2014
  d60907d7 Browse Files
- LMS: adding rendering/styling support for initial professional ed course types on student dashboard · 5caaec7b
  Brian Talbot committed Aug 12, 2014
  
  5caaec7b Browse Files