97614d8901
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
Chris Dodge
2012-10-30 11:52:38 -04:00
f4822c23de
lots of tweeks to better support importing of existing courseware
Chris Dodge
2012-10-30 11:52:31 -04:00
d63f82ae57
moved error message into form area; tweaked cancel behavior
Tom Giannattasio
2012-10-30 11:39:08 -04:00
e8be6b3111
Get jasmine tests running on cms
Calen Pennington
2012-10-30 11:33:21 -04:00
535980eb6d
Allow optional advertised_start metadata in Course, to let people pre-launch thier courses quietly if desired.
David Ormsbee
2012-10-30 11:06:50 -04:00
6d5a1264b9
Move jasmine tests to their own environment
Calen Pennington
2012-10-30 10:58:38 -04:00
684b98505d
Make rake commands to run jasmine tests in browser and via phantomjs
Calen Pennington
2012-10-30 10:41:02 -04:00
a155265409
minor whitespace + comment fixes
Victor Shnayder
2012-10-29 23:44:38 -04:00
7966c18d2e
Add migration to make columns added by askbot nullable, in preparation for eventually deleting them
Calen Pennington
2012-10-29 15:12:15 -04:00
2c01bf4a48
Merge pull request #982 from MITx/feature/victor/inputtypes-refactor
Victor Shnayder
2012-10-29 09:07:12 -07:00
6cc196394a
fixing comments
Victor Shnayder
2012-10-29 12:06:42 -04:00
d297077775
merge in master
Victor Shnayder
2012-10-29 09:22:23 -04:00
e422716045
Add changelogs for the CMS and LMS
Calen Pennington
2012-10-29 09:07:49 -04:00
b03789156c
add test for vsepr
Victor Shnayder
2012-10-29 08:16:31 -04:00
516b720f1e
Rename: use 'status' in templates as well as in the code.
Victor Shnayder
2012-10-29 08:05:07 -04:00
ab03f3dddf
move textinput.html to textline.html for consistency with other inputs
Victor Shnayder
2012-10-29 07:56:10 -04:00
318ea9b135
add back mathjax textarea
Victor Shnayder
2012-10-29 07:51:58 -04:00
02bd99697b
Clean up section ids and classes
Victor Shnayder
2012-10-29 07:49:33 -04:00
a97298e8f7
add note about documenting js input
Victor Shnayder
2012-10-29 07:48:53 -04:00
d6cb432842
Replace overriding constructor with a setup() method.
Victor Shnayder
2012-10-29 07:42:11 -04:00
1a843c2d77
Remove non-working TrueFalse functionality from choicegroup, combine tests with radiogroup and checkboxgroup
Victor Shnayder
2012-10-29 07:23:27 -04:00
98c3d861ad
Fix reference to iidiv
kimth
2012-10-27 18:19:56 +00:00
da56f190a2
putting vsepr static image files where vsepr js can find them. TODO: reogranize after proper input type static file storage is sorted out.
Victor Shnayder
2012-10-26 21:41:22 -04:00
7a84bed916
hackish EAD export support
David Ormsbee
2012-10-26 15:50:32 -04:00
5a96820929
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
Chris Dodge
2012-10-26 14:09:15 -04:00
3d9c92c574
Remove references to #visibility id that was changed to .visibility-select
Calen Pennington
2012-10-26 13:34:21 -04:00
1d21473182
Merge branch 'feature-alex-vsepr-mitx'
Александр
2012-10-26 18:30:25 +03:00
9558629e15
fix merge error
Александр
2012-10-26 18:21:00 +03:00
5cd04906e6
fix typo
Александр
2012-10-26 18:16:37 +03:00
c1e75e083f
added unittests
Александр
2012-10-22 19:25:07 +03:00
c5f6f7ada2
html entities are renamed to work with different id's
Александр
2012-10-19 16:11:11 +03:00
948f8090eb
grading for vsepr
Александр
2012-10-17 17:31:19 +03:00
5185df3805
continue vsepr grading
Александр
2012-10-16 19:42:04 +03:00
94b70fd891
start grading implementation
Александр
2012-10-16 19:15:58 +03:00
e6eedb9293
added chemtools to chem module in capa, and added it to global context
Александр
2012-10-16 18:45:25 +03:00
6306d98007
vsepr: geometries and molecules now are passed from xml as parameters
Александр
2012-10-16 17:52:30 +03:00
495814c7f6
Hacked better alignment for VSEPR for demo
Piotr Mitros
2012-10-14 21:33:33 -04:00
bf4d5bf799
starting enviroment
Александр
2012-10-12 19:32:09 +03:00
206b1e26d3
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
Chris Dodge
2012-10-26 10:02:45 -04:00
b7c830a861
use existing _replace() method on Location to do the re-namespacing on import
Chris Dodge
2012-10-25 16:37:31 -04:00
ba15735214
implement static tabs. rejigger .tar.gz import to do the re-namespacing as a post-processing step as we need to retain the original url_name during the import. Also, migrate the presentation tier to use module_render.py::get_module() to better unify HTML'ifying stuff
Chris Dodge
2012-10-25 14:27:26 -04:00
bd1233d38c
Only update data in modules that have been set when passing into save_item, and don't force callers to set everything
Calen Pennington
2012-10-25 13:56:24 -04:00
5ab8e312f5
Fixing description of import format
Calen Pennington
2012-10-25 13:23:11 -04:00
f19ec64659
Point Studio forgot password at corresponding lms forgot password. There is no place for a reset password link in Studio at the moment
Calen Pennington
2012-10-25 10:47:41 -04:00
4a0e5f66d6
Fix link in jobs page
Carlos Andrés Rocha
2012-10-25 10:06:47 -04:00
606e2dba15
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
Chris Dodge
2012-10-24 20:57:08 -04:00
fec6c42adc
implement importing of course info sections as modules in the course
Chris Dodge
2012-10-24 20:55:04 -04:00