Lyla Fischer
0cdbd170c2
fixed documentation
2012-10-11 12:23:06 -04:00
Calen Pennington
38f5761a89
Merge pull request #864 from MITx/bug/lyla/numericalresponse
...
quick bug fix
2012-10-11 09:17:57 -07:00
Lyla Fischer
1bd2cb4f85
quick bug fix
2012-10-11 12:12:34 -04:00
Chris Dodge
6b5b6342d2
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-import
...
Conflicts:
common/lib/xmodule/xmodule/contentstore/content.py
2012-10-11 12:11:48 -04:00
Chris Dodge
a84ef1b243
wip: static asset import
2012-10-11 12:10:28 -04:00
Calen Pennington
f010875750
Merge pull request #848 from MITx/feature/cas/lyla/asset-store-integration
...
Feature/cas/lyla/asset store integration
2012-10-11 08:59:50 -07:00
Lyla Fischer
331f35145f
fixed default tolerance on numericalresponse
2012-10-11 11:59:27 -04:00
Lyla Fischer
f06c67ef08
added embeddable links
2012-10-11 11:59:17 -04:00
Lyla Fischer
0bd5446f80
fixed date display
2012-10-11 11:58:49 -04:00
Chris Dodge
115d7358fa
fix up commenting after refactoring. Also, don't reraise an exception during thumbnail generation - we just want to swallow the exception, log, and continue.
2012-10-11 11:57:56 -04:00
Chris Dodge
2153aae62c
schema change to better normalize asset->thumbnail relationships
2012-10-11 11:57:56 -04:00
Lyla Fischer
6378682201
thumnail image is a thumnail image
2012-10-11 11:57:56 -04:00
Lyla Fischer
83eeb1961a
fixed erroneous order
2012-10-11 11:57:30 -04:00
Lyla Fischer
f26a4af75c
thinks work, they just don't display prettily, and it is hard to actually use the assets due to links
2012-10-11 11:57:14 -04:00
Lyla Fischer
7791a7c4aa
slight refactoring of the javascript
2012-10-11 11:56:53 -04:00
Lyla Fischer
d35ff48e5b
fixed up some of the ajax feedback to display to the user
2012-10-11 11:56:53 -04:00
Lyla Fischer
deca6e66b0
cleaned filenames
2012-10-11 11:56:53 -04:00
Lyla Fischer
65e3982fd2
things now upload
2012-10-11 11:56:53 -04:00
Александр
64565692ab
removed obsolete crystalresponse
2012-10-11 18:41:25 +03:00
Calen Pennington
6a7fb1d53b
Merge pull request #859 from MITx/feature/tomg/cas-404
...
template for 404 and 500 errors
2012-10-11 08:40:47 -07:00
Александр
2b200b6e20
changed cryst inputtype to be similar to textline
2012-10-11 18:40:05 +03:00
Александр
dfb9b49c4d
added new inputtypes to list, due to that check button appears
2012-10-11 18:37:10 +03:00
Александр
c7654b4d1e
cryst inputtypes template - same as textline + js files
2012-10-11 18:33:49 +03:00
ichuang
778017fc3e
add django management command for dumping grades to CSV file
2012-10-11 11:30:57 -04:00
Victor Shnayder
2b6e935985
Initial refactor of inputtypes into classes.
...
- for now, wraps existing render functions as separate classes
- a bit of cleanup in how it's called from capa_problem
- initial tests to make sure things are testable.
2012-10-11 11:26:49 -04:00
Victor Shnayder
cb291871b1
Better error checking when content authors mess up answers to numerical response problems.
...
- give different errors when student or author stuff is messed up (I was seeing "No way to interpret '3' as a number" :P)
- preserve traceback in exception
2012-10-11 11:25:40 -04:00
Victor Shnayder
8cdd5b35c0
add note about randomization, based on discussion with Piotr
2012-10-11 11:15:58 -04:00
David Ormsbee
88f147c704
Merge pull request #847 from MITx/feature/rocha/openid-djangostore
...
Fix openid provider URL matching for usernames with non-word characters
2012-10-11 08:06:48 -07:00
David Ormsbee
488d001e85
Merge pull request #854 from MITx/feature/bridger/course_grading
...
Added an indicator on Progress page when there are no problem scores in a section.
2012-10-11 08:06:05 -07:00
David Ormsbee
05c5ac3482
Allow people who haven't activated to reset their password.
2012-10-11 11:04:18 -04:00
arjun810
e2f53f1429
Merge pull request #857 from MITx/hotfix/arjun/fix_integer_disc_ids
...
Fix some issues with integer ids in the discussion forum
2012-10-11 07:02:09 -07:00
Tom Giannattasio
782e5f51e9
template for 404 and 500 errors
2012-10-11 09:58:35 -04:00
Calen Pennington
5eb0ca69e0
Merge pull request #858 from MITx/feature/cdodge/cas-crud-section-subsection
...
a 'section' is actually a 'chapter' in previous nomenclature
2012-10-11 06:55:12 -07:00
Chris Dodge
b77298b2ec
a 'section' is actually a 'chapter' in previous nomenclature
2012-10-11 09:49:07 -04:00
Arjun Singh
58b0829b79
Fix some issues with integer ids in the discussion forum
2012-10-11 06:22:00 -07:00
Calen Pennington
bdf8a55a47
Merge pull request #852 from MITx/feature/cdodge/cas-crud-section-subsection
...
Add basic section/subsection CRUD on the overview page
2012-10-11 05:44:47 -07:00
Calen Pennington
c8d267fb72
Fix minor typo in access.py
2012-10-10 22:03:08 -04:00
Calen Pennington
a9ca84da6b
Merge pull request #853 from MITx/feature/tomg/style-polishing
...
numerous style tweaks and user management page
2012-10-10 19:00:12 -07:00
Tom Giannattasio
00e2f093b9
removed extra padding on nested sections
2012-10-10 16:19:03 -04:00
Tom Giannattasio
6f60af71fd
tweaked collapsible selector to target the proper section; functionality like this should have its own class to avoid selector conflicts, but it may be too late to fix this now
2012-10-10 16:14:32 -04:00
Tom Giannattasio
8d78073a64
removed console logs
2012-10-10 15:52:49 -04:00
Victor Shnayder
db17580710
Chemcalc refactor, improvement
...
* Move tests into a separate file
* add a chemical_equations_equal function to compare equations, not expressions
* rename some internal functions with a leading _
2012-10-10 15:49:09 -04:00
Victor Shnayder
d10b568c13
Add chemcalc to capa package, to context for customresponse
2012-10-10 15:49:09 -04:00
Victor Shnayder
c30f57022b
Move more tests around, start prep for inputtype refactor
2012-10-10 15:48:33 -04:00
Tom Giannattasio
edc32e9db5
tweaks to new component animations
2012-10-10 15:46:59 -04:00
Tom Giannattasio
564c138bf5
white drag handles for components
2012-10-10 15:46:59 -04:00
Tom Giannattasio
8f488c3f7f
added html icon
2012-10-10 15:46:59 -04:00
Tom Giannattasio
bbed49dbd3
styled log in and sign up errors; fixed expand/collapse transition bug
2012-10-10 15:46:59 -04:00
Tom Giannattasio
07ac0d0642
styled/tweaked users page
2012-10-10 15:46:59 -04:00
Tom Giannattasio
2efe4cf640
added ellipsis text overflow in unit tree
2012-10-10 15:45:52 -04:00
