Commits · fbae390ab05dc4f8bfa69fa28b355fd569a27b8a · edx / edx-platform

29 Jul, 2014 2 commits

Allow external_auth registrations to bypass PW complexity check · fbae390a

Cherry-pick by Joe Blaylock <jrbl@stanford.edu> into our rc with
fixups to test file; I don't know how all the indentation got broken.

Conflicts:
	common/djangoapps/student/tests/test_password_policy.py

committed Jul 29, 2014

fbae390a Browse Files

Resolve conflicts from upstream release merge · 511a38ac
```
Thanks to David and Giulio for their assistance.
```
Joe Blaylock committed Jul 29, 2014
511a38ac Browse Files

25 Jul, 2014 1 commit

Merge remote-tracking branch 'upstream/rc/2014-07-23' into jrbl/test_release · 1aa630b9

Conflicts:
	AUTHORS
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/tests/test_checklists.py
	cms/urls.py
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/course_about.html
	lms/templates/main_django.html

Joe Blaylock <jrbl@jrbl.org> intentionally left all conflicts in place,
so that we can work through resolving them systematically.

committed Jul 25, 2014

1aa630b9 Browse Files

24 Jul, 2014 2 commits
- Merge pull request #84 from Stanford-Online/kluo/i18n-support-theme-origin · e12b0943
```
Modify LOCALE_PATH & add LANGUAGE_DICT override
```
  Giulio Gratta committed Jul 24, 2014
  e12b0943 Browse Files
- Modify LOCALE_PATH & add LANGUAGE_DICT override · 49118027
  Kevin Luo committed Jul 24, 2014
  
  49118027 Browse Files
23 Jul, 2014 4 commits
- Merge pull request #82 from Stanford-Online/giulio/reorg-password-reset-done · 9c030168
```
shorten line lengths
```
  Kevin Luo committed Jul 23, 2014
  9c030168 Browse Files
- shorten line lengths · ad760a5f
  Giulio Gratta committed Jul 23, 2014
  
  ad760a5f Browse Files
- Merge pull request #81 from Stanford-Online/kluo/hotfix-password-reset-done · d0d99f32
```
Fix password reset done template
```
  Giulio Gratta committed Jul 23, 2014
  d0d99f32 Browse Files
- Fix password reset done template · 18ebd162
  Kevin Luo committed Jul 23, 2014
  
  18ebd162 Browse Files
22 Jul, 2014 6 commits
- Merge pull request #80 from Stanford-Online/kluo/i18n-for-theme · bc30571b
```
Include theme locale path for translations
```
  Giulio Gratta committed Jul 22, 2014
  bc30571b Browse Files
- Include theme locale path for translations · 64b18448
  Kevin Luo committed Jul 22, 2014
  
  64b18448 Browse Files
- Merge pull request #79 from Stanford-Online/giulio/check-submit-mismatch-fix · 348ef76f
```
fix wording for 'Check' and 'Submit' mismatch
```
  Giulio Gratta committed Jul 22, 2014
  348ef76f Browse Files
- Merge pull request #78 from Stanford-Online/dcadams/edx_sga_config · 9d900234
```
Hard code edx_sga to ADVANCED_COMPONENT_TYPES
```
  Giulio Gratta committed Jul 22, 2014
  9d900234 Browse Files
- fix wording for 'Check' and 'Submit' mismatch · 819e5346
  Giulio Gratta committed Jul 22, 2014
  
  819e5346 Browse Files
- Hard code edx_sga to ADVANCED_COMPONENT_TYPES and · 0efdc186
```
add entry to github.txt.
    Quick fix while waiting for the upstream PR to come through.
```
  David Adams committed Jul 22, 2014
  0efdc186 Browse Files
21 Jul, 2014 14 commits
- Merge pull request #4503 from edx/markhoeber-release-notes-studio-urls · b54dd4d8
```
Added item for Studio URL changes to Release Notes
```
  Mark Hoeber committed Jul 21, 2014
  b54dd4d8 Browse Files
- Added item for Studio URL changes · 520108f9
  Mark Hoeber committed Jul 21, 2014
  
  520108f9 Browse Files
- Merge pull request #4179 from IONISx/tusbar/remove-course-id-from-title · 00377652
```
Remove course ID from title in course about page
```
  Ned Batchelder committed Jul 21, 2014
  00377652 Browse Files
- resolving merge conflicts · 7023eb4c
  John Jarvis committed Jul 21, 2014
  
  7023eb4c Browse Files
- Merge pull request #4495 from edx/ora2/release-2014-07-21T12.20 · 0d5c6ba3
```
Updating the ORA2 hash for July 21st, 2014
```
  Stephen Sanchez committed Jul 21, 2014
  0d5c6ba3 Browse Files
- Merge pull request #4433 from edx/sylvia/docs/rel_notes_7_16 · 4dac56e6
```
Add course author notes for 7/16 release
```
  srpearce committed Jul 21, 2014
  4dac56e6 Browse Files
- Merge pull request #4484 from edx/talbs/fix-new-course-copy · 70da8990
```
Studio: New Course Field Tip Copy Correction
```
  Brian Talbot committed Jul 21, 2014
  70da8990 Browse Files
- Add course author notes for 7/16 release · 0f340368
  Sylvia Pearce committed Jul 21, 2014
  
  0f340368 Browse Files
- Merge remote-tracking branch 'origin/release' into rc/2014-07-16 · a03134b3
```
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
```
  Nimisha Asthagiri committed Jul 21, 2014
  a03134b3 Browse Files
- Updating the ORA2 hash for July 21st, 2014 · 77d3c3fd
  Stephen Sanchez committed Jul 21, 2014
  
  77d3c3fd Browse Files
- Merge pull request #4493 from edx/studio/bulk-edit-dont-update-ancestors · c139c2a5
```
Don't update ancestors while bulk editing.
```
  Nimisha Asthagiri committed Jul 21, 2014
  c139c2a5 Browse Files
- Merge pull request #4025 from edx/zub/bugfix/std1725-duplicatefilesonimport · ce3d6f84
```
ignore MAC meta files on import and also remove any such files from the ...
```
  zubair-arbi committed Jul 21, 2014
  ce3d6f84 Browse Files
- ignore MAC meta files on import and also remove any such files from the course · cfa873cc
```
STUD-1725
```
  zubair-arbi committed Jul 21, 2014
  cfa873cc Browse Files
- Don't update ancestors while bulk editing. · 80f078cf
```
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
```
  Nimisha Asthagiri committed Jul 20, 2014
  80f078cf Browse Files
20 Jul, 2014 1 commit
- Studio: corrects new course field tip copy to reflect what provided course… · 9c9e4a90
```
Studio: corrects new course field tip copy to reflect what provided course values cannot be changed later
STUD-2001
```
  Brian Talbot committed Jul 20, 2014
  9c9e4a90 Browse Files
19 Jul, 2014 4 commits
- Merge pull request #4381 from edx/nimisha/split-converge-api · d53a6669
```
Nimisha/split converge api
```
  Nimisha Asthagiri committed Jul 19, 2014
  d53a6669 Browse Files
- Merge pull request #4488 from edx/christina/ispublic · 40625c45
```
ispublic is in active use by Stanford.
```
  Christina Roberts committed Jul 18, 2014
  40625c45 Browse Files
- split create_item and create_child out as separate methods · 483e2a6a
  Calen Pennington committed Jul 18, 2014
  
  483e2a6a Browse Files
- ispublic is in active use by Stanford. · 77a86602
  cahrens committed Jul 18, 2014
  
  77a86602 Browse Files
18 Jul, 2014 6 commits
- Merge pull request #4482 from edx/markhoeber/documentation/doc-666 · 19fbabee
```
Corrected diff between 0K and 0 C
```
  Mark Hoeber committed Jul 18, 2014
  19fbabee Browse Files
- Corrected diff between 0K and 0 C · 26e303c1
  Mark Hoeber committed Jul 18, 2014
  
  26e303c1 Browse Files
- Merge pull request #4477 from edx/studio/minimal-fix-import-performance · 23cb5499
```
Studio/minimal fix import performance
```
  Nimisha Asthagiri committed Jul 18, 2014
  23cb5499 Browse Files
- Merge pull request #4424 from edx/anton/edit-group-configurations · 39f1f009
```
Edit group configurations.
```
  Anton Stupak committed Jul 18, 2014
  39f1f009 Browse Files
- BLD-1099: Edit group configurations. · 2a6a874a
  polesye committed Jul 18, 2014
  
  2a6a874a Browse Files
- more split_draft methods · 06ef306f
  Mathew Peterson committed Jul 17, 2014
  
  06ef306f Browse Files