Carlos Andrés Rocha
0f16e8a358
Return only username on OpenID provider requests.
...
Temporarily return username also as the email and fullname fields of
the response using OpenID's simple registration extension.
2012-10-14 19:45:22 -04:00
Victor Shnayder
4594d37bf2
Merge pull request #900 from MITx/feature/ichuang-fix-capa_module-reset-string-bug
...
reset_problem in capa_module should always return dicts not strings
2012-10-14 10:36:49 -07:00
ichuang
3c8830f3b0
reset_problem in capa_module should always return dicts not strings
...
this is for the master branch (versus cms-master)
2012-10-14 12:57:58 -04:00
Victor Shnayder
15d4af26a5
Merge pull request #899 from MITx/feature/victor/capa-ajax
...
Make chem preview more robust
2012-10-14 08:40:39 -07:00
Victor Shnayder
f4d8df94dd
Make chem preview more robust
...
- give the preview div an id, use that to look it up instead of dancing around in the DOM
2012-10-14 11:35:32 -04:00
Piotr Mitros
97233cf00e
Work-around for bug in pip lookup
2012-10-14 10:33:11 -04:00
David Ormsbee
1154c4b897
auto-resend activation email if they try to log in and aren't activated
2012-10-13 23:20:33 -04:00
arjun810
1ec0fae801
Merge pull request #891 from MITx/feature/victor/capa-ajax
...
Feature/victor/capa ajax
2012-10-13 17:05:44 -07:00
arjun810
ccc5e5771d
Merge pull request #893 from MITx/kimth/toggle-stay-in-place
...
Toggle shouldn't follow anchor
2012-10-13 16:01:58 -07:00
kimth
113e8b97b6
Toggle shouldn't follow anchor
2012-10-13 16:19:54 +00:00
arjun810
a46c517a9d
Merge pull request #892 from MITx/kimth/fix-mc-soln-conflict
...
choicegroup should only process choices belonging to its input_id
2012-10-12 23:27:19 -07:00
kimth
3b461ee11f
choicegroup should only process choices belonging to its input_id
2012-10-13 06:13:33 +00:00
Victor Shnayder
49a921c81e
Merge pull request #873 from MITx/feature-alex-crystallography-mitx
...
Feature alex crystallography mitx
2012-10-12 20:11:41 -07:00
Victor Shnayder
adae176943
merge
2012-10-12 23:06:39 -04:00
Victor Shnayder
db8639e06a
Fix preview code
...
- I'm starting to vaguely understand js variable scope and closures. Long way to go though :)
2012-10-12 22:52:41 -04:00
Victor Shnayder
48de4b40ee
Fix my js_loader patch
...
* still call the callback when skipping duplicate file. This updates the completed flags, and so the overall "we're done" callback fires properly.
2012-10-12 22:52:02 -04:00
Victor Shnayder
1c18ad9607
make loader only load scripts once per run, midway through fixing multiple chem equations per page
2012-10-12 19:18:58 -04:00
arjun810
b2afa82c8e
Merge pull request #886 from MITx/hotfix/arjun/fix_integer_disc_ids_2
...
more removal of data("id") in favor of attr("data-id")
2012-10-12 14:59:20 -07:00
Arjun Singh
d7b237ce0a
more removal of data("id") in favor of attr("data-id")
2012-10-12 14:47:44 -07:00
Victor Shnayder
d97533c04f
Merge pull request #885 from MITx/hotfix/rocha/fix-unicode-in-custom-tabs
...
Fix to read utf-8 enconded html files for custom course tabs
2012-10-12 14:39:15 -07:00
Carlos Andrés Rocha
f1120a1139
Removed unused import
2012-10-12 17:39:05 -04:00
Carlos Andrés Rocha
e8cd125701
Fix to read utf-8 enconded html files for custom course tabs
2012-10-12 17:36:19 -04:00
Victor Shnayder
619e9f18ac
Merge pull request #884 from MITx/feature/victor/capa-ajax
...
address Ike's comments.
2012-10-12 14:08:11 -07:00
Victor Shnayder
54d1f2afac
address Ike's comments.
2012-10-12 17:03:11 -04:00
ichuang
fd5c7c622c
Merge pull request #862 from MITx/feature/victor/capa-ajax
...
Feature/victor/capa ajax
I'm happy with all the changes to inputtypes, modulo the minor comments.
I didn't read chemcalc.py closely, but the tests look good.
2012-10-12 13:51:10 -07:00
Victor Shnayder
d78e041c2d
Testing and small fixes
...
- make chemical_equations_equal return False instead of raising errors.
- make tests not choke on unicode
- get full coverage
2012-10-12 15:32:36 -04:00
David Ormsbee
f5f1e858d5
Merge pull request #874 from MITx/hotfix/arjun/fix_integer_disc_ids
...
Hotfix/arjun/fix integer disc ids
2012-10-12 11:38:28 -07:00
David Ormsbee
73bbfe8c4d
Merge pull request #875 from MITx/feature/arjun/community_tas
...
styles and tiny bit of logic for community tas
2012-10-12 11:37:47 -07:00
David Ormsbee
01ac01b62c
Re-enable change name, and fix up change email styles
2012-10-12 14:31:20 -04:00
Victor Shnayder
f6f2663b77
fix arrows list
2012-10-12 14:08:21 -04:00
Victor Shnayder
b6f7427e22
make tests pass again
2012-10-12 14:02:22 -04:00
Victor Shnayder
19d3cb3870
Add a chemicalequationinput with live preview
...
- architecturally slightly questionable: the preview ajax calls goes to an LMS view instead of an input type specific one. This needs to be fixed during the grand capa re-org, but there isn't time to do it right now.
- also, I kind of like having a generic turn-a-formula-into-a-preview service available
2012-10-12 13:52:48 -04:00
David Ormsbee
96bdd03406
re-enable email change functionality
2012-10-12 09:54:47 -04:00
Arjun Singh
71201a73b2
styles and tiny bit of logic for community tas
2012-10-12 04:54:56 -07:00
Arjun Singh
c28c3f9916
Merge branch 'master' into hotfix/arjun/fix_integer_disc_ids
2012-10-12 04:23:29 -07:00
Arjun Singh
6fbf2f9720
revert toString changes; use attr('data-id') instead of data('id') when mongo ids are involved
2012-10-12 04:22:27 -07:00
Victor Shnayder
c420c67b82
Actually implement exact vs factors-don't-matter comparisons in chemcalc
2012-10-11 17:40:26 -04:00
David Ormsbee
9c0e554992
Merge pull request #855 from MITx/bug/tomg/nested-hints
...
tweaked collapsible selector to target the proper section
2012-10-11 10:25:21 -07:00
David Ormsbee
d0668043a5
Merge pull request #861 from MITx/feature/ichuang/dump_grades
...
add django management command for dumping grades to CSV file
2012-10-11 10:24:19 -07:00
David Ormsbee
c6c51cf19a
Merge pull request #865 from MITx/bugfix/victor/progress-tab-crash
...
Check for None to fix 3.091 progress tab crash
2012-10-11 10:22:28 -07:00
Victor Shnayder
a5dcdcb705
Check for None to fix 3.091 progress tab crash
...
- get_module() contract says it can return None (e.g. if access control check failed)
2012-10-11 13:08:05 -04:00
David Ormsbee
4b16a7b422
Merge pull request #863 from MITx/bug/lyla/numerical-tolerance-default
...
fixed default tolerance on numericalresponse
2012-10-11 09:51:29 -07:00
Lyla Fischer
0cdbd170c2
fixed documentation
2012-10-11 12:23:06 -04:00
Lyla Fischer
331f35145f
fixed default tolerance on numericalresponse
2012-10-11 11:59:27 -04:00
Александр
64565692ab
removed obsolete crystalresponse
2012-10-11 18:41:25 +03: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
