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

6938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Chugh
c4be2b514a update coffee 2012-12-05 13:25:22 -05:00
Your Name
70d0fd11b7 Merge branch 'feature/kevin/flagging' of github.com:MITx/mitx into feature/kevin/flagging 2012-12-05 11:21:16 -05:00
Your Name
3a7624d384 modify verbiage of flagging 2012-12-05 11:20:31 -05:00
marco
13581bcfcb updated flag icons to have proper transparency 2012-12-04 15:47:58 -05:00
Your Name
8ad01c7340 fix comments and replies 2012-12-04 15:47:42 -05:00
marco
81dae33f1c added flag-label coloring css 2012-12-04 14:58:28 -05:00
Your Name
a5a38c0116 fix conflict 2012-12-04 14:09:46 -05:00
Your Name
6a19f4e02a changes to underscore template 2012-12-04 14:08:39 -05:00
marco
64663c34dd added flag resources 2012-12-04 14:04:31 -05:00
Your Name
a0104f6526 add flagging interface to replies and comments 2012-12-04 11:35:20 -05:00
Kevin Chugh
af04f5a31b got flagging to work 2012-12-03 00:09:57 -05:00
Your Name
033ed6ce92 flagging done except returning abuse flaggers 2012-12-02 15:05:03 -05:00
Kevin Chugh
4dee832f35 convert flagging to one flag 2012-12-02 13:04:27 -05:00
Your Name
229a48db85 update location of flag abuse, and hook up firing 2012-12-01 13:43:27 -05:00
Your Name
ab262b4052 attempt to update front end with new assets 2012-11-30 17:12:06 -05:00
Kevin Chugh
c2b13e0a3c added temporary flagging assets 2012-11-29 23:43:56 -05:00
Kevin Chugh
df6c053cc4 remove redcar 2012-11-29 19:16:23 -05:00
Kevin Chugh
9a19518fa7 flagging set up in css and thread template 2012-11-29 19:15:47 -05:00
Your Name
a22dd5ebb7 flagging interface updates 2012-11-29 17:31:40 -05:00
Your Name
4b017e711d updated models and vies f for flagging 2012-11-20 17:00:16 -05:00
Your Name
57b70092e8 update front end to handle flagging 2012-11-20 13:39:33 -05:00
Your Name
fb6a07c812 allow flagging for abuse and spoilers 2012-11-16 18:39:54 -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
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
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