Adam Palay
2b95b0ba36
add failing tests for non-ascii characters in grade cutoffs on progress page (LMS-2687)
2014-05-13 15:32:23 -04:00
Calen Pennington
6c546fbf1f
Fix merge conflicts
2014-05-13 15:31:40 -04:00
Calen Pennington
240d91daeb
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
...
Conflicts:
cms/djangoapps/contentstore/management/commands/tests/test_import.py
cms/djangoapps/contentstore/tests/test_import.py
common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
common/lib/xmodule/xmodule/modulestore/xml_importer.py
lms/djangoapps/bulk_email/tests/test_course_optout.py
lms/djangoapps/bulk_email/tests/test_email.py
lms/djangoapps/bulk_email/tests/test_err_handling.py
lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
lms/djangoapps/courseware/courses.py
lms/djangoapps/django_comment_client/base/views.py
lms/djangoapps/instructor/tests/test_email.py
lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
lms/djangoapps/instructor/tests/test_legacy_download_csv.py
lms/djangoapps/instructor/tests/test_legacy_email.py
lms/djangoapps/instructor/tests/test_legacy_enrollment.py
lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
lms/djangoapps/instructor/tests/test_legacy_gradebook.py
lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
lms/djangoapps/instructor/tests/test_legacy_reset.py
lms/djangoapps/instructor/views/api.py
lms/djangoapps/instructor/views/instructor_dashboard.py
lms/djangoapps/instructor/views/legacy.py
lms/templates/courseware/instructor_dashboard.html
2014-05-13 15:30:56 -04:00
Calen Pennington
16faafded9
Fix ssl redirection test
2014-05-13 14:13:45 -04:00
Will Daly
c6a02870e1
Update instructor dash to support ora2 submissions API with opaque keys
2014-05-13 13:28:55 -04:00
e0d
9407102b45
Merge pull request #3697 from edx/e0d/revert-mysql-upgrade
...
reverting the upgrade
2014-05-13 13:04:27 -04:00
Calen Pennington
a247bb7b9e
Fix StaffDebug javascript tests
2014-05-13 12:57:22 -04:00
Andy Armstrong
4adc608f48
Specify that split_test_modules support children.
2014-05-13 12:36:45 -04:00
Calen Pennington
6fcf65ef62
Fix staff debug view
2014-05-13 11:58:56 -04:00
srpearce
0a51b2ad12
Merge pull request #3695 from edx/sylvia/docs/DOC-359
...
Sylvia/docs/doc 359
2014-05-13 11:13:42 -04:00
Sylvia Pearce
c6f80bff2f
Update Vital Source and LTI component information
2014-05-13 11:13:03 -04:00
Brian Wilson
dcf27a9b74
Merge branch 'release'
2014-05-13 11:11:22 -04:00
Brian Wilson
d6a74a644d
Merge branch 'master' into release
...
Conflicts:
cms/static/js/views/modals/edit_xblock.js
2014-05-13 11:10:48 -04:00
Sarina Canelake
209c0d703f
Merge pull request #3685 from edx/sarina/051314-language-update
...
Update translations (autogenerated message)
2014-05-13 10:52:10 -04:00
e0d
eced86d6ce
reverting the upgrade
2014-05-13 10:36:07 -04:00
David Baumgold
09e3a86d43
Merge branch 'shindere/fix-debug-toolbar-lms' for PR #3401
2014-05-13 10:32:59 -04:00
Sébastien Hinderer
7c078e04d3
Add myself to AUTHORS.
2014-05-13 10:31:25 -04:00
Sébastien Hinderer
ec31a42637
CMS: debug toolbar should be displayed on dev stack.
...
In Studio, the debug tool bar did not appear as in LMS.
2014-05-13 10:30:59 -04:00
Calen Pennington
484c529d99
Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master
2014-05-13 10:23:24 -04:00
Waheed Ahmed
7a96faf9a3
Merge pull request #3585 from dragonfi/master
...
Fix #3347 : "Run Code" reloads page in Matlab Problem
2014-05-13 19:06:40 +05:00
Sarina Canelake
24756bdbea
Update translations (autogenerated message)
2014-05-13 10:01:37 -04:00
Carson Gee
eadf3b59e2
Merge pull request #3464 from mitocw/cg/course_image_fixes
...
Additional logic to handle more course_image URL edge cases
2014-05-13 09:19:07 -04:00
Alison Hodges
489eceee83
Merge pull request #3690 from edx/ahodges/documentation/DOC326
...
Added username as option for batch enrollment/unenroll
2014-05-13 09:13:57 -04:00
Alison Hodges
f3d11250ee
Added username as option for batch enrollment/unenroll
2014-05-13 09:13:29 -04:00
Alexander Kryklia
a3004de974
Merge pull request #3488 from edx/alex/paver_dev
...
Add dev command to run in native envs.
2014-05-13 10:53:29 +03:00
Nick Parlante
c30665fb59
Merge pull request #3677 from edx/nick/fix-feedback-bug
...
Fix targeted-feedback bug
2014-05-12 15:23:44 -07:00
Nick Parlante
f48e470f54
Fix targeted-feedback bug
...
The bug is with the case of multiple-questions with targeted
feedback within a single problem.
Refactor the targeted-feedback tests to house
the most common xml in external files.
Move the capa test load_fixture function to __init__.py so it
can be used generally.
2014-05-12 14:26:05 -07:00
Adam
7d6e3319eb
Merge pull request #3595 from edx/adam/fix-typo-2
...
put google analytics in quotation marks in linkedin email template
2014-05-12 17:10:41 -04:00
Don Mitchell
741cdf9557
Merge pull request #3688 from edx/dhm/opaque-keys-bugs
...
Dhm/opaque keys bugs
2014-05-12 17:06:10 -04:00
Adam
4ecf41126a
Merge pull request #3626 from edx/adam/fix-import-bug
...
fix importing bug (STUD-1599)
2014-05-12 16:54:21 -04:00
Adam
ae542aee3c
Merge pull request #3664 from edx/adam-inherit-max-attempts
...
add max_attempts to inheritance.py (LMS-2130)
2014-05-12 16:44:17 -04:00
Carson Gee
f247adc4b7
Merge pull request #1 from edx/ned/tweaks-for-pr-3464
...
Simple fixes
2014-05-12 16:37:51 -04:00
Calen Pennington
37b1a2f738
Remove calls to loc_mapper
2014-05-12 16:34:53 -04:00
dragonfi
8430be3d18
Fix #3347 : "Run Code" reloads page in Matlab Problem
...
Instead of refreshing only the necessary parts,
"Run Code" reloads the whole page.
This commit fixes this behaviour, by refreshing the
specific elements belonging to the Problem instead.
Also tidies up indentation.
2014-05-12 22:26:52 +02:00
dragonfi
c07b360528
Add my name to the authors file
2014-05-12 22:26:51 +02:00
Don Mitchell
45e8984997
Merge pull request #3530 from edx/dhm/opaque-locator
...
Make Locators comply with UsageKey accessors
2014-05-12 16:26:12 -04:00
Don Mitchell
bf8ca487bb
fix staff_grading server error
2014-05-12 16:25:27 -04:00
Adam Palay
a51a0c558e
fix importing bug (STUD-1599)
...
add target_location_namespace check
2014-05-12 15:59:41 -04:00
Adam Palay
e5fa0c5dd9
add max-attempts to inheritance.py (LMS-2130)
2014-05-12 15:55:15 -04:00
Ned Batchelder
2f7adda00d
Simple fixes
...
- Ensure temp files are cleaned up.
- Refactor a function with three return statements.
2014-05-12 15:52:57 -04:00
Julia Hansbrough
66bbe17e86
Merge pull request #3687 from edx/flowerhack/fix-discussion-opaque
...
Flowerhack/fix discussion opaque
2014-05-12 15:45:48 -04:00
Don Mitchell
ded28af8b4
Make Locators comply with UsageKey accessors
2014-05-12 15:35:54 -04:00
Calen Pennington
a4df0e1515
Fix failing tests
2014-05-12 14:45:38 -04:00
Greg Price
d9817117ed
Merge pull request #3647 from edx/gprice/comment-client-allow-extra-fields
...
Allow extra fields returned from comments service
2014-05-12 14:42:26 -04:00
Julia Hansbrough
f6f802f3db
Pass deprecated course keys through
2014-05-12 18:35:40 +00:00
Mark Hoeber
b00fa60ba5
Merge pull request #3686 from edx/markhoeber/documentation/release-notes-date-fix
...
Release notes date fix
2014-05-12 14:01:09 -04:00
Mark Hoeber
2c83e77c05
Release notes date fix
2014-05-12 13:56:28 -04:00
Mark Hoeber
65e9efb5ec
Merge pull request #3601 from edx/markhoeber/documentation/doc-331
...
Release Notes for 5-6-14
2014-05-12 13:49:40 -04:00
Greg Price
57f14bded1
Allow extra fields returned from comments service
...
Previously, an error was raised if the comments service returned data
including an unexpected field, which unnecessarily complicated the
release path for new features, since the list of allowed fields would
need to be modified before cs_comments_service could be modified, and
only then could edx-platform take advantage of the new CS feature. We
still log a warning if an unexpected field is returned, so we will
still be able to tell if the CS returns a corrupt response.
JIRA: FOR-180
2014-05-12 13:49:24 -04:00
Carson Gee
ff1564382d
Corrected test names and doc strings
2014-05-12 13:41:23 -04:00
