Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
22,819 Commits 1 Branch 0 Tags
e2bfcf2a36fb56fcbcd1f099aeef3debc19c9952
Commit Graph

56 Commits

Author SHA1 Message Date
Giulio Gratta
3456c1173b Added "Edit in CMS" links throughout courseware 2014-04-04 10:23:51 -07:00
Gabe Mulley
fe21f47573 Add module display name to module related server events 
This information will likely be used frequently for analytics purposes, so we would like to denormalize here to avoid having to join with the modulestore later.

Fixes: AN-594
 2014-02-25 11:53:36 -05:00
Calen Pennington
dbc99ef8ad Implement children for pure XBlocks in edx-platform 
This requires fixing the javascript api implementation, and adding
an implementation of get_block to the ModuleSystem api.

However, the implementation is incomplete, due to mismatches between
the expectations of XModule and XBlock.

Also adds tests using the Acid block to make sure that the javascript
and python apis for children are working correctly.
 2014-02-21 15:01:20 -05:00
Usman Khalid
21d8b40576 Added feature setting 'DISPLAY_HISTOGRAMS_TO_STAFF' to configure display of histograms in Staff Debug Info panel. 
Generating histograms requires scanning the courseware_studentmodule table on
each view. This can make staff access to courseware very slow on large courses.

Default is False.

LMS-1199
 2014-02-13 17:15:20 +05:00
Usman Khalid
f6d7cb5065 Renamed feature setting 'DISPLAY_HISTOGRAMS_TO_STAFF' to 'DISPLAY_DEBUG_INFO_TO_STAFF' to better communicate its purpose. 
Default is True.

LMS-1199
 2014-02-13 17:15:19 +05:00
Dave St.Germain
a6797899da Removed inappropriate section tags. Because screen readers announce each section, they should not be used unless they are actually defining meaningful sections. 2014-02-05 11:32:08 -05:00
cahrens
df09e99ad1 Create explicit Locations. 
Part of STUD-1030
 2013-12-12 14:37:00 -05:00
Calen Pennington
11bbf4c182 Add grading functionality to LTI xmodule 
Co-author: Alexander Kryklia <kryklia@edx.org>
Co-author: Ned Batchelder <ned@edx.org>
Co-author: Oleg Marchev <oleg@edx.org>
Co-author: Valera Rozuvan <valera@edx.org>
Co-author: polesye
[BLD-384]
 2013-11-26 16:30:55 -05:00
Calen Pennington
1205173d6f Add a per-course anonymous student id 
This does not yet replace the existing per-student anonymous id, but
is intended to do so in the future.

Co-author: Alexander Kryklia <kryklia@edx.org>
Co-author: Ned Batchelder <ned@edx.org>
Co-author: Oleg Marchev <oleg@edx.org>
Co-author: Valera Rozuvan <valera@edx.org>
Co-author: polesye
 2013-11-26 16:29:35 -05:00
Calen Pennington
6d613f9d4e Enable un-authenticated handler urls 
Updates to depend on the latest version of XBlock, which includes
support for service-to-service (thirdparty) handler urls, which aren't
authenticated with a user (unlike handler requests coming from the
xblock client-side javascript).

Co-author: Ned Batchelder <ned@edx.org>
 2013-11-26 16:29:34 -05:00
Calen Pennington
864d831ce3 Use XBlock handlers for handle_ajax in XModules 
Adds xblock handler_url support to the LMS, and makes handle_ajax use
that code.

[LMS-230] [LMS-229]
 2013-11-08 11:08:48 -05:00
Calen Pennington
8ddd8c14a4 Fix pylint/pep8 errors 2013-11-08 11:08:48 -05:00
Calen Pennington
ce6fbae693 Add an XBlock javascript runtime, and use it to run XModules 
[LMS-57]
 2013-10-18 16:31:32 -04:00
Calen Pennington
658810a94f Use xblock render shortcuts 2013-10-08 15:58:23 -04:00
Calen Pennington
6b474724ac Make XModuleDescriptor and XModule act as a single class 
By transparently proxying between the XModuleDescriptor and the XModule,
and between their runtimes, we can make them act as a single class, so
that we can swap in an actual XBlock instead.
 2013-10-08 15:29:17 -04:00
Calen Pennington
230bf0c643 Switch get_html replacement out for using wrap_child 2013-10-03 14:28:19 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Will Daly
c680dfdd40 Merge pull request #768 from edx/will/use-mixed-modulestore-in-tests 
Will/use mixed modulestore in tests
 2013-08-23 08:38:09 -07:00
Chris Dodge
ef98c54f5b fix some pylint violations 2013-08-21 20:06:10 -04:00
ichuang
42af561a17 pep8 and pylint for tests of nostatic import 2013-08-21 11:23:00 -04:00
Will Daly
96c2a50370 Merge branch 'master' into will/use-mixed-modulestore-in-tests 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/django.py
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/courseware/tests/tests.py
 2013-08-21 10:12:24 -04:00
Will Daly
48c6daacb8 Removed unnecessary settings wrangling from ModuleStoreTestCase. 
Modified navigation tests to use MixedModulestore
Updated factories to find editable modulestore

Updated test_submitting_problems

Updated test_tabs.py

Updated test_view_authentication

Updated test_views

Updated courseware/tests/tests.py

Updated test_masquerade

Updated test_module_render

Pylint fixes

Updated video and word cloud tests

Updated course wiki tests

Updated license and open_ended tests.
One open_ended test still failing due to Mako initialization issues

Updated staticbook

Updated django_comment_client tests

Updated instructor tests

Updated instructor task tests

Updated external_auth tests

Updated course_groups
 2013-08-21 09:36:45 -04:00
ichuang
0d938d3940 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py
 2013-08-20 23:40:09 -04:00
ichuang
95952bd693 add tests of static_asset_path and importing with no static; 
fix (again) static_replace to work with static_asset_path
 2013-08-20 23:30:26 -04:00
Chris Dodge
033f922ec0 add a try catch around the staticstorage lookup, which can throw an exception 2013-08-17 10:33:59 -04:00
Calen Pennington
99f9894f1c Switch LMS over to using XBlock rendering commands 
This makes the LMS use an XBlock's student_view, rather than an
XModule's get_html to render for display. However, it does not yet use
wrap_child to handle instructor debug information or url rewriting.

[LMS-219]
 2013-07-31 09:22:10 -04:00
Adam Palay
2efcb0cdca Change default names for various LMS components 
Embedded discussion component defaults to "Discussion"
Blank HTML page defaults to "Text"
Video component defaults to "Video"

These default names show up in tooltips.
 2013-07-25 10:38:47 -04:00
Chris Dodge
c5ef8dc526 add line break between arguments 2013-07-23 12:15:56 -04:00
Chris Dodge
345d2af540 address review feedback 2013-07-23 12:15:56 -04:00
Chris Dodge
e24eb3e4eb added explicit unit test to verify the link rewriting 2013-07-23 12:15:55 -04:00
Chris Dodge
22802a4d29 change from_xml class method on video class to make sure we honor the fact that the xml string could actually be a pointer to another file on disk which actually contains the attributes 2013-07-19 13:54:22 -04:00
Diana Huang
3f9431e8cf Provide implicit saves for XBlocks and XModules. 
Update existing tests and provide new ones to test new paradigm.
 2013-07-18 16:37:34 -04:00
JonahStanley
676da2d592 Removed set trace 2013-07-11 10:12:10 -04:00
JonahStanley
7fb5f505d6 Refactored out full from the lms tests 2013-07-11 10:12:06 -04:00
Jean Manuel Nater
72b4561e3a Moved xml_store_config, mongo_store_config, and draft_mongo_store_config to xmodule/modulestore/tests/django_util.py 
Removed some repeated instances of xml_store_config.
Reverted some changes to mongo_store_config so each modulestore gets it's own uuid.
 2013-07-01 14:45:53 -04:00
Ned Batchelder
61b53713d2 Remove unused imports from lms, as detected by pylint. 2013-06-19 16:56:34 -04:00
Greg Price
37ec01dd8d Handle ItemNotFoundError from the modulestore to avoid 500 errors 2013-05-16 16:50:03 -04:00
cahrens
16f4a3f9c1 Convert due date to a Date (vs. a string with no year). 2013-04-01 11:37:05 -04:00
Brian Wilson
c639799a07 fix missing import 2013-03-27 18:12:48 -04:00
Brian Wilson
bb7bc88847 merge out from master 2013-03-27 18:04:58 -04:00
Brian Wilson
99778b1b5b add fixes for 500 bugs (lighthouse 287 and 293) by requiring login for accessing licenses and inline discussions. Add unit tests for licenses, and rearrange tests based off of (the former) PageLoad. Also cleanups for pylint and pep8. 2013-03-27 17:59:56 -04:00
Calen Pennington
2c0e5b82ff Return a 403 when an anonymous user attempts to hit modx_dispatch. Fixes https://www.pivotaltracker.com/story/show/46916015 and https://www.pivotaltracker.com/story/show/46916029 2013-03-27 07:29:22 -04:00
Calen Pennington
6b64b4214f Make relative imports explicitly relative 2013-03-15 11:23:22 -04:00
Calen Pennington
8a9ba79d1f Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-03-06 12:15:07 -05:00
Jay Zoldak
b0a018195a Pep8 fixes for tests 2013-03-05 11:53:00 -05:00
Jay Zoldak
cee24c5cb2 Import existing UserFactory 2013-03-05 11:18:07 -05:00
Will Daly
437aadb28e Cleaned up some tests; deleted skip tests 2013-03-05 09:32:20 -05:00
Will Daly
faf5c3f0a2 Updated Deena's tests after merge with master to ensure that none 
of the tests fail.  Deleted some tests.
 2013-03-05 09:10:02 -05:00
Deena Wang
d9fdccb567 testing testing tests 2013-01-29 14:23:55 -05:00
Deena Wang
7918c35414 fixing up tests 2013-01-28 15:29:55 -05:00