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

7441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jay Zoldak
bf6a147c85 Modify rake file to read in spec and src files correctly and also add in the lms helper file for stubRequests, etc. 2012-11-15 15:43:39 -05:00
Calen Pennington
93cc17cf3b Starting to generate jasmine tests for common/lib 2012-11-14 15:03:55 -05:00
Calen Pennington
3c90e2927a Create the test_root/log directory on git checkout 2012-11-13 10:35:54 -05:00
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
Calen Pennington
eb92ad1fd8 Merge pull request #1032 from MITx/feature/jzoldak/cms-unit-testing 
Feature/jzoldak/cms unit testing
 2012-11-13 07:08:52 -08:00
Jay Zoldak
a060b8de9c Use xmodule.templates instead of hard coding them in the test 2012-11-13 08:35:22 -05:00
Arjun Singh
5f97533caa add meta tag for google verification 2012-11-12 13:52:58 -08:00
Victor Shnayder
f54d424124 Merge pull request #1038 from MITx/vik/add_self_assessment 
Vik/add self assessment
 2012-11-12 13:35:29 -08:00
Victor Shnayder
3f95116ac1 only ask for hints if assessed as wrong 2012-11-12 16:23:58 -05:00
Victor Shnayder
92ab5af627 bigger error messages 2012-11-12 16:23:40 -05:00
Victor Shnayder
6e5a6f9753 make textboxes read-only when that makes sense. 
- also make reset hide the original output
 2012-11-12 16:23:29 -05:00
Vik Paruchuri
39210fa95f Move point where input box is disabled 2012-11-12 14:20:44 -05:00
Vik Paruchuri
d5702fc712 Add in ability to define score points 2012-11-12 14:19:04 -05:00
Vik Paruchuri
ba8781ddf4 Modify to store scores instead of correct/incorrect, remove student ability to edit response 2012-11-12 14:07:06 -05:00
Victor Shnayder
b378af87be Merge pull request #1011 from MITx/vik/add_self_assessment 
Vik/add self assessment
 2012-11-12 10:21:48 -08: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
68fb5c9799 bugfixes re: button state 2012-11-12 13:03:12 -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
jarv
50415acbff Merge pull request #1037 from MITx/fix/rocha/dashboard-without-certificates 
Fix syntax on dashboard template
 2012-11-09 18:42:39 -08:00
Carlos Andrés Rocha
5f5f56bbbd Fix syntax on dashboard template 2012-11-09 21:40:55 -05:00
jarv
e37a71b67b Merge pull request #1036 from MITx/fix/rocha/dashboard-without-certificates 
Quickfix to render the dashboard when there is no certificate db tables
 2012-11-09 18:01:16 -08: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
Carlos Andrés Rocha
39a5b6ebde Merge pull request #1035 from MITx/feature/jarv/cert-feature-flag 
only check cert_status when certificates feature flag is enabled
 2012-11-09 17:32:05 -08:00
John Jarvis
157c98a79d only check cert_status when certificates feature flag is enabled 2012-11-09 20:31:05 -05:00
jarv
6857dae0eb Merge pull request #1034 from MITx/feature/rocha/cert 
Feature/rocha/cert
 2012-11-09 15:54:12 -08: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
35acbc840e add note about new end_of_course_survey_url flag to docs 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
Victor Shnayder
1b2371d64a fix bug in has_ended 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
0b69870d05 Reverting askbot removal for now 
Revert "add migration to remove askbot columns"

This reverts commit 9281f3c140.
 2012-11-09 18:18:36 -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