Commits · 0c90b04ecdda071df704087153c7dcd9a9086069 · edx / edx-platform

14 Jul, 2014 18 commits
- Add JQuery timepicker CSS to the unit and container templates · 0c90b04e
  Will Daly committed Jul 14, 2014
  
  0c90b04e Browse Files
- Merge pull request #3836 from mitocw/cg/add_default_logging · 95dd2aad
```
Adding django default log handlers into logging configuration
```
  Carson Gee committed Jul 14, 2014
  95dd2aad Browse Files
- Merge pull request #4397 from edx/split-migrator/lms-2936-ok · 57ec4024
```
Refactor split migrator
```
  Don Mitchell committed Jul 14, 2014
  57ec4024 Browse Files
- Merge pull request #4407 from edx/ora2/release-2014-07-14T13.17 · 86f80c25
```
Updating release tag for July 14th, 2014
```
  Stephen Sanchez committed Jul 14, 2014
  86f80c25 Browse Files
- Merge pull request #4401 from edx/ahodges/dosumentation/DOC719 · 2c83dc3f
```
Ahodges/dosumentation/doc719
```
  Alison Hodges committed Jul 14, 2014
  2c83dc3f Browse Files
- Revising policy key names to match new UI · 85df351c
  Alison Hodges committed Jul 14, 2014
  
  85df351c Browse Files
- Merge pull request #4405 from pdpinch/fix-calc-definition-of-T · c36b1726
```
Fixing calculator hint to display correct definition of the constant T
```
  Ned Batchelder committed Jul 14, 2014
  c36b1726 Browse Files
- Refactor split migrator · 63965891
```
LMS-2936

Also, a bunch of ancillary cleanups.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_publish.py

Conflicts:
	cms/djangoapps/contentstore/management/commands/migrate_to_split.py
	cms/djangoapps/contentstore/management/commands/tests/test_rollback_split_course.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	common/lib/xmodule/xmodule/modulestore/split_migrator.py
	common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
	common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py
	common/lib/xmodule/xmodule/modulestore/tests/test_split_w_old_mongo.py
```
  Don Mitchell committed Jul 14, 2014
  63965891 Browse Files
- Merge pull request #4383 from mlkwaqas/waqas/for156-anonymous-posts-labels-user-roles · 36352fa5
```
Fix anonymous posts appear are labeled with the logged in user's role
```
  Greg Price committed Jul 14, 2014
  36352fa5 Browse Files
- Updating release tag for July 14th, 2014 · a41d04e6
  Stephen Sanchez committed Jul 14, 2014
  
  a41d04e6 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
- Fix anonymous posts appear are labeled with the logged in user's role · f1df9a10
```
FOR-156
```
  Waqas Khalid committed Jul 14, 2014
  f1df9a10 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
13 Jul, 2014 1 commit
- Fixing calculator hint to display correct definition of the constant T · 2c8f82f0
  Peter Pinch committed Jul 13, 2014
  
  2c8f82f0 Browse Files
11 Jul, 2014 21 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