Calen Pennington
dbcb1adfaf
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
lms/static/sass/course/courseware/_courseware.scss
2012-11-13 10:22:42 -05:00
John Jarvis
ca6cfe4247
http->https
2012-11-09 23:40:18 -05:00
John Jarvis
fc32032bd1
Cleanup django-admin commands
2012-11-09 18:53:29 -05:00
John Jarvis
d6403fe34c
renmaing unusual to unicode, fixing syntax and removing id in
...
enrolled_students query
2012-11-09 18:51:31 -05:00
John Jarvis
2c41b94d11
Cleanup and django-admin commands
2012-11-09 18:18:37 -05:00
Victor Shnayder
aedb02543c
always return grade as part of cert status
2012-11-09 18:18:37 -05:00
John Jarvis
9fbcb4445e
adding migrations
2012-11-09 18:18:37 -05:00
Victor Shnayder
2846c61d15
Revert "remove (almost) all references to askbot."
...
This reverts commit 793354a0dc
2012-11-09 18:18:37 -05:00
Victor Shnayder
cf33d85ef9
Wire up cert status
2012-11-09 18:18:36 -05:00
John Jarvis
01dcf291b6
Adding setting variable for CERT_QUEUE
2012-11-09 18:18:36 -05:00
John Jarvis
83b79fb87e
Adding new certificate state for "notpassing"
2012-11-09 18:18:36 -05:00
John Jarvis
5d6687d897
Adding error_reason
2012-11-09 18:18:36 -05:00
John Jarvis
076619c81b
Changing private method to use a single underscore
2012-11-09 18:18:36 -05:00
John Jarvis
fb882d285f
cert.state->cert.status
2012-11-09 18:18:35 -05:00
John Jarvis
8e5d6bd416
Change 'remove' to 'delete' for consistency
2012-11-09 18:18:35 -05:00
John Jarvis
8d628ef234
unavailable->CertificateStatuses.unavailable
2012-11-09 18:18:35 -05:00
John Jarvis
507794acf5
Adding defaults to created and added fields
2012-11-09 18:18:35 -05:00
John Jarvis
0481cf995f
Updating view for different certificate statuses, error
2012-11-09 18:18:35 -05:00
John Jarvis
5529eecb85
Separate function for send_to_xqueue
2012-11-09 18:18:35 -05:00
John Jarvis
5019e2d03c
cleanup
2012-11-09 18:18:35 -05:00
John Jarvis
cb1489a7cb
docstring cleanup, grading for regen_cert
2012-11-09 18:18:35 -05:00
John Jarvis
df37f11122
Adding modified and created fields to GeneratedCertificates
2012-11-09 18:18:35 -05:00
John Jarvis
a9b26cb871
Cleanup, docstrings, recording name in certificate table
2012-11-09 18:18:34 -05:00
John Jarvis
f589adcd71
Comment about basic auth
2012-11-09 18:18:34 -05:00
John Jarvis
66c31fe21a
Adding logging, reading sitename from settings
2012-11-09 18:18:34 -05:00
John Jarvis
84ff92d4d9
new migrations for certificates
2012-11-09 18:18:34 -05:00
John Jarvis
8c2e55676b
Cleanup
2012-11-09 18:18:34 -05:00
John Jarvis
fceed0fc70
view for the certificate callback URL
2012-11-09 18:18:34 -05:00
John Jarvis
0ef54cdeb8
Certificate interface to xqueue
...
Add, remove or update and existing certificate
2012-11-09 18:18:34 -05:00
John Jarvis
416b5458a6
Certificate model for tracking certificate statuses
2012-11-09 18:18:34 -05:00
John Jarvis
29ed95c147
"ungenerated_certs" command update
...
Updated for testing (for now)
This will eventually be run periodically and/or server
as a way to generate certificate requests from the commandline
2012-11-09 18:18:34 -05:00
John Jarvis
b326b83fb6
Adding XQueueCertificate interface.
...
Adding, removing and updating certs
2012-11-09 18:18:34 -05:00
John Jarvis
8ccaafd758
adding migration for certificate changes
2012-11-09 18:18:34 -05:00
John Jarvis
22ed22d956
Updating the certificate app for testing
...
Conflicts:
lms/djangoapps/certificates/models.py
2012-11-09 18:18:34 -05:00
Victor Shnayder
76f0cf4a86
remove (almost) all references to askbot.
2012-11-09 18:18:33 -05:00
Calen Pennington
171e932266
Merge branch 'master' into feature/cale/cms-master
...
Conflicts:
rakefile
2012-11-08 12:28:40 -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
53c5170dbc
Simple PEP8 issues.
2012-11-06 18:14:57 -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
Calen Pennington
6212507b55
Merge pull request #1008 from MITx/ie8patch
...
merge to master
2012-11-06 06:18:01 -08:00
Don Mitchell
7f4bb63dff
Final ie8 fixes hopefully. Now renders correctly for staff. Moved the
...
debug fns from per problem to part of courseware w/ context info passed
as parms. Known issues: ie8 complains that getlog is not defined if you
click on QA and does not show the debug info popup.
2012-11-05 13:55:09 -05:00
David Ormsbee
d1aa0a254e
Use one of our test courses when testing course permissions for the discussion client, because we now have course policy level overrides.
2012-11-02 17:21:00 -04:00
Calen Pennington
0bfa443520
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2012-11-02 11:09:19 -04:00
Chris Dodge
b788b9d659
add to existing test cases to exercise the 'course extras as modules' work in the CMS import. Also add to the existing 'full' test data collection to include policy, tabs, etc.
2012-11-01 15:08:26 -04:00
David Ormsbee
8a453e99ca
Implement basic ability to close off a forum for a given course such that Students can no longer post or edit, but can still view.
2012-11-01 04:37:16 -04:00
Chris Dodge
87dadd40c4
address some of Cale's feedback
2012-10-31 14:11:24 -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
f0b4371c90
addressed Cale's feedback
2012-10-30 16:01:28 -04:00
Chris Dodge
ba9a03410b
remove unneeded debugging traces
2012-10-30 15:56:02 -04:00
