Commits · 8516c0dbffff6a5e656d051da644ea46edb408cb · edx / edx-platform · GitLab

14 Jul, 2014 8 commits
- add ability for microsites to define additional profile fields to be captured in… · 8516c0db
```
add ability for microsites to define additional profile fields to be captured in an overriden signup form - register.html- and then store additional profile in the profile's 'meta' field as JSON blob

fix broken unit test

add some unit tests
```
  Chris Dodge committed Jul 14, 2014
  8516c0db Browse Files
- Merge pull request #4238 from edx/sanchez/TIM-645-File-Upload-Service · 0a73d403
```
Updating settings and requirements for platform to support file upload
```
  Stephen Sanchez committed Jul 14, 2014
  0a73d403 Browse Files
- Merge pull request #4406 from edx/sarina/071414-language-update · 8e8f6127
```
Sarina/071414 language update
```
  Sarina Canelake committed Jul 14, 2014
  8e8f6127 Browse Files
- Update translations (autogenerated message) · 980016b5
  Sarina Canelake committed Jul 14, 2014
  
  980016b5 Browse Files
- Add new Transifex languages · 5edcd969
```
Filipino, Marathi, Serbian, Telugu, Uzbek
```
  Sarina Canelake committed Jul 14, 2014
  5edcd969 Browse Files
- Merge pull request #4391 from edx/clytwynec/clean_up_lettuce_output · 1807948f
```
Clytwynec/clean up lettuce output
```
  clytwynec committed Jul 14, 2014
  1807948f Browse Files
- Merge pull request #4403 from edx/asadiqbal08/usersignupsource_model_updation_for_user_id · 61311778
```
(WIP) Updated the user_id_id field of UserSignUpSource model
```
  chrisndodge committed Jul 14, 2014
  61311778 Browse Files
- Update the UserSignUpSource model · ce7e625c
  asadiqbal08 committed Jul 14, 2014
  
  ce7e625c Browse Files
11 Jul, 2014 32 commits
- Merge pull request #4369 from edx/bug/stud-1962 · 9cf082e7
```
Bug/stud 1962
```
  Don Mitchell committed Jul 11, 2014
  9cf082e7 Browse Files
- Merge pull request #4225 from edx/mathewpeterson/lms-opaque-keys-bugs · cec09be0
```
Testing for bugs off master for opaque-keys deprecation
LMS-2753
```
  Mathew Peterson committed Jul 11, 2014
  cec09be0 Browse Files
- Merge pull request #4396 from Stanford-Online/kluo/theme_password_reset · 152b8443
```
Pull out edX into variables in password reset email
```
  Sarina Canelake committed Jul 11, 2014
  152b8443 Browse Files
- More test fixes · cd82abae
```
Fix opaque key TODOs left over from split-migrator changes and fixed test_image_import to use the correct course

Reset get_location_from_path to pre deprecated opaque-keys

Fix CMS acceptance test

Fixed usage key reassignment in item.py
```
  Mat Peterson committed Jul 11, 2014
  cd82abae Browse Files
- skipping test_clone_course · 98649072
  Mat Peterson committed Jul 11, 2014
  
  98649072 Browse Files
- Quality cleanup · b2867a69
  Sarina Canelake committed Jul 11, 2014
  
  b2867a69 Browse Files
- Minor cleanups · 96420f30
```
Remove unnecessary check.
Fix merge conflict
```
  Diana Huang committed Jul 11, 2014
  96420f30 Browse Files
- Fix merge conflict · 97331d4c
  Diana Huang committed Jul 11, 2014
  
  97331d4c Browse Files
- Add filter to ignore deprecation warnings by default · cfb7f99c
```
Add filter to only show first occurance of DepWarning
```
  Sarina Canelake committed Jul 11, 2014
  cfb7f99c Browse Files
- Made fill_in_run public in mongo and added fill_in_run to mixed which funnels to mongo · df1a9304
  Mat Peterson committed Jul 11, 2014
  
  df1a9304 Browse Files
- Old style location urls removed from CourseFixture and CoursePage · b2ae827f
  Mat Peterson committed Jul 11, 2014
  
  b2ae827f Browse Files
- Fix cms tests · ff2822cf
  Sarina Canelake committed Jul 11, 2014
  
  ff2822cf Browse Files
- Update opaque-keys hash · ad7e0f94
  Diana Huang committed Jul 11, 2014
  
  ad7e0f94 Browse Files
- Fix test_import and unicode issues. · c2197732
```
Handle unicode in get_course_index
```
  Diana Huang committed Jul 11, 2014
  c2197732 Browse Files
- Fixed test that hardcoded url to deprecated format · 638a1aae
  Mat Peterson committed Jul 11, 2014
  
  638a1aae Browse Files
- Skip tests for location mapper · f82a950f
```
Since we're trying to get rid of location mapper,
skip these tests until we get rid of it entirely.
```
  Diana Huang committed Jul 11, 2014
  f82a950f Browse Files
- studio new style assumption corrections · 1b71ace4
  Mat Peterson committed Jul 11, 2014
  
  1b71ace4 Browse Files
- Switch offering to course and run · e39cc5df
  Mat Peterson committed Jul 11, 2014
  
  e39cc5df Browse Files
- Removed some definition_key references · 78a29595
  Mat Peterson committed Jul 11, 2014
  
  78a29595 Browse Files
- Fixed some isinstance errors with opaque-keys · 4f6088cb
  Mat Peterson committed Jul 11, 2014
  
  4f6088cb Browse Files
- Testing for bugs off master for opaque-keys deprecation · aee47b44
  Mat Peterson committed Jul 11, 2014
  
  aee47b44 Browse Files
- Merge pull request #4395 from edx/mvo/unittests_alone · 5f404ba2
```
Setting default system to be lms in unittests
```
  Minh-Tue Vo committed Jul 11, 2014
  5f404ba2 Browse Files
- Pull out edX into variables in password reset email · 3a2276b5
  Kevin Luo committed Jul 11, 2014
  
  3a2276b5 Browse Files
- Merge pull request #4390 from edx/benmcmorran/defensive-has-changes · 3d409cf3
```
Defensively checks that children exist in has_changes
```
  Ben McMorran committed Jul 11, 2014
  3d409cf3 Browse Files
- setting default system to be lms · be3c517f
  Minh Tue Vo committed Jul 11, 2014
  
  be3c517f Browse Files
- Merge pull request #4393 from edx/zoldak/disable-video-lang-test · 1999a726
```
Disable failing video language test
```
  Jay Zoldak committed Jul 11, 2014
  1999a726 Browse Files
- Disable failing video language test · dc14530a
  Jay Zoldak committed Jul 11, 2014
  
  dc14530a Browse Files
- disabling zendesk in lettuce tests and removing help/feedback lettuce tests in… · 0581d0c5
```
disabling zendesk in lettuce tests and removing help/feedback lettuce tests in favor of the existing JS ones
```
  Christine Lytwynec committed Jul 11, 2014
  0581d0c5 Browse Files
- overriding a few more log levels for acceptance tests · cd580ac2
  Christine Lytwynec committed Jul 11, 2014
  
  cd580ac2 Browse Files
- Defensively checks that children exist in has_changes · cccb5cd7
  Ben McMorran committed Jul 11, 2014
  
  cccb5cd7 Browse Files
- Merge pull request #4387 from edx/markhoeber/documentation/doc-748 · b781013b
```
Added discussion label change to release notes
```
  Mark Hoeber committed Jul 11, 2014
  b781013b Browse Files
- Added discussion label change to release notes · 55769701
  Mark Hoeber committed Jul 11, 2014
  
  55769701 Browse Files