Commits · 3eecc9639aa8189d7efcba9ea565dd0e4908809d · edx / edx-platform

23 Jul, 2014 7 commits
- Make overriding branch settings thread-safe LMS-11125 · 3eecc963
  Nimisha Asthagiri committed Jul 23, 2014
  
  3eecc963 Browse Files
- Merge pull request #4531 from edx/sylvia/docs/relnotes_7_23 · 9b8c47ab
```
Release notes for 7-23-2014
```
  srpearce committed Jul 23, 2014
  9b8c47ab Browse Files
- Release notes for 7-23-2014 · 79fb5c61
  Sylvia Pearce committed Jul 23, 2014
  
  79fb5c61 Browse Files
- Merge pull request #4491 from edx/christina/export-split · aab561b2
```
Getting draft split_test_module instances to import/export.
```
  Christina Roberts committed Jul 23, 2014
  aab561b2 Browse Files
- Merge pull request #4529 from edx/markhoeber-documentation-doc420 · e6f3ba6b
```
Added text about grade ranges and certificates
```
  Mark Hoeber committed Jul 23, 2014
  e6f3ba6b Browse Files
- Added text about grade ranges and certificates · cecbbff6
  Mark Hoeber committed Jul 23, 2014
  
  cecbbff6 Browse Files
- Getting draft split_test_module instances to import/export. · 77702fae
```
STUD-327
```
  cahrens committed Jul 23, 2014
  77702fae Browse Files
22 Jul, 2014 8 commits
- Merge pull request #4521 from edx/jeskew/update_authors · 8f4ce392
```
Jeskew/update authors
```
  doctoryes committed Jul 22, 2014
  8f4ce392 Browse Files
- Add myself to AUTHORS. · 1b77459a
  doctoryes committed Jul 22, 2014
  
  1b77459a Browse Files
- Merge pull request #4400 from edx/ahodges/documentation/DOC591 · 44eb9bb4
```
Adds sample student communications (email msgs)
```
  Alison Hodges committed Jul 22, 2014
  44eb9bb4 Browse Files
- Adds sample student communications (email msgs) · 7a02f16f
  Alison Hodges committed Jul 22, 2014
  
  7a02f16f Browse Files
- Merge pull request #4511 from edx/sarina/fix-i18n · 644e18e2
```
Fix small i18n typos
```
  Sarina Canelake committed Jul 22, 2014
  644e18e2 Browse Files
- Fix small i18n typos · 91196573
  Sarina Canelake committed Jul 22, 2014
  
  91196573 Browse Files
- Update link to Jasmine documentation · f20df3a8
  Tim Babych committed Jul 22, 2014
  
  f20df3a8 Browse Files
- Merge pull request #4479 from edx/muhhshoaib/Ex-40-Coupon-discount-value-add-validation · e9f2801c
```
Fixed the  discount value bug
```
  chrisndodge committed Jul 21, 2014
  e9f2801c Browse Files
21 Jul, 2014 23 commits
- Merge pull request #4212 from Stanford-Online/ndupoux/fixing-registration-page · bd03741c
```
Ndupoux/fixing registration page
```
  Jason Bau committed Jul 21, 2014
  bd03741c Browse Files
- Merge pull request #4431 from edx/split/get_wiki_courses · 6be33844
```
Split get_courses_for_wiki impl
```
  Sarina Canelake committed Jul 21, 2014
  6be33844 Browse Files
- Merge pull request #4453 from edx/marco/dashboard-styling-tweaks · c7d88deb
```
Visual styling adjustments to profile area on Course Dashboard
```
  marcotuts committed Jul 21, 2014
  c7d88deb Browse Files
- get_courses_for_wiki return course_keys across all modulestores [LMS-2914] · d0449cdf
  Sarina Canelake committed Jul 21, 2014
  
  d0449cdf Browse Files
- Split get_courses_for_wiki implementation [LMS-2914] · 6074e0b1
```
- Move Mongo tests to mixed ddt tests
- Check if `fields` is None before updating search targets
- Fix for double course version
```
  Don Mitchell committed Jul 21, 2014
  6074e0b1 Browse Files
- User registration prevents using password as username. · 770e7aac
```
Some users erroneously set their password as their username with the original layout, because the username field directly followed the password field. Users may be accustomed to the common occurrence of a password confirmation field directly following the password field.
To fix the issue, I did the following:
   - Moved the existing username and real name form fields above the password field.
   - Added a validation in the create_account handler in common/djangoapps/student/views.py, which confirms that the password field does not match the username field.

New tests created to check the added functionality.
```
  njdup committed Jul 21, 2014
  770e7aac Browse Files
- Merge pull request #4498 from IONISx/tusbar/fix-dump-grades-unicode · feac1e0b
```
Fix unicode issue
```
  Ned Batchelder committed Jul 21, 2014
  feac1e0b Browse Files
- 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
- Fix unicode issue · 602988c3
  Bertrand Marron committed Jul 21, 2014
  
  602988c3 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
- removed the discount value bug · 2d41ebe4
```
check error handling if the discount value is not an integer
```
  Muhammad Shoaib committed Jul 21, 2014
  2d41ebe4 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 1 commit
- Merge pull request #4381 from edx/nimisha/split-converge-api · d53a6669
```
Nimisha/split converge api
```
  Nimisha Asthagiri committed Jul 19, 2014
  d53a6669 Browse Files