Александр
|
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-26 18:09:54 +03:00 |
|
Александр
|
c5f6f7ada2
|
html entities are renamed to work with different id's
|
2012-10-26 18:09:53 +03:00 |
|
Александр
|
948f8090eb
|
grading for vsepr
|
2012-10-26 18:09:53 +03:00 |
|
Александр
|
5185df3805
|
continue vsepr grading
|
2012-10-26 18:09:53 +03:00 |
|
Александр
|
94b70fd891
|
start grading implementation
|
2012-10-26 18:09:53 +03:00 |
|
Александр
|
e6eedb9293
|
added chemtools to chem module in capa, and added it to global context
|
2012-10-26 18:09:53 +03:00 |
|
Александр
|
6306d98007
|
vsepr: geometries and molecules now are passed from xml as parameters
|
2012-10-26 18:06:17 +03:00 |
|
Piotr Mitros
|
495814c7f6
|
Hacked better alignment for VSEPR for demo
|
2012-10-26 18:06:16 +03:00 |
|
Александр
|
bf4d5bf799
|
starting enviroment
|
2012-10-26 18:06:16 +03:00 |
|
Chris Dodge
|
206b1e26d3
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
|
2012-10-26 10:02:45 -04:00 |
|
ichuang
|
638d0653fa
|
Merge pull request #975 from MITx/kimth/expand-in-solutions
Permit collapsibles in capa detailed solution
|
2012-10-26 05:42:23 -07:00 |
|
kimth
|
62840765a5
|
Variable name is misleading, use generic 'answer' instead
|
2012-10-26 06:59:21 +00:00 |
|
kimth
|
84aeb9dad3
|
Permit collapsibles in capa detailed solution
|
2012-10-26 06:01:26 +00:00 |
|
Chris Dodge
|
b7c830a861
|
use existing _replace() method on Location to do the re-namespacing on import
|
2012-10-25 16:37:31 -04:00 |
|
Chris Dodge
|
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
|
2012-10-25 14:27:26 -04:00 |
|
chrisndodge
|
550114704e
|
Merge pull request #974 from MITx/feature/cale/cas-dont-delete-subsection-children
Only update data in modules that have been set when passing into save_it...
|
2012-10-25 11:04:45 -07:00 |
|
Calen Pennington
|
bd1233d38c
|
Only update data in modules that have been set when passing into save_item, and don't force callers to set everything
|
2012-10-25 13:56:24 -04:00 |
|
Calen Pennington
|
5ab8e312f5
|
Fixing description of import format
|
2012-10-25 13:23:11 -04:00 |
|
chrisndodge
|
4bf5f97004
|
Merge pull request #972 from MITx/bug/cas/tom/fakepath
fixed fakepath on import
|
2012-10-25 09:52:26 -07:00 |
|
Tom Giannattasio
|
a0f4e67235
|
fixed fakepath on import
|
2012-10-25 12:51:21 -04:00 |
|
Carlos Andrés Rocha
|
2db84a757e
|
Update to learning designer job description
|
2012-10-25 12:43:57 -04:00 |
|
chrisndodge
|
b9d96df1bd
|
Merge pull request #970 from MITx/feature/cale/cas-password-reset
Point Studio forgot password at corresponding lms forgot password. There...
|
2012-10-25 09:33:54 -07:00 |
|
Calen Pennington
|
f19ec64659
|
Point Studio forgot password at corresponding lms forgot password. There is no place for a reset password link in Studio at the moment
|
2012-10-25 10:47:41 -04:00 |
|
Carlos Andrés Rocha
|
4a0e5f66d6
|
Fix link in jobs page
|
2012-10-25 10:06:47 -04:00 |
|
Chris Dodge
|
606e2dba15
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
|
2012-10-24 20:57:08 -04:00 |
|
Chris Dodge
|
fec6c42adc
|
implement importing of course info sections as modules in the course
|
2012-10-24 20:55:04 -04:00 |
|
chrisndodge
|
4432712e9c
|
Merge pull request #966 from MITx/feature/cale/cas-template-import-errors
Squelch some (but not all, yet) errors during template loading
|
2012-10-24 17:34:58 -07:00 |
|
chrisndodge
|
dfff435abc
|
Merge pull request #968 from MITx/bug/lyla/typo
typo fix
|
2012-10-24 17:33:43 -07:00 |
|
Carlos Andrés Rocha
|
e4daad4327
|
Update Job Page with new positions
|
2012-10-24 20:30:54 -04:00 |
|
Lyla Fischer
|
957a72ae32
|
typo fix
|
2012-10-24 18:12:29 -04:00 |
|
jarv
|
b23a4733fc
|
Merge pull request #967 from MITx/feature/victor/course_end
Add an end date to courses.
|
2012-10-24 14:24:46 -07:00 |
|
Victor Shnayder
|
16990c2743
|
Add an end date to courses.
- needed for cert generation (and later lots of other things)
|
2012-10-24 17:23:13 -04:00 |
|
Calen Pennington
|
bacd728efc
|
Squelch some (but not all, yet) errors during template loading
|
2012-10-24 16:25:20 -04:00 |
|
Calen Pennington
|
44bc1a06dd
|
Merge pull request #962 from MITx/bug/cas/tom/fakepath
fixed multiple file picker bug; removed 'fakepath' from uploading file n...
|
2012-10-24 13:00:22 -07:00 |
|
Tom Giannattasio
|
b4ce13af8e
|
more specific fakepath cut
|
2012-10-24 15:58:29 -04:00 |
|
Calen Pennington
|
f970da6da2
|
Fix issue where import didn't work if no grading policy file existed
|
2012-10-24 15:51:43 -04:00 |
|
Calen Pennington
|
9022c0d661
|
Merge pull request #964 from MITx/bug/cas/tom/section-name-alert
replaced section name alert with a spinner
|
2012-10-24 12:47:08 -07:00 |
|
Tom Giannattasio
|
4e3f7626be
|
replaced section name alert with a spinner
|
2012-10-24 15:43:02 -04:00 |
|
David Ormsbee
|
ec5e28fcc0
|
Merge pull request #963 from MITx/vik/add_instrumentation
Vik/add instrumentation
|
2012-10-24 12:42:49 -07:00 |
|
Vik Paruchuri
|
c4fe3b4d64
|
remove extra newline
|
2012-10-24 15:42:03 -04:00 |
|
Vik Paruchuri
|
2c209c76c3
|
added dogstatsd req
|
2012-10-24 15:41:20 -04:00 |
|
chrisndodge
|
258d506ae7
|
Merge pull request #961 from MITx/feature/cale/cas-save-draft-tweaks
Feature/cale/cas save draft tweaks
|
2012-10-24 12:39:30 -07:00 |
|
Calen Pennington
|
171b6b56fe
|
Fix typo
|
2012-10-24 15:31:00 -04:00 |
|
David Ormsbee
|
ab676d9d6d
|
Merge pull request #952 from MITx/vik/add_instrumentation
Vik/add instrumentation
|
2012-10-24 12:23:31 -07:00 |
|
Tom Giannattasio
|
4afda98420
|
fixed multiple file picker bug; removed 'fakepath' from uploading file name
|
2012-10-24 15:22:23 -04:00 |
|
Calen Pennington
|
9dc6cdbda0
|
Remove vestigial save-subsection button
|
2012-10-24 15:18:03 -04:00 |
|
Vik Paruchuri
|
dba04ab6d8
|
added docstrings
|
2012-10-24 15:14:06 -04:00 |
|
Vik Paruchuri
|
a75acffe01
|
made requested changes to statsd names, score bucket
|
2012-10-24 15:11:41 -04:00 |
|