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

2479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
b8aff5131f Merge branch 'master' into cpennington/cms-github 2012-07-03 21:31:31 -04:00
Calen Pennington
e33dce862a Merge branch 'master' into cpennington/cms-github 2012-07-03 21:24:44 -04:00
Calen Pennington
31288d6caf Only use the for_cms branch for development purposes 2012-07-03 21:22:48 -04:00
Calen Pennington
894ae58bc3 Use unicode for filepaths in data repos 2012-07-03 21:22:36 -04:00
Calen Pennington
b0ff3053b9 Add development code for pushing CMS changes to github 2012-07-03 19:06:07 -04:00
Calen Pennington
cf2691301e Use _id to store the location, rather than location 2012-07-03 19:00:56 -04:00
Calen Pennington
9ae644e007 Make html save action send the correct data type 2012-07-03 18:59:17 -04:00
Calen Pennington
d99d98670e Point at root url for save_item 2012-07-03 18:57:35 -04:00
Kyle Fiedler
841fb8da0b Added the wip calss back in 2012-07-03 16:26:56 -04:00
Kyle Fiedler
ffea8e3e7d added more style for unit page, hovers, and buttons 2012-07-03 16:19:19 -04:00
Kyle Fiedler
20df117bfc Added style for the calendar view and section view 2012-07-03 16:19:19 -04:00
Calen Pennington
9b134aadf4 Swallow attempts to create a new item where one already exists 2012-07-03 16:04:18 -04:00
Kyle Fiedler
3415e48be5 Added bug fix for speed selector 2012-07-03 16:03:29 -04:00
Prem Sichanugrist
28cc64b9b1 Remove unused lms/problem.js 2012-07-03 15:00:41 -04:00
Prem Sichanugrist
cec1b23d7d Remove mystery guest from the test 2012-07-03 14:53:57 -04:00
Calen Pennington
5a2b2e0126 Add an index page that lists all courses 2012-07-03 14:44:41 -04:00
Prem Sichanugrist
0815f3498a Cleanup Video Logger, update logging message 2012-07-03 14:35:40 -04:00
Prem Sichanugrist
8fb06ce194 Update code according to changes in 829e502 2012-07-03 14:33:24 -04:00
Prem Sichanugrist
de4d487402 Fix failing tests after jQuery upgrade 2012-07-03 14:33:23 -04:00
Prem Sichanugrist
e7e0fe1f3d Fix element naming convention 2012-07-03 14:33:23 -04:00
Prem Sichanugrist
4e183dd6e1 Clean up events binding in Video Player 
* Video Player now acting as a parent that always knowing the state of
  their children.
* Events on the sub-controls are now triggered on itself, and binded by
  the Video Player instead of triggering everything on the Video Player.
* A new helper class, SubView, has been introduced to cleanup repeat
  logic on scoped jQuery selector, render() and bind()
 2012-07-03 14:33:23 -04:00
Calen Pennington
a5d861d298 Make course index page read from url for org, course, name 2012-07-03 14:29:50 -04:00
Calen Pennington
207777fbe1 Fix up problem display to use the new metadata that's available 2012-07-03 14:20:11 -04:00
Calen Pennington
42cef5b788 Get rid of references to self.filename in capa_module, as it no longer exists 2012-07-03 14:19:51 -04:00
Calen Pennington
10add56660 Add url to point git service hooks at in order to trigger an import from github 2012-07-03 13:43:56 -04:00
Calen Pennington
4e599d4ab2 Extract import from xml into a separate function 2012-07-03 13:42:35 -04:00
Calen Pennington
67a732a0ff Allow the HTML module to use the lxml HTML parser when parsing html file includes 2012-07-03 13:18:01 -04:00
Calen Pennington
68c155b268 Don't use __dict__ for namedtuples, because it doesn't work in python 2.7.1 2012-07-03 09:57:51 -04:00
Calen Pennington
92ea15b786 Merge pull request #155 from MITx/cpennington/cms-xml-export 
This allows XModuleDescriptors to export themselves to XML
 2012-07-02 17:08:36 -07:00
Calen Pennington
64a4a62cf5 Don't pass fileobjects to LoncapaProblem 2012-07-02 20:01:20 -04:00
Calen Pennington
3355f804d1 Add logging of filename when module file parsing fails 2012-07-02 20:01:01 -04:00
Calen Pennington
e172be3a26 Make XML import pass in an empty render_template function 2012-07-02 19:55:42 -04:00
Calen Pennington
3b4fb61648 Push dependency on mitxmako up out of mako_module 2012-07-02 14:10:29 -04:00
ichuang
1509cdcced Merge pull request #153 from MITx/cpennington/lms-descriptors 
These changes make the LMS read from the XML course files using the ModuleStore interface. 

Note that stable-edx4edx will now no longer be a clean merge.  But this code has priority.
 2012-07-02 10:52:22 -07:00
Calen Pennington
d7178e4a41 Add a set of rake tasks for checking settings importability 2012-07-02 13:26:31 -04:00
Calen Pennington
e56f8763ac Point to the js files in package data 2012-07-02 13:26:14 -04:00
Calen Pennington
a0f550396c Make xmodule fit the typical python installation setup 2012-07-02 13:19:27 -04:00
Calen Pennington
cc8ecb1891 Make xmodule tests pass again 2012-07-02 12:50:03 -04:00
Calen Pennington
8f59521660 Add a function to check round-trip export/import cycles 2012-07-02 12:25:48 -04:00
Calen Pennington
be40d8bb69 Make sure that xml_module definition xml doesn't have any metadata sprinkled in with it 2012-07-02 12:25:09 -04:00
Calen Pennington
c57833dab7 Define equality for XModuleDescriptors 2012-07-02 12:24:39 -04:00
Calen Pennington
f035d5602d Keep abtest children in a consistent order (makes testing easier) 2012-07-02 12:24:07 -04:00
Calen Pennington
3a348e5713 Adjust xml export code for the type -> category conversion 2012-07-02 11:25:42 -04:00
Calen Pennington
d7dbced8e6 Store the top level course in the XMLModuleStore (since there is only one course per module store 2012-07-02 11:25:21 -04:00
Calen Pennington
85f294b3e3 Allow for no default_class in XMLModuleStore 2012-07-02 11:21:40 -04:00
Calen Pennington
6612beab46 Acknowledge the fact that right now keystore is really just a module store. If we need a keystore that returns other objects, we can reexctract the base class into it's own module again 2012-07-02 11:15:37 -04:00
Calen Pennington
8cf848b191 Handle the filename for capa_module in the xml_module code, rather than specially in capa_module 2012-07-02 10:51:01 -04:00
Calen Pennington
552c199795 Export large xml as separate files. Note: inherited metadata is creeping into child nodes 2012-07-02 10:51:01 -04:00
Calen Pennington
bacce3e656 Load module contents from the file specified by the filename attribute 2012-07-02 10:51:01 -04:00
Calen Pennington
9c715b60a6 Fix broken element ids for modules with .s in their names 2012-07-02 10:51:01 -04:00