Commit Graph

17 Commits

Author SHA1 Message Date
Calen Pennington
794022733d Do json dumping and </script> replacement as close to the template as possible 2012-06-01 16:34:00 -04:00
Piotr Mitros
16f0da19b0 Merge branch 'master' into pmitros/dexml 2012-06-01 16:00:48 -04:00
Piotr Mitros
be1e308dc9 Cale's fix for eval/extra json encode 2012-06-01 12:56:20 -04:00
Calen Pennington
b574dcb8e8 Check for None with is rather than == 2012-06-01 12:18:43 -04:00
Piotr Mitros
7567e5ebf9 Working snapshot. Simple get_children. get_module taken out of render_module. 2012-06-01 10:29:12 -04:00
Piotr Mitros
98d8f4b55b Unstable commit; syncing computers 2012-05-31 21:12:08 -04:00
Piotr Mitros
97c6a26c2b Merge master 2012-05-31 13:47:50 -04:00
Piotr Mitros
34dc32e5aa Unstable state; need to merge from master 2012-05-31 13:44:45 -04:00
Prem Sichanugrist
92971127b3 Minor code style and assets fix
* Change looping code style in seq_module
* Clone and keep the latest version of jasmine-jquery locally
* Use django-pipeline asset tags
2012-05-31 13:24:25 -04:00
Prem Sichanugrist
59b453488a Rewrite Tab module, refactor Sequence module 2012-05-31 13:24:24 -04:00
Prem Sichanugrist
0b26609846 Rewrite Sequence module to use unobtrusive JS 2012-05-31 13:24:23 -04:00
Piotr Mitros
2c2072dae3 Converted to use more semantic tags. Working snapshot. 2012-05-27 07:39:09 -04:00
Piotr Mitros
32c50090eb Very draft/prototype edits. Moving CMS components in LMS. 2012-05-21 19:27:00 -04:00
Calen Pennington
02bb23f46a Minor formatting cleanup 2012-05-15 10:55:57 -04:00
Piotr Mitros
aab9b15cd4 Refactor for reusability: x_modules take common parameters as an object. capa_problem to take a file object and not filename. 2012-05-07 20:59:08 -04:00
Piotr Mitros
e1ac5e9f30 Moved extra settings into state. Added fs module for aux content 2012-05-07 20:13:30 -04:00
Calen Pennington
1bc3835fe6 Splitting files into subdirectories in preparation for merge 2012-03-19 11:10:44 -04:00