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

10635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Wilson
d503fe3d79 Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js 2013-02-21 15:38:28 -05:00
Brian Wilson
d5e34b0a44 fix initialization of scale dropdown, and check for valid values of page number 2013-02-21 15:35:03 -05:00
Victor Shnayder
8d76556729 Merge pull request #1531 from MITx/fix/cdodge/serializing-ints-as-empty-strings 
Fix/cdodge/serializing ints as empty strings
 2013-02-21 12:12:44 -08: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
Ned Batchelder
3580deaec0 Merge pull request #1534 from MITx/fix/zoldak/test-modulestore-naming 
Change test modulestore naming differentiation scheme to uuid
 2013-02-21 11:01:58 -08:00
Jay Zoldak
9eb2766943 Change test modulestore naming differentiation scheme to uuid 2013-02-21 13:07:14 -05:00
Chris Dodge
bc1ee3dbfa Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings 2013-02-21 12:56:20 -05:00
Chris Dodge
041d28f0e9 use better variable names to assert that the expected item was indeed loaded 2013-02-21 12:56:17 -05:00
Don Mitchell
49cab68aee Merge pull request #1533 from MITx/fix/cdodge/template-got-renamed 
template name got changed. Need to reflect that on test.
 2013-02-21 09:27:23 -08:00
Chris Dodge
fa3402a977 template name got changed. Need to reflect that on test. 2013-02-21 12:25:10 -05:00
Chris Dodge
bb75a23101 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings 2013-02-21 11:58:52 -05:00
David Ormsbee
3494d58450 Merge pull request #1532 from MITx/feature/ned/clean_up_tests 
Make sure temp directories are properly cleaned up so running tests does...
 2013-02-21 08:52:09 -08: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
Don Mitchell
ba7959fc4d Merge pull request #1511 from MITx/feature/cdodge/metadata-inheritence-crawling 
Feature/cdodge/metadata inheritence crawling
 2013-02-21 08:29:54 -08:00
Chris Dodge
a7f6545cbc add unit test 2013-02-21 11:22:20 -05:00
Chris Dodge
68a8587ed2 don't serialize weight out as an int - use a string. The code in capa-module.py expects a string and tries to convert to a float. So this impedence mismatch is causing a crash on import when importing empty strings for 'weight' or 'attempts' 2013-02-21 11:02:47 -05:00
Diana Huang
9aac915c9f Remove unnecessary assignment 2013-02-21 10:33:48 -05:00
Brian Wilson
00e31c0116 fix toolbarViewer styling 2013-02-21 10:30:20 -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
Jay Zoldak
8b1579e490 Merge pull request #1527 from MITx/feature/vik/check-if-submission-allowed 
Feature/vik/check if submission allowed
 2013-02-21 06:37:50 -08:00
Brian Wilson
731f4abd8a fix bug with nav to a page, and add pdfviewer.css. 2013-02-21 03:15:08 -05:00
Brian Wilson
1850528a99 add contents of pdfjs to common/static/js/vendor, after fixing CR/LF issues in localization files 2013-02-20 18:49:59 -05:00
Brian Wilson
50cae69945 define pdfviewer.js, and use from static_pdfbook.html 2013-02-20 18:37:17 -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
c55f997086 Fix self assessment tests 2013-02-20 17:34:51 -05:00
Vik Paruchuri
912800cabf Fix location string object problems 2013-02-20 17:27:37 -05:00
Victor Shnayder
bf454382d0 Merge pull request #1525 from MITx/press/international 
Press/international
 2013-02-20 14:14:11 -08:00
Diana Huang
cf7a34ae74 Merge pull request #1524 from MITx/feature/vik/check-if-submission-allowed 
Feature/vik/check if submission allowed
 2013-02-20 14:03:39 -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
Christina Roberts
1f0c84ed05 Merge pull request #1523 from MITx/style/btalbot/studio-newsection 
studio - fixed alignment of new section field and controls
 2013-02-20 13:44:49 -08:00
Brian Talbot
8b5f088eb9 studio - fixed alignment of new section field and controls 2013-02-20 16:43:13 -05:00
Chris Dodge
67f97c2c56 update Victor's metadata inheritance comment 2013-02-20 16:26:09 -05:00
Chris Dodge
bd188f92ef put back the inheritable_metadata list into the XModuleDescriptor class. Also extend the metadata_inheritance test case 2013-02-20 16:20:39 -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
Chris Dodge
da223d9e11 remove raise statement which was just needed for debugging 2013-02-20 14:13:19 -05:00
Chris Dodge
756959812f add some comments regarding which code can be removed when the 'split mongo module store' work is completed 2013-02-20 14:11:57 -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
c3d485a609 Fix error message 2013-02-20 13:33:17 -05:00
Diana Huang
789db30176 Merge pull request #1520 from MITx/feature/vik/disable-spell-check 
Feature/vik/disable spell check
 2013-02-20 09:45:32 -08: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
Vik Paruchuri
c48998b30a Fix SA tests 2013-02-20 11:57:29 -05:00