Calen Pennington
29f7fe14fb
Merge remote-tracking branch 'edx/master' into ok-merge-from-master
2014-05-23 10:05:56 -04:00
zubair-arbi
0054b79d5a
Merge pull request #3306 from edx/zub/bugfix/std1523-uploadassetbutton
...
move upload asset code for assets to AssetsView
2014-05-23 18:24:24 +05:00
Calen Pennington
35083ad9f9
Fix bad uses of course_id/location/locator in new code on master
2014-05-22 16:24:02 -04:00
Calen Pennington
240fcc1d5a
Fix merge conflicts
2014-05-22 16:24:02 -04:00
Jay Zoldak
9f6d0594d3
Merge pull request #3835 from edx/zoldak/skip-brittle-test
...
Skip brittle HTML editor lettuce test
2014-05-22 15:45:09 -04:00
Jay Zoldak
7db6e639e2
Skip brittle test
2014-05-22 12:22:55 -04:00
Andy Armstrong
dfbfd7b204
Merge pull request #3802 from louyihua/translation-fix
...
i18n: Make checklists translatable
2014-05-22 11:22:04 -04:00
Calen Pennington
cd862b3253
Merge remote-tracking branch 'edx/master' into opaque-keys
...
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views/component.py
cms/djangoapps/contentstore/views/item.py
cms/djangoapps/contentstore/views/preview.py
cms/djangoapps/contentstore/views/tests/test_container.py
cms/static/js/spec/views/unit_spec.js
cms/static/js/utils/module.js
cms/templates/container.html
cms/templates/studio_vertical_wrapper.html
cms/templates/studio_xblock_wrapper.html
common/djangoapps/student/views.py
lms/templates/notes.html
lms/templates/textannotation.html
lms/templates/videoannotation.html
2014-05-22 10:52:00 -04:00
louyihua
34d2f051a4
i18n: Make checklists translatable
...
Now the description & action_text strings in checklists can be extracted and translated.
2014-05-22 22:15:45 +08:00
Ben Patterson
dd07967805
Disable cms test due to failure on master build.
2014-05-22 09:24:13 -04:00
zubair-arbi
72d9a91f1d
Merge pull request #3766 from edx/zub/bugfix/std1616-editdraft
...
create draft request gets already created version if it exists
2014-05-22 18:18:56 +05:00
Andy Armstrong
541d20ef83
Allow creation of components on container page
...
This commit implements STUD-1490, allowing creation of components
on the container page. It also enables the delete and duplicate
buttons now that new content can be created that would benefit.
Note that it also creates shared functionality for adding components,
and refactors the unit page to use it too.
2014-05-21 15:40:31 -04:00
Calen Pennington
7f8543a2e4
Clean up logging in import_export.py
2014-05-21 14:25:21 -04:00
zubair-arbi
6d0e2b215c
update _xmodule_recurse method
2014-05-21 18:31:19 +05:00
zubiar-arbi
08f313f9b4
move upload code for assets to AssetsView
...
STUD-1523
2014-05-21 17:15:04 +05:00
zubair-arbi
6bdf984e8d
update _xmodule_recurse to ignore some exception
2014-05-21 16:36:55 +05:00
zubair-arbi
83db659f94
create draft request gets already created version if it exists
...
STUD-1616
2014-05-21 16:36:54 +05:00
zubair-arbi
807f8e9a9a
fix cms subsection tests
...
STUD-1624
2014-05-20 13:42:51 +05:00
Calen Pennington
8f72394e81
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
...
Conflicts:
cms/templates/widgets/header.html
2014-05-19 09:20:08 -04:00
Nimisha Asthagiri
73275eeb82
Updated tests for online help
2014-05-16 21:27:57 -04:00
Mark Hoeber
27ff0db57b
Added new context sensitive link and updated text
...
Sock template changes
2014-05-16 20:38:09 -04:00
Nimisha Asthagiri
84d8fcf1b5
Acceptance tests for online help.
2014-05-16 20:38:09 -04:00
Nimisha Asthagiri
b7440a51e8
Dev support for context-sensitive help.
2014-05-16 20:37:32 -04:00
Calen Pennington
ba7abf4291
Fix test_import_export.py
2014-05-16 15:41:14 -04:00
Calen Pennington
6d5478a483
Migrate new code from merge to use OK standards
2014-05-16 14:20:35 -04:00
Calen Pennington
d4280e8529
Fix merge conflicts
2014-05-16 14:10:50 -04:00
Calen Pennington
18c91d0f1d
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
...
Conflicts:
cms/djangoapps/contentstore/tests/utils.py
cms/djangoapps/contentstore/views/import_export.py
cms/djangoapps/contentstore/views/tests/test_import_export.py
common/djangoapps/student/views.py
lms/djangoapps/class_dashboard/dashboard_data.py
lms/djangoapps/instructor/views/instructor_dashboard.py
lms/static/js/staff_debug_actions.js
lms/templates/notes.html
lms/templates/staff_problem_info.html
2014-05-16 14:01:20 -04:00
zubair-arbi
74aa3a5ba0
create course gorups properly on course import
...
STUD-1595
2014-05-16 14:58:11 +05:00
Don Mitchell
84da71d923
Ensure all cms commands accept either deprecated or new syntax for keys
...
LMS-2712
2014-05-15 17:09:12 -04:00
Jay Zoldak
026e6e4a6d
Disable failing cms acceptance tests
2014-05-15 11:51:06 -04:00
Calen Pennington
661f37ecd6
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
...
Conflicts:
lms/djangoapps/courseware/tests/test_views.py
lms/djangoapps/instructor/tests/test_api.py
lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
lms/djangoapps/instructor/views/api.py
lms/djangoapps/instructor/views/legacy.py
2014-05-14 15:57:38 -04:00
Jay Zoldak
8ffc51689e
Merge pull request #3598 from edx/zoldak/rebalance-cms-shards
...
Rebalance CMS acceptance test shards
2014-05-14 11:29:31 -04:00
Calen Pennington
8534ef559d
Fix cms tests after merge from master
2014-05-13 16:33:14 -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
484c529d99
Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master
2014-05-13 10:23:24 -04:00
Calen Pennington
37b1a2f738
Remove calls to loc_mapper
2014-05-12 16:34:53 -04:00
Adam Palay
a51a0c558e
fix importing bug (STUD-1599)
...
add target_location_namespace check
2014-05-12 15:59:41 -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
Calen Pennington
85ca7db7a6
Fix merge conflicts relative to master
2014-05-12 11:42:21 -04:00
Calen Pennington
19acdd31e8
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
...
Conflicts:
cms/djangoapps/contentstore/views/public.py
common/djangoapps/external_auth/tests/test_ssl.py
common/djangoapps/student/views.py
lms/djangoapps/dashboard/sysadmin.py
lms/templates/notes.html
2014-05-12 11:35:03 -04:00
polesye
2d64a2773f
Fix acceptance tests.
2014-05-12 16:22:05 +03:00
David Ormsbee
77c7ebd704
Merge pull request #2768 from carsongee/cg/ssl-next-url
...
Modified ssl certificate authentication to handle next redirection
2014-05-11 20:12:12 -04:00
Calen Pennington
c72b0bb293
Resolve merge conflicts relative to master
2014-05-09 15:31:20 -04:00
Calen Pennington
155ffe37ca
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
...
Conflicts:
cms/djangoapps/contentstore/views/item.py
cms/djangoapps/contentstore/views/tests/test_container.py
cms/djangoapps/contentstore/views/tests/test_tabs.py
common/lib/xmodule/xmodule/modulestore/mongo/draft.py
lms/djangoapps/certificates/management/commands/gen_cert_report.py
lms/djangoapps/certificates/queue.py
lms/djangoapps/certificates/views.py
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/tests/test_module_render.py
lms/djangoapps/instructor/views/api.py
lms/djangoapps/instructor/views/instructor_dashboard.py
lms/djangoapps/instructor/views/legacy.py
lms/djangoapps/shoppingcart/tests/test_models.py
lms/djangoapps/verify_student/views.py
2014-05-09 15:29:32 -04:00
Carson Gee
cbf525f6cf
Fix infinite redirect loop on logout caused by django caching
2014-05-09 14:22:11 -04:00
Carson Gee
5452de20d8
Modified ssl certificate authentication to handle next redirection
...
Makes small changes in lms and cms both so that user's go to the
original page they intended to if they weren't already logged in
2014-05-09 14:22:10 -04:00
Sylvia Pearce
c1ef41fe6a
Update Video component UI text
2014-05-09 12:37:28 -04:00
Don Mitchell
660f905028
Merge pull request #3658 from edx/opaque-keys-location-to-son
...
Opaque keys location to son
2014-05-09 10:48:51 -04:00
