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

48 Commits

Author SHA1 Message Date
cahrens
e7c06e3ab1 Change preview view method to use RESTful URL. 
STUD-848
 2013-11-19 16:56:24 -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
da26ae2529 Remove lms/lib from sys.path in favore of using it as the module lms.lib 2013-11-08 11:08:48 -05:00
Calen Pennington
c3d25e1e61 Prevent unbounded nesting of lms field_datas 
Previously, whenever a XModule was created from a XDescriptor, we
created another level of nesting of FieldData objects. This change
prevents that nesting.

[TKTS-393]
 2013-10-25 12:21:05 -04: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
Christina Roberts
ccd692dd86 Merge pull request #1133 from edx/jkarni/fix/customtag-error 
Jkarni/fix/customtag error
 2013-10-15 14:23:45 -07:00
Julian Arni
b7485fd812 Review fixes 2013-10-15 16:16:09 -04:00
Julian Arni
62a8c420ed Check for exceptions when rendering studio and students views. 
Otherwise it's possible to reach stuck states.
 2013-10-15 16:16:09 -04:00
Ned Batchelder
25a027475d Rename contentstore/views/requests to helpers 
This has caused confusion, since this file gets imported when trying to
import the requests library.  And besides, how was this file about
requests in the first place?  Helpers is a much better name.
 2013-10-15 15:53:48 -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
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Calen Pennington
230bf0c643 Switch get_html replacement out for using wrap_child 2013-10-03 14:28:19 -04:00
Calen Pennington
9643fd463f Rename xblock_field_data to xmodule_field_data 2013-09-18 10:49:41 -04:00
Calen Pennington
d35a03a0d6 Merge pull request #908 from cpennington/reference-runtime 
Replace references to .system
 2013-09-18 05:43:20 -07:00
Calen Pennington
58a5cdd81f Replace references to .system 2013-09-12 09:29:17 -04:00
Valera Rozuvan
d02ef8bc12 Add Learning Tools Interoperability (LTI) blade. 
LTI blade allows to include LTI components to courses.
Python integration, Jasmine and acceptance tests are included.
 2013-09-09 23:54:49 +03:00
Alexander Kryklia
719ec8f9d8 Revert "Merge pull request #804 from edx/valera/lti_module" 
This reverts commit 2894b21c32, reversing
changes made to 34d0fe1554.
 2013-09-09 22:51:57 +03:00
Alexander Kryklia
e10577d6ad Pass user_id and course_id to runtime in cms (dev) and tests. 2013-09-09 19:16:14 +03:00
Calen Pennington
38de05c76c Include mixins in advanced component class loading and preview modules 2013-09-06 13:37:03 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Chris Dodge
ed584a9abb fix pep8 violations 2013-08-15 22:58:04 -04:00
Chris Dodge
e4eea6cc4f some additional comments to clarify the partially bogus course_id. 2013-08-15 22:58:03 -04:00
Chris Dodge
cff93d324b WIP 2013-08-15 22:58:02 -04:00
Julian Arni
7fc6057700 Merge branch 'master' into jkarni/fix/descriptorsystemruntime 
Conflicts:
	cms/djangoapps/contentstore/views/preview.py
 2013-08-12 15:04:49 -04:00
David Baumgold
32f76988c6 Update docstring 2013-08-08 09:53:19 -04:00
David Baumgold
7aec95c310 Removed get_module_previews function 
According to @cpennington, no modules return anything for `get_sample_state`,
so this function is extraneous.
 2013-08-08 09:52:41 -04:00
David Baumgold
a87a1bfcda Docstrings 2013-08-08 09:46:15 -04:00
David Baumgold
baa9bd5bdc Make sure to return the content, not the fragment 2013-08-08 09:46:15 -04:00
David Baumgold
8a95d7e6f0 XBlock integration: replaced get_html with runtime.render() 
Currently calls the same machinery, but re-routes the logic in preparation of
deeper integration with XBlock
 2013-08-08 09:46:15 -04:00
David Baumgold
9634e222be Refactored get_module_previews function 2013-08-08 09:46:15 -04:00
Julian Arni
b38750e15d Refactor wrap_xmodule call 2013-08-05 11:09:43 -04:00
Julian Arni
7bfb0804f8 Switch to studio_view 2013-08-02 16:09:29 -04:00
David Baumgold
248793c127 Fix some pylint issues 2013-07-31 15:42:11 -04:00
Julian Arni
9725cff71e Remove get_preview_module. 
And replace calls with calls to load_preview_module.
 2013-07-30 17:31:48 -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
David Baumgold
628dff5398 pylint fixing 2013-07-09 19:16:43 -04:00
Chris Dodge
7962ad7dd0 remove incorrect comment 2013-07-03 13:46:31 -04:00
Chris Dodge
bf3a7287f0 do some lamda magic to refactor out the whitelist checking code to be shared between LMS and CMS 2013-07-03 13:46:31 -04:00
Chris Dodge
63ed16e118 add a 'can_execute_unsafe_code' callback method (ala LMS) to allow for whitelisting of courses with respect to codejailing 2013-07-03 13:46:31 -04:00
Steve Strassmann
7b71271bc1 prefix unused vars with _ 2013-05-13 15:21:29 -04:00
Steve Strassmann
8bb6ad3689 relative imports 2013-05-13 11:31:56 -04:00
Steve Strassmann
c071ee448f pep8 compliance 2013-05-10 16:51:26 -04:00
Steve Strassmann
571a9af0c0 declared exports 2013-05-10 16:37:28 -04:00
Steve Strassmann
70cca0540d reorder imports for pep8 2013-05-10 15:23:28 -04:00
Steve Strassmann
01d4fbeb7c reorder imports 2013-05-10 14:14:36 -04:00
Steve Strassmann
9350a2c067 refactoring views 2013-05-10 13:56:30 -04:00
Steve Strassmann
0bea50ede1 start refactoring views.py 2013-05-09 16:24:21 -04:00