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

6956 Commits

Author SHA1 Message Date
Brian Wilson
b5378b04b3 change timer to calculate relative duration in javascript 2013-02-12 12:25:11 -05:00
Arthur Barrett
45a27f303f Merge branch 'master' into feature/abarrett/annotatable_xmodule 2013-02-12 12:09:21 -05:00
Arthur Barrett
cfa16feab5 Trying to setup jasmine specs... 2013-02-12 12:00:54 -05:00
Ned Batchelder
baee9f96dc Merge branch 'master' of github.com:MITx/mitx 2013-02-12 11:28:51 -05:00
Ned Batchelder
78d3d20069 When checking types to convert data, don't forget about longs. 32-bit Pythons make longs from values that are ints on 64-bit Pythons. 
Conflicts:
	common/djangoapps/util/converters.py
 2013-02-12 11:25:14 -05:00
Diana Huang
d45c539c6d Make the peer grading due date a property of the problem 
metadata, not the peer grading module metadata.
 2013-02-12 10:49:06 -05:00
Victor Shnayder
7d65c64148 Merge pull request #1485 from MITx/fix/kevin/code_show_lt_and_gt 
fix showing less than and greater than in code
 2013-02-12 07:38:16 -08:00
Chris Dodge
93d186511f clean up templates that were removed from disk - we need to remove from DB as well 2013-02-12 10:23:32 -05:00
Calen Pennington
23bb87e0bb Merge pull request #1486 from MITx/feature/ned/clean_up_tests 
We no longer need override_settings, Django has a better one.
 2013-02-12 07:22:27 -08:00
Calen Pennington
de5b3a2a39 Merge pull request #1483 from MITx/feature/victor/raw-static-files 
Feature/victor/raw static files
 2013-02-12 07:21:01 -08:00
Kevin Chugh
21f4616080 spread less than and greater than fix to responses and comments, and profile view 2013-02-12 09:18:46 -05:00
Kevin Chugh
d57c78f9d9 fix showing less than and greater than in code 2013-02-11 20:01:09 -05:00
Vik Paruchuri
65cb53b8a6 Revert logsettings 2013-02-11 19:21:22 -05:00
Vik Paruchuri
e1b2481c38 Fix remaining path issues 2013-02-11 19:08:53 -05:00
Vik Paruchuri
bdc5910cbb Fix import paths to point to xmodule, remove old JS resource strings 2013-02-11 19:03:18 -05:00
Vik Paruchuri
b5bac1e3c1 Fix some path issues in import statements 2013-02-11 18:47:01 -05:00
Vik Paruchuri
b9bf96520e Move open ended grading xmodule support files into a separate directory. apparently prune down on number of imports 2013-02-11 18:43:47 -05:00
Vik Paruchuri
c2b32b7038 Fix location that is queried on 2013-02-11 18:23:01 -05:00
Vik Paruchuri
ba650202b4 Add in logic to pass settings to peer grading xmodule 2013-02-11 18:09:57 -05:00
Vik Paruchuri
323caeb744 Properly pass around S3 interface 2013-02-11 17:58:19 -05:00
Victor Shnayder
75898bfe1a tell collectstatic not to mess with protex--it relies on the filename 2013-02-11 17:54:54 -05:00
Vik Paruchuri
01e8fe8d08 Pass S3 interface in module_render 2013-02-11 17:54:37 -05:00
Victor Shnayder
aadb885211 Merge branch 'feature/victor/raw-static-files' into 700x-sandbox 2013-02-11 17:51:36 -05:00
Victor Shnayder
3ccb33c8b3 Simplify, make it actually work. 
- regexp was too complicated, didn't work
 2013-02-11 17:50:13 -05:00
Vik Paruchuri
120c0e139e Remove url element from parent class to avoid annoying errors 2013-02-11 17:38:25 -05:00
Vik Paruchuri
0f71f5b92e Finish settings refactor 2013-02-11 17:36:33 -05:00
Vik Paruchuri
9bca4ebf21 Start to refactor grading settings 2013-02-11 17:32:11 -05:00
Victor Shnayder
2dcdeff4b6 Make replace_static_urls leave alone urls that have '?raw' at the end 
- needed for GWT'ed modules that rely on the filename to find dependencies
 2013-02-11 17:07:15 -05:00
Ned Batchelder
aa2d0ecaf2 We no longer need override_settings, Django has a better one. 2013-02-11 17:06:35 -05:00
Arthur Barrett
a144896154 Style and behavior changes to the header and tooltips. 2013-02-11 16:17:34 -05:00
Don Mitchell
46a7f7427a Merge pull request #1479 from MITx/fix/cdodge/export-include-grading-policy 
add exporting of grading_policy.json
 2013-02-11 12:53:36 -08:00
Chris Dodge
33009eba7d add exporting of grading_policy.json 2013-02-11 14:30:26 -05:00
Victor Shnayder
0014b28925 Merge remote-tracking branch 'origin/master' into 700x-sandbox 2013-02-11 14:12:29 -05:00
Your Name
7a1aed8945 Merge remote-tracking branch 'origin/master' into feature/victor/revert-revert-of-forums-ui 2013-02-11 13:55:47 -05:00
cahrens
044a8a5cf6 CodeMirror. 2013-02-11 12:37:31 -05:00
Arthur Barrett
3a81ed0651 Updated styling and markup. 2013-02-10 19:40:18 -05:00
David Ormsbee
fb1e7f3dc1 Make type check for self.code a little more robust, give default val for mmlans so it's never undefined 2013-02-10 19:03:25 -05:00
Arthur Barrett
b7158e9f8a Switched to $.scrollTo instead of custom animation and refactored toggle method. 2013-02-09 14:38:04 -05:00
Vik Paruchuri
2523c1e189 Slight visual tweaks 2013-02-09 12:40:11 -05:00
Vik Paruchuri
e68103f3e7 Render results at needed times 2013-02-09 11:24:29 -05:00
David Ormsbee
9b6f8a3673 Merge pull request #1475 from MITx/feature/brian/pearson-exam 
change missingExamSeriesCode to missingPartnerID
 2013-02-09 08:08:37 -08:00
Vik Paruchuri
add3aa90e1 Fix peer grading interface transitions (reset feedback box, change message) 2013-02-09 11:01:34 -05:00
Vik Paruchuri
d6a2148bfb Clean up message and calibration page 2013-02-09 10:47:14 -05:00
Vik Paruchuri
50ba024ae8 Add additional calibration interstitial page, add in message when calibration essay saved. 2013-02-09 10:43:40 -05:00
Vik Paruchuri
46da4cf241 Add in a better notification icon 2013-02-09 10:15:11 -05:00
Vik Paruchuri
67e364fa70 Fix spacing, slightly prune CSS 2013-02-09 09:13:21 -05:00
Vik Paruchuri
e8cb3590b1 Trim hint and submit messages out of self assessment 2013-02-09 09:06:14 -05:00
Vik Paruchuri
ae1df0108c Remove save successful message 2013-02-09 09:00:43 -05:00
Vik Paruchuri
6d0af13923 Fix respond to feedback 2013-02-09 08:46:24 -05:00
Vik Paruchuri
3eb18a9ebc Fix status display/make it more robust, and fix module render error 2013-02-09 08:17:20 -05:00