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

17975 Commits

Author SHA1 Message Date
Will Daly
862ce67bfc Fixed a bug in symmath_check(): one of the if statements 
evaluated bool(ans), which is False when ans=0.
This led to an error message "[symmath_check] failed to get MathML for
input; dynamath=[None]" when the function reached a later condition.
The check that evaluated  bool(ans) was redundant, so I removed it.
 2013-02-25 10:59:33 -05:00
Your Name
9f58f6890d Merge branch 'master' into feature/victor/revert-revert-of-forums-ui 2013-02-25 09:31:28 -05:00
Brian Wilson
fa00ea442e add first pass at multi-chapter support. 2013-02-25 01:26:34 -05:00
Arthur Barrett
66ddfa295d more refactoring and work on annotationinput (should be working now). 2013-02-22 16:33:28 -05:00
Julian Arni
e5294591dc Foldit leaderboard w/o tests 2013-02-22 11:12:26 -05:00
Vik Paruchuri
d5865e70b8 Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages 2013-02-22 10:21:34 -05:00
Diana Huang
f9667849b8 Fix some minor bugs in event handling and add enter key support 2013-02-22 09:47:50 -05:00
Diana Huang
3ecafa9b42 Add hot keys to rubrics 2013-02-22 09:47:50 -05:00
Alexander Kryklia
4713c5f095 re-enable discussion service 2013-02-22 10:40:09 +02:00
Brian Wilson
6d174ef029 remove dead code 2013-02-21 15:41:28 -05:00
Brian Wilson
d503fe3d79 Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js 2013-02-21 15:38:28 -05:00
Diana Huang
76c4007449 Merge pull request #1522 from MITx/diana/click-tracking 
Add more click tracking and logging to the open ended grading interface
 2013-02-21 11:10:35 -08:00
Your Name
ff68853990 Merge branch 'master' into feature/victor/revert-revert-of-forums-ui 2013-02-21 13:30:24 -05:00
Ned Batchelder
c3b571bf9b Make sure temp directories are properly cleaned up so running tests doesn't leave them behind. 2013-02-21 11:38:45 -05:00
Diana Huang
3a8b7156a0 Merge branch 'master' into diana/click-tracking 2013-02-21 10:19:35 -05:00
Diana Huang
18a56005b0 Address code review feedback 
- make category a data field of an input
- namespace event types
- don't try to use the track function when it doesn't exist
- generate event types if it doesn't match a pre-existing pattern
 2013-02-21 10:17:08 -05:00
Brian Talbot
6f2e6116f9 LMS - adding back in a Sass mixin that seems to still have dependencies 2013-02-21 09:16:06 -05:00
Brian Wilson
731f4abd8a fix bug with nav to a page, and add pdfviewer.css. 2013-02-21 03:15:08 -05:00
Arthur Barrett
cc7f791078 parse xml for annotationinput 2013-02-20 19:19:17 -05:00
John Jarvis
342220f0f4 js syntax 2013-02-20 18:50:16 -05:00
Brian Wilson
50cae69945 define pdfviewer.js, and use from static_pdfbook.html 2013-02-20 18:37:17 -05:00
John Jarvis
4b93ef491b errors for login and reg 2013-02-20 18:23:41 -05:00
Vik Paruchuri
9bc8dbd7ca Fix location strings, re-order checkboxes 2013-02-20 18:04:25 -05:00
Diana Huang
3fe6a74e76 Merge pull request #1528 from MITx/press/international-press-release 
add press release: edX expands internationally
 2013-02-20 14:55:58 -08:00
Victor Shnayder
84eaec3666 add press release: edX expands internationally 2013-02-20 17:50:23 -05:00
Vik Paruchuri
051b7fd21d Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages 2013-02-20 17:50:09 -05:00
Arthur Barrett
a982ebbb03 Refactored rendered method and added span ids. 2013-02-20 17:33:11 -05:00
Victor Shnayder
bf454382d0 Merge pull request #1525 from MITx/press/international 
Press/international
 2013-02-20 14:14:11 -08:00
Victor Shnayder
4d643d36cc Merge branch 'press/international' of github.com:MITx/mitx into press/international 2013-02-20 16:53:39 -05:00
Vik Paruchuri
d5ba5457dc Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
 2013-02-20 16:49:59 -05:00
Vik Paruchuri
ad9400a0ef Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
 2013-02-20 16:43:04 -05:00
Vik Paruchuri
111ef30f05 Render to string fix, display ETA message when student submits 2013-02-20 16:30:44 -05:00
Arthur Barrett
af2bfa9d4e Saving work in progress on v2 with capa template for annotation problem. 2013-02-20 16:30:19 -05:00
Vik Paruchuri
59b2f2ccd7 Move controller query service to xmodule side to prepare for ETA message displays 2013-02-20 16:19:17 -05:00
Brian Talbot
d0fca477a8 edx.org - university pages' main banner images are now centered when window resizes 2013-02-20 16:12:36 -05:00
VikParuchuri
fbce67a883 Merge pull request #1519 from MITx/diana/fix-self-assessment-test 
Fix test so we don't have to skip it anymore.
 2013-02-20 13:02:02 -08:00
Victor Shnayder
d2e97d2389 Merge pull request #1518 from MITx/press/international 
Press/international
 2013-02-20 12:07:16 -08:00
Victor Shnayder
1ae06a45bb Add lower case urls for universities. 
- Dan sent out a press release with those urls.
- Using a redirect instead of making it case-insensitive
  because the proper urls are prettier
 2013-02-20 14:59:28 -05:00
Diana Huang
ea13659249 Merge branch 'master' into diana/click-tracking 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
 2013-02-20 14:02:04 -05:00
Diana Huang
a789d6c363 Merge branch 'master' into diana/fix-self-assessment-test 2013-02-20 13:37:42 -05:00
Diana Huang
6e453c2b8b Clean up and fix some peer grading tests. 2013-02-20 13:36:09 -05:00
Vik Paruchuri
3db3d7b740 Fix eta message slightly 2013-02-20 13:31:06 -05:00
Vik Paruchuri
59e3647692 Add in support for getting and displaying ETA 2013-02-20 13:28:37 -05:00
Vik Paruchuri
dbe93502f1 Fix tests 2013-02-20 12:44:12 -05:00
Vik Paruchuri
2302c3244b Merge branch 'feature/vik/disable-spell-check' into feature/vik/check-if-submission-allowed 2013-02-20 12:01:42 -05:00
Diana Huang
13d4cfa4d4 Merge branch 'master' into diana/click-tracking 2013-02-20 11:40:14 -05:00
Arthur Barrett
33c12647cb Merge branch 'master' into feature/abarrett/annotatable_xmodule 2013-02-20 11:31:53 -05:00
Diana Huang
b3767fc553 Merge branch 'master' into feature/diana/close-oe-problems 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-02-20 11:20:10 -05:00
Arthur Barrett
2f68cba24d merged from master 2013-02-20 11:07:46 -05:00
Diana Huang
03a4deb847 Merge pull request #1489 from MITx/feature/vik/settings-to-xmodule 
Feature/vik/settings to xmodule
 2013-02-20 08:06:20 -08:00