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 |
|
Brian Wilson
|
f9f5850a55
|
update press page mentions through September, and home page pointers for early November.
|
2012-11-12 23:14:20 -05:00 |
|
Arjun Singh
|
5f97533caa
|
add meta tag for google verification
|
2012-11-12 13:52:58 -08:00 |
|
Victor Shnayder
|
92ab5af627
|
bigger error messages
|
2012-11-12 16:23:40 -05:00 |
|
Vik Paruchuri
|
d5702fc712
|
Add in ability to define score points
|
2012-11-12 14:19:04 -05:00 |
|
Victor Shnayder
|
6a313fd562
|
more css tweaks
|
2012-11-12 13:17:26 -05:00 |
|
Victor Shnayder
|
0ad2154b86
|
merge in origin/master
|
2012-11-12 13:10:21 -05:00 |
|
Victor Shnayder
|
2b55c5906d
|
css tweaks
|
2012-11-12 13:09:16 -05:00 |
|
Victor Shnayder
|
4922ab33c0
|
hook up reset button
|
2012-11-12 12:43:55 -05:00 |
|
Victor Shnayder
|
0ec7043e05
|
mostly working version of self-assessment
TODO:
* better css
* green checkmark
* reset button
* tests
|
2012-11-12 12:14:12 -05:00 |
|
John Jarvis
|
1e956d448f
|
Do not display the grade when student is not passing
|
2012-11-10 02:18:59 -05:00 |
|
John Jarvis
|
ca6cfe4247
|
http->https
|
2012-11-09 23:40:18 -05:00 |
|
Carlos Andrés Rocha
|
5f5f56bbbd
|
Fix syntax on dashboard template
|
2012-11-09 21:40:55 -05:00 |
|
Carlos Andrés Rocha
|
8c2cbede9e
|
Quickfix to render the dashboard when there is no certificate db tables
|
2012-11-09 20:58:02 -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
|
c27913c505
|
bugfixes in template
|
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 |
|
Victor Shnayder
|
ca9cb86a7d
|
show proper course will-start/started/ended text on dashboard
|
2012-11-09 18:18:37 -05:00 |
|
John Jarvis
|
9fbcb4445e
|
adding migrations
|
2012-11-09 18:18:37 -05:00 |
|
Victor Shnayder
|
21c30002b1
|
fix syntax in template
|
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 |
|
Brian Talbot
|
c6bfb67b1a
|
revised no certificate state for dashboard messages and removed course message UI for future work on separate branch
|
2012-11-09 18:18:36 -05:00 |
|
Brian Talbot
|
d155869f16
|
added in course-wide completion message static states and styling
|
2012-11-09 18:18:36 -05:00 |
|
Brian Talbot
|
be13bc6026
|
added in completed course status to dashboard and certificate availability states
|
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 |
|