Calen Pennington
171e932266
Merge branch 'master' into feature/cale/cms-master
...
Conflicts:
rakefile
2012-11-08 12:28:40 -05:00
David Ormsbee
e90d321142
Comments, whitespace from review.
2012-11-07 19:28:22 -05:00
David Ormsbee
4b02b2af2a
Rearrange how we handle the auth tokens for our fake Pearson preliminary testing
2012-11-07 17:20:49 -05:00
David Ormsbee
528fcd7f4e
Create a config option for enabling a Pearson login in a totally hacky manner.
2012-11-07 14:08:55 -05:00
David Ormsbee
92f2fbf0f8
Ugly, ugly hack needed so that Pearson can test something today, to be replaced by a real implementation later this week or early next.
2012-11-07 13:55:08 -05:00
Chris Dodge
87ff18dc56
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
2012-11-07 09:35:21 -05:00
David Ormsbee
ad93f70e65
Re-add TestCenterUser along with a basic command to make an entry for a given user already in the system.
2012-11-07 09:24:38 -05:00
Calen Pennington
bca0134a35
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2012-11-06 16:13:31 -05:00
Chris Dodge
55c69a1e13
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
...
Conflicts:
lms/djangoapps/courseware/module_render.py
2012-11-06 14:20:59 -05:00
David Ormsbee
847b2eb7e0
Merge branch 'master' into feature/dave/pearson_setup
2012-11-06 11:54:13 -05:00
Calen Pennington
0bfa443520
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2012-11-02 11:09:19 -04:00
Calen Pennington
9cb2fbdd2f
Remove newline from javascript source tags
2012-10-31 16:26:11 -04:00
Chris Dodge
34c442a1dc
removed unneeded trace log. Also don't need StudentModuleCache in 'about' section rendering
2012-10-30 16:04:51 -04:00
Chris Dodge
743f2b56dd
make course about view methods render the about content as a module, so we get all the url rewriting goodness. Also, since we're now handling the url re-writing via the module get_html pipelines, we can remove the link rewriting inside the xmodules itself - which is good because there's a wierd bug in lxml.html rewriting
2012-10-30 15:12:13 -04:00
Chris Dodge
f4822c23de
lots of tweeks to better support importing of existing courseware
2012-10-30 11:52:31 -04:00
David Ormsbee
7a84bed916
hackish EAD export support
2012-10-26 15:50:32 -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
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
Vik Paruchuri
d76241e6ae
prefix metrics with lms, use tags for enrollment
2012-10-23 10:56:00 -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
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
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
ichuang
09d7d6d688
add AUTH_USE_MIT_CERTIFICATES feature flag to CMS, and @ssl_login_shortcut
2012-10-14 16:40:04 -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
David Ormsbee
01ac01b62c
Re-enable change name, and fix up change email styles
2012-10-12 14:31:20 -04:00
Calen Pennington
5ae34aa4ed
Add heartbeat to cms
2012-10-11 12:32:23 -04:00
David Ormsbee
05c5ac3482
Allow people who haven't activated to reset their password.
2012-10-11 11:04:18 -04:00
John Jarvis
bd45dbd8d4
Adding django-admin/rake command to set the staff bit
2012-10-10 09:46:30 -04:00
Victor Shnayder
bcf835532b
Pass course_id instead of course to get_site_status_msg
...
* makes testing easier -- don't need course objects
2012-10-08 14:06:58 -04:00
Victor Shnayder
ddcd166b72
make tests pass without LMS settings
2012-10-07 23:09:26 -04:00
Victor Shnayder
9e43664498
Add support for per-course site status.
...
Now looks for a status_message.json file, looks for 'global' and ${course.id} keys. Return any global message and any course-specific message, joined by <br>.
fab files need to be updated to use this new format (new filename, possibly also help manage per-course messages, or at least test for valid json)
2012-10-07 23:09:26 -04:00
Carlos Andrés Rocha
193ca7b34b
Fix error when creating empty associations
...
Also renamed some variables to make them more distinguishable
2012-10-05 13:46:49 -04:00
Carlos Andrés Rocha
e62968d5e1
Get OpenID XRDS url host from request
...
Replaced the previous method of getting it from HTTP_POST to use
django's mechanism, which may or may not use HTTP_HOST. However if an
attacker changes the request header, there is not much he can do since
he cannot recreate the association nonce.
2012-10-03 17:16:22 -04:00
Carlos Andrés Rocha
4840de8c88
Create Django cache backed OpenID provider store
2012-10-03 16:54:07 -04:00
Chris Dodge
84bc81f7eb
refactor StaticContent id scheme to be the same as moduledata. Also expose a new 'get all content for course' which will be needed to support a asset management page.
2012-10-03 09:07:09 -04:00
Victor Shnayder
f4623bf155
address comments on #807
2012-10-02 17:17:15 -04:00
David Ormsbee
13bfbc820d
Prevent caching of block showing top status bar (used for system alert notifications).
2012-10-02 16:38:28 -04:00
Victor Shnayder
8b0f1a0305
get rid of caching--unneeded complexity.
2012-10-02 15:03:06 -04:00
