Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,258 Commits 1 Branch 0 Tags
ea8a56da0ae33db6a60982d1d37f00a551c8c8a5
Commit Graph

1779 Commits

Author SHA1 Message Date
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
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
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
David Ormsbee
ab676d9d6d Merge pull request #952 from MITx/vik/add_instrumentation 
Vik/add instrumentation
 2012-10-24 12:23:31 -07:00
Vik Paruchuri
a75acffe01 made requested changes to statsd names, score bucket 2012-10-24 15:11:41 -04:00
David Ormsbee
bbbd976671 Added some more sample data. The command to export to Pearson reads from the table, but currently just adds the entries it needs at runtime. 2012-10-24 15:02:05 -04:00
David Ormsbee
e4ffb2a514 Add TestCenterUser model and export for Pearson 2012-10-24 11:15:14 -04:00
Vik Paruchuri
4360d10aec altered spacing 2012-10-23 19:12:08 -04:00
Vik Paruchuri
952b3468cf pep8 in views, remove instance state check 2012-10-23 19:07:06 -04:00
Vik Paruchuri
64b117a7c2 changed metric names, added into render page 2012-10-23 18:14:16 -04:00
Carlos Andrés Rocha
3e2cf18772 Add some extra console commands for handling user permissions 2012-10-23 16:11:07 -04:00
Louis Sobel
b1cfee4592 Add support for subtitle download link 
Add a download link to the video player. The link is defined
in the content xml using the following structure:

<video youtube="youtubestring">
    <track kind="subtitle" src="subtitle_link" />
</video>
 2012-10-23 14:50:17 -04:00
Victor Shnayder
be947770c0 Merge pull request #917 from MITx/victor/make-problemset-sequential 
Make problemset render as a sequential, not a vertical.
 2012-10-23 10:30:52 -07:00
Vik Paruchuri
51f3b7195e roll back changes to common 2012-10-23 13:20:37 -04:00
Vik Paruchuri
d76241e6ae prefix metrics with lms, use tags for enrollment 2012-10-23 10:56:00 -04:00
Vik Paruchuri
3ba45fec73 added instrumentation, including user logins,registrations,enrollment,correct answers 2012-10-22 20:01:39 -04:00
Vik Paruchuri
f296815d51 added instrumentation to count: user logins, registrations, correct answers, wrong answers, enrollment 2012-10-22 19:50:34 -04:00
Victor Shnayder
1806699f26 typos 2012-10-18 20:25:52 -04:00
Victor Shnayder
5177e8c656 Catch unicode errors in contextualize_text and deal with them. 2012-10-18 20:23:49 -04:00
David Ormsbee
9fbdeeb6c6 Send email change notice email to both old and new email addresses. 2012-10-18 14:36:52 -04:00
David Ormsbee
0dee2e9233 resend the same activation link instead of a new one when someone who is not active tries to log in 2012-10-18 13:33:14 -04:00
David Ormsbee
491f10d1bf Merge branch 'master' into feature/dave/email_bugfixes 2012-10-18 12:23:09 -04:00
David Ormsbee
3385e06304 As per code review, added note that accept_name_change is no longer being used. 2012-10-18 12:22:44 -04:00
kimth
57f49353d8 Fix CR showanswer template 2012-10-15 22:09:19 +00:00
Victor Shnayder
38bd83858b Make problemset render as a sequential, not a vertical. 
- Piotr requested this.  Hopefully it doesn't break anything, but we should run it by the content fellows before merging.
 2012-10-15 12:52:21 -04:00
Carlos Andrés Rocha
f495f219cf Update common/djangoapps/external_auth/views.py 
Corrected comments on OpenID temporal fix
 2012-10-15 13:28:54 -03:00
John Hess
a88a857723 Adjusted to return email address 
Per update from CS50 team, their client will break if not given addresses.
 2012-10-15 12:55:39 -03:00
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
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
kimth
113e8b97b6 Toggle shouldn't follow anchor 2012-10-13 16:19:54 +00:00
kimth
3b461ee11f choicegroup should only process choices belonging to its input_id 2012-10-13 06:13:33 +00: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
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
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