Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,994 Commits 1 Branch 0 Tags
322ac8a468c2d861643efb139db57408872679e7
Commit Graph

7292 Commits

Author SHA1 Message Date
zubair-arbi
a8bb768970 Merge pull request #3767 from edx/zub/story/std1624-cmssubsectiontests 
fix cms subsection tests
 2014-05-21 19:45:00 +05: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
David Baumgold
6e0e13003f Merge pull request #3744 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool [Fix]
 2014-05-20 15:34:34 -04:00
Frances Botsford
f2d8894118 fix for modal appearing off-screen 2014-05-20 14:13:51 -04:00
Alan Boudreault
877ec3f963 some minor improvements to embargo 2014-05-20 10:03:06 -04:00
zubair-arbi
807f8e9a9a fix cms subsection tests 
STUD-1624
 2014-05-20 13:42:51 +05:00
Alan Boudreault
db161543d8 Modified EMBARGO_SITE to SITE_EMBARGOED, improved logs 2014-05-19 15:53:45 -04:00
Alan Boudreault
ba6e61b907 Extended Embargo feature to support site access restriction and ip network 2014-05-19 15:12:02 -04: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
Mark Hoeber
8fcbdaed03 Update of all templates 
Changed help button to link and removed drop-down items
 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
Chris Rossi
db8b33d04d Use path already created by ansible. 2014-05-16 16:37:39 -04:00
Chris Rossi
42e8e3068e Use local storage instead of S3 for uploads in devstack. 2014-05-16 16:37:39 -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
lduarte1991
e911d57911 Revert "Revert pull request #3466" 
This reverts commit 59e3cae4c9.
 2014-05-15 15:23:28 -04:00
Brian Wilson
aacbc5eddb Merge branch 'release' (after release-2014-05-14). 2014-05-15 14:34:22 -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
David Baumgold
59e3cae4c9 Revert pull request #3466 2014-05-14 13:55:26 -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
Carson Gee
faefba9182 Add ADDL_INSTALLED_APPS to studio for parity with lms 2014-05-14 10:20:21 -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
16faafded9 Fix ssl redirection test 2014-05-13 14:13:45 -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
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
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
David Baumgold
c0a5171c75 Merge pull request #3466 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool
 2014-05-09 16:14:42 -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