Commit Graph

10188 Commits

Author SHA1 Message Date
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
Tom Giannattasio
f98963aa8b tightened unit tree nesting 2012-10-10 15:45:51 -04:00
Tom Giannattasio
b95374c703 tightened unit treeview styles 2012-10-10 15:45:51 -04:00
Bridger Maxwell
e256b2390b Added an indicator on Progress page when there are no problem scores in a section. 2012-10-10 14:53:39 -04:00
Chris Dodge
7d235247e6 fix merge conflict 2012-10-10 13:55:22 -04:00
Александр
f374a33606 added not hidden field 2012-10-10 20:54:17 +03:00
Chris Dodge
7107e3ee66 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cas-crud-section-subsection
Conflicts:
	cms/static/js/base.js
2012-10-10 13:50:22 -04:00
Calen Pennington
6e4fe502c7 Merge pull request #845 from MITx/feature/tomg/cas-static-tabs
added static tab templates
2012-10-10 10:48:51 -07:00
Chris Dodge
de3037558a Add basic section/subsection CRUD on the overview page 2012-10-10 13:45:36 -04:00
Calen Pennington
bfb49133d1 Merge pull request #843 from MITx/feature/cdodge/subsection-edit-page
Feature/cdodge/subsection edit page
2012-10-10 10:26:27 -07:00
Calen Pennington
c6cf4b5b61 Merge pull request #851 from MITx/feature/tomg/cas-edit-on-top
moved component editor to top
2012-10-10 10:07:29 -07:00
Calen Pennington
a9560cdfc7 Merge pull request #834 from MITx/feature/cale/cas-draft-mode
CAS Draft Mode
2012-10-10 09:50:13 -07:00
Calen Pennington
9ea3039b64 Wire component deletion back up 2012-10-10 12:49:53 -04:00
Calen Pennington
8b72de9afe Make it impossible to drag belowe New Component on views 2012-10-10 12:49:53 -04:00
Calen Pennington
95b3f0d7de Make component drag-and-drop a little nicer 2012-10-10 12:49:53 -04:00
Calen Pennington
6b3fbcf0e7 Wire up display name editor in unit editing view 2012-10-10 12:49:53 -04:00
Calen Pennington
7c3d5d58b7 Fix up how parent locations interact w/ draft mode when creating new units 2012-10-10 12:49:53 -04:00