Calen Pennington
44b15619e9
Fix spoc_gradebook
2014-05-14 15:23:58 -04:00
Calen Pennington
6ca0a7a1d6
Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master
2014-05-14 10:00:25 -04:00
Calen Pennington
7e55d5eb5c
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
2014-05-14 10:00:16 -04:00
Calen Pennington
40e7cab8fb
Fix failing mongo modulestore unit tests
2014-05-14 09:59:54 -04:00
Diana Huang
43b2d670e7
Merge pull request #3713 from edx/fix-ora-errors
...
More missing ORA fixes.
2014-05-14 09:40:35 -04:00
Calen Pennington
ecdb9ec461
Address review comments
2014-05-14 09:37:38 -04:00
Waheed Ahmed
df3d6e3b06
Merge pull request #3714 from edx/waheed/lms1596-change-text-admin-dash
...
Text changed in admin_dashboard for course enrollments.
2014-05-14 18:30:51 +05:00
Waheed Ahmed
2b8fafec56
Text changed in admin_dashboard for course enrollments.
...
LMS-1596
2014-05-14 15:40:50 +05:00
Diana Huang
25e026438d
More missing ORA fixes.
2014-05-13 17:47:26 -04:00
Diana Huang
72b27c1800
Merge pull request #3709 from edx/fix-ora-errors
...
Some more places where we have ORA errors
2014-05-13 17:37:03 -04:00
Julia Hansbrough
2eda8a677a
Merge pull request #3699 from edx/flowerhack/fix-safe-exec
...
Compare stringified course_ids to regexes for courses allowed to execute...
2014-05-13 17:36:44 -04:00
Julia Hansbrough
6c46fb98ca
Compare stringified course_ids to regexes for courses allowed to execute unsafe code
2014-05-13 21:34:15 +00:00
David Baumgold
f8f542b677
Merge pull request #3710 from edx/db/add-to-authors-file
...
Added @ksteph to AUTHORS file
2014-05-13 17:16:09 -04:00
David Baumgold
c6ea63d3fd
Added @ksteph to AUTHORS file
...
See https://github.com/edx/edx-platform/pull/506
2014-05-13 17:14:09 -04:00
Diana Huang
b39278309d
More ORA fixes for opaque-keys.
2014-05-13 16:39:56 -04:00
Brian Talbot
2c9a7b51fd
Merge pull request #3696 from edx/talbs/fix-lms-dashboard-images
...
FIX - LMS: Dashboard Course Image Dimensions
2014-05-13 16:35:58 -04:00
Calen Pennington
8534ef559d
Fix cms tests after merge from master
2014-05-13 16:33:14 -04:00
Brian Talbot
cd1ec5fd58
resolving display issue where older/smaller courses images wouldn't fill designated area on the student dashboard
2014-05-13 16:25:44 -04:00
Calen Pennington
5c345b3b00
Fix more broken tests after merge from master
2014-05-13 16:21:18 -04:00
Will Daly
7fcaa20c61
Merge pull request #3702 from edx/will/opaque-keys-ora-fixes
...
Will/opaque keys ora fixes
2014-05-13 16:01:20 -04:00
Andy Armstrong
073115442c
Merge pull request #3700 from edx/andya/split_test_has_children
...
Specify that split_test_modules support children.
2014-05-13 15:45:39 -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
