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

7468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
88cc5a080b Everything tested and ready for Tom to fix 2012-11-19 10:38:58 -05:00
Don Mitchell
91a91f4ddb Hopefully the course-info changes I had made w/o link destruction 2012-11-19 10:38:58 -05:00
David Ormsbee
336caa0feb Batch together alter statements to minimize how long we lock the auth_users table 2012-11-19 10:30:22 -05:00
Brian Wilson
cb36d675e3 add press mentions for October, update missing logos, and add sorting. 2012-11-19 10:28:40 -05:00
Brian Wilson
e56030ef18 update press page mentions through September, and home page pointers for early November. 2012-11-19 10:28:40 -05:00
Victor Shnayder
60368ec370 Revert overly aggressive killing. 
(don't worry--askbot is still dead)
 2012-11-19 10:24:41 -05:00
Victor Shnayder
956b704786 add migration to remove askbot columns 2012-11-19 10:19:31 -05:00
Victor Shnayder
b18136d0cd remove (almost) all references to askbot. 2012-11-19 10:18:03 -05:00
Calen Pennington
8525b898d7 Add migration to make columns added by askbot nullable, in preparation for eventually deleting them 2012-11-19 09:48:51 -05:00
Calen Pennington
0fff578e7d Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py
 2012-11-16 09:03:15 -05:00
David Ormsbee
7c7ca3ff6b Merge pull request #1052 from MITx/feature/victor/actual-askbot-removal 
Removing Askbot
 2012-11-15 13:56:58 -08:00
David Ormsbee
eff3a7c3c7 Batch together alter statements to minimize how long we lock the auth_users table 2012-11-15 14:55:21 -05:00
David Ormsbee
156dc1fb6c Merge branch 'master' into feature/victor/actual-askbot-removal 
Conflicts:
	lms/envs/aws.py
 2012-11-15 14:24:55 -05:00
David Ormsbee
dbe7346aae Merge pull request #1050 from MITx/bridger/feature/progress_percent_fix 
Fixed redunant rounding of final grade percent, which was causing floating point weirdness.
 2012-11-15 10:29:24 -08:00
Bridger Maxwell
ba57e8a7a5 Fixed redunant rounding of final grade percent, which was causing floating point weirdness. 2012-11-15 13:24:19 -05:00
chrisndodge
a1a3b92517 Merge pull request #1046 from MITx/fix/cdodge/asset-embed 
Change the Embed column in assest index page to just display the URL
 2012-11-14 10:38:26 -08:00
Chris Dodge
5c3db6f502 Change the Embed column in assest index page to just display the URL 2012-11-14 13:35:54 -05:00
David Ormsbee
b6ce46ca52 Merge pull request #1040 from MITx/feature/victor/add-test-problems 
Add test files to full test course
 2012-11-14 10:02:06 -08:00
David Ormsbee
1ab7019607 Merge pull request #1044 from MITx/feature/brian/press-updates 
Feature/brian/press updates
 2012-11-14 10:01:16 -08:00
Brian Wilson
08d9cd7e79 clean up commented-out links on main page 2012-11-14 12:01:04 -05:00
Brian Wilson
515d2f4b1e add press mentions for October, update missing logos, and add sorting. 2012-11-14 11:55:08 -05:00
Victor Shnayder
23fa860f2a Add test files to full test course 
- I added them when playing with input types, but never merged them in
 2012-11-13 10:47:42 -05:00
Calen Pennington
5611fce3be Create the test_root/log directory on git checkout 2012-11-13 10:38:07 -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
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
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