Chris Dodge
8516c0dbff
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
2014-07-14 09:36:28 -04:00
Stephen Sanchez
0a73d403d7
Merge pull request #4238 from edx/sanchez/TIM-645-File-Upload-Service
...
Updating settings and requirements for platform to support file upload
2014-07-14 09:22:40 -04:00
Sarina Canelake
8e8f6127e6
Merge pull request #4406 from edx/sarina/071414-language-update
...
Sarina/071414 language update
2014-07-14 09:19:57 -04:00
Sarina Canelake
980016b59f
Update translations (autogenerated message)
2014-07-14 09:19:25 -04:00
Sarina Canelake
5edcd969c8
Add new Transifex languages
...
Filipino, Marathi, Serbian, Telugu, Uzbek
2014-07-14 09:19:24 -04:00
clytwynec
1807948f2e
Merge pull request #4391 from edx/clytwynec/clean_up_lettuce_output
...
Clytwynec/clean up lettuce output
2014-07-14 09:09:25 -04:00
chrisndodge
6131177891
Merge pull request #4403 from edx/asadiqbal08/usersignupsource_model_updation_for_user_id
...
(WIP) Updated the user_id_id field of UserSignUpSource model
2014-07-14 07:21:37 -04:00
asadiqbal08
ce7e625c3b
Update the UserSignUpSource model
2014-07-14 12:36:00 +05:00
Don Mitchell
9cf082e727
Merge pull request #4369 from edx/bug/stud-1962
...
Bug/stud 1962
2014-07-11 16:57:00 -04:00
Mathew Peterson
cec09be006
Merge pull request #4225 from edx/mathewpeterson/lms-opaque-keys-bugs
...
Testing for bugs off master for opaque-keys deprecation
LMS-2753
2014-07-11 16:53:23 -04:00
Sarina Canelake
152b84432e
Merge pull request #4396 from Stanford-Online/kluo/theme_password_reset
...
Pull out edX into variables in password reset email
2014-07-11 16:02:51 -04:00
Mat Peterson
cd82abae6c
More test fixes
...
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
2014-07-11 15:40:09 -04:00
Mat Peterson
98649072bd
skipping test_clone_course
2014-07-11 15:40:09 -04:00
Sarina Canelake
b2867a694d
Quality cleanup
2014-07-11 15:40:09 -04:00
Diana Huang
96420f30f1
Minor cleanups
...
Remove unnecessary check.
Fix merge conflict
2014-07-11 15:40:09 -04:00
Diana Huang
97331d4c16
Fix merge conflict
2014-07-11 15:40:09 -04:00
Sarina Canelake
cfb7f99c8e
Add filter to ignore deprecation warnings by default
...
Add filter to only show first occurance of DepWarning
2014-07-11 15:40:09 -04:00
Mat Peterson
df1a9304c1
Made fill_in_run public in mongo and added fill_in_run to mixed which funnels to mongo
2014-07-11 15:40:09 -04:00
Mat Peterson
b2ae827fa4
Old style location urls removed from CourseFixture and CoursePage
2014-07-11 15:40:09 -04:00
Sarina Canelake
ff2822cf48
Fix cms tests
2014-07-11 15:40:09 -04:00
Diana Huang
ad7e0f94fb
Update opaque-keys hash
2014-07-11 15:40:09 -04:00
Diana Huang
c21977326c
Fix test_import and unicode issues.
...
Handle unicode in get_course_index
2014-07-11 15:40:08 -04:00
Mat Peterson
638a1aaec4
Fixed test that hardcoded url to deprecated format
2014-07-11 15:40:08 -04:00
Diana Huang
f82a950f7b
Skip tests for location mapper
...
Since we're trying to get rid of location mapper,
skip these tests until we get rid of it entirely.
2014-07-11 15:40:08 -04:00
Mat Peterson
1b71ace4b0
studio new style assumption corrections
2014-07-11 15:40:08 -04:00
Mat Peterson
e39cc5dfa3
Switch offering to course and run
2014-07-11 15:40:08 -04:00
Mat Peterson
78a2959540
Removed some definition_key references
2014-07-11 15:40:08 -04:00
Mat Peterson
4f6088cbd1
Fixed some isinstance errors with opaque-keys
2014-07-11 15:40:08 -04:00
Mat Peterson
aee47b44df
Testing for bugs off master for opaque-keys deprecation
2014-07-11 15:40:08 -04:00
Minh-Tue Vo
5f404ba23f
Merge pull request #4395 from edx/mvo/unittests_alone
...
Setting default system to be lms in unittests
2014-07-11 15:27:07 -04:00
Kevin Luo
3a2276b537
Pull out edX into variables in password reset email
2014-07-11 12:25:54 -07:00
Ben McMorran
3d409cf323
Merge pull request #4390 from edx/benmcmorran/defensive-has-changes
...
Defensively checks that children exist in has_changes
2014-07-11 15:13:35 -04:00
Minh Tue Vo
be3c517f2a
setting default system to be lms
2014-07-11 14:44:43 -04:00
Jay Zoldak
1999a72690
Merge pull request #4393 from edx/zoldak/disable-video-lang-test
...
Disable failing video language test
2014-07-11 14:02:55 -04:00
Jay Zoldak
dc14530a9e
Disable failing video language test
2014-07-11 13:04:02 -04:00
Christine Lytwynec
0581d0c5a1
disabling zendesk in lettuce tests and removing help/feedback lettuce tests in favor of the existing JS ones
2014-07-11 12:01:03 -04:00
Christine Lytwynec
cd580ac247
overriding a few more log levels for acceptance tests
2014-07-11 12:01:03 -04:00
Ben McMorran
cccb5cd7b6
Defensively checks that children exist in has_changes
2014-07-11 11:30:31 -04:00
Mark Hoeber
b781013b0b
Merge pull request #4387 from edx/markhoeber/documentation/doc-748
...
Added discussion label change to release notes
2014-07-11 10:12:15 -04:00
Mark Hoeber
557697016e
Added discussion label change to release notes
2014-07-11 10:03:19 -04:00
Alison Hodges
fb18555a1b
Merge pull request #4376 from edx/ahodges/documentation/activestudents
...
New "Active Students" data on instructor dash
2014-07-11 09:18:39 -04:00
Alison Hodges
208b24de1a
New "Active Students" data on instructor dash
2014-07-11 09:18:15 -04:00
Sarina Canelake
b0170a5c30
Merge pull request #4379 from Stanford-Online/kluo/exclude-browser-translation
...
Subsume browser links to variables, to exclude from translation
2014-07-11 08:44:02 -04:00
Waqas Khalid
a9f751d947
Merge pull request #4297 from mlkwaqas/waqas/for122-anonymous-post-are-anonymous-to-staff
...
Show thread user to staff when only anonymous_to_peers is true
2014-07-11 16:47:46 +05:00
Waqas Khalid
81dfcb04aa
Show thread user to staff when only anonymous_to_peers is true
...
FOR-122
2014-07-11 13:09:13 +05:00
Kevin Luo
92381f0f84
Subsume browser links to variables, to exclude from translation
2014-07-10 15:40:51 -07:00
Ned Batchelder
d94b92026b
Merge pull request #4377 from edx/ned/fix-pr-4168
...
unicode fixes
2014-07-10 18:01:50 -04:00
Ned Batchelder
84cfea8ead
Remove an unneeded unicode conversion
2014-07-10 17:06:16 -04:00
Abdallah
cf16975bd2
unicode fixes
2014-07-10 17:06:16 -04:00
Julia Hansbrough
e8d264f870
Merge pull request #4368 from lduarte1991/lduarte-harvardx-pr9
...
Annotation Tool: Removed color bug from Flagging and HighlightTags plugins
2014-07-10 15:41:22 -04:00
