Александр
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
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
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
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
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
f970da6da2
Fix issue where import didn't work if no grading policy file existed
2012-10-24 15:51:43 -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
Chris Dodge
ae4df32e43
adjust implemented according to code review feedback. Move all of the grading_policy retrieval into a from_xml() override method. Also move in some of the grading inheritance logic into course_module.py
2012-10-24 12:27:30 -04:00
David Ormsbee
e4ffb2a514
Add TestCenterUser model and export for Pearson
2012-10-24 11:15:14 -04:00
Chris Dodge
d2c46f51ea
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-grading-policy
2012-10-23 23:56:02 -04:00
Chris Dodge
91e50f13cb
implement importing of grading policy during import. This is stored in definition.data.grading_policy.
2012-10-23 23:55:55 -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
Calen Pennington
b52ed48221
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/xmodule/js/src/html/display.coffee
lms/envs/common.py
2012-10-23 13:38:11 -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
Tom Giannattasio
f84b603133
wrapped up section date setting; need help with already published sections
2012-10-22 16:43:44 -04:00
Calen Pennington
b005587951
Merge pull request #948 from MITx/fix/cdodge/import-improvements
...
have import be a bit more flexible in terms of the packaging of the cont...
2012-10-22 13:30:46 -07:00
Chris Dodge
1530341d55
have import be a bit more flexible in terms of the packaging of the content. Allow for tar.gz names to be different from the course name. Also don't assume that the unpacking of the zip will yield a single top level root folder.
2012-10-22 16:01:57 -04:00
Chris Dodge
8ad26fc27e
replaced DateJS with latest version from their repository. There was a known bug about parsing times that are 12:xxPM - believe it or not.
2012-10-18 21:11:46 -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
Lyla Fischer
094382d588
added solutions and basic metadata to templates
2012-10-17 14:30:31 -04:00
chrisndodge
6011d6d333
Merge pull request #928 from MITx/fix/cdodge/asset-upload-tweeks
...
improvements on asset upload refresh. Now we don't need to refresh the w...
2012-10-17 10:47:47 -07:00
Chris Dodge
82e77a26c6
add mustache.js to common static repo
2012-10-17 13:47:07 -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
ichuang
557b79129b
added image, solution, showhide examples to latex_problem template;
...
fixed x_module.py to only load *.yaml files as templates
TODO: Note that bad templates cause the CMS not to load; it should throw
exceptions instead of dying.
2012-10-14 23:26:46 -04:00
ichuang
a8cbcca9ab
fix HTML display of math (it wasn't queueing mathjax)
2012-10-14 22:14:51 -04:00
