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

1867 Commits

Author SHA1 Message Date
Calen Pennington
3e568667fc Fix merge badness 2012-12-07 11:24:25 -05:00
Calen Pennington
c917725ff0 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/static/sass/course.scss
	requirements.txt
 2012-12-07 11:17:41 -05:00
David Ormsbee
61c17cabfa Merge pull request #1100 from MITx/fix/brian/nonascii-html-xmodule 
Fix/brian/nonascii html xmodule
 2012-12-06 15:33:21 -08:00
David Ormsbee
cee0781a20 Don't cap points coming back from CodeResponses -- let them be more than max_points if they want to award extra credit. 2012-12-04 15:51:36 -05:00
Brian Wilson
c2d5c04d9d Merge branch 'master' into fix/brian/nonascii-html-xmodule 2012-12-04 13:26:37 -05:00
Brian Wilson
cde20758f8 cosmetic cleanup 2012-12-04 13:25:04 -05:00
Brian Wilson
dfb9913100 clean up lms tests, and fix export/import 2012-12-04 11:52:35 -05:00
Brian Wilson
4ebd70dcc4 add support for utf8 in sequences, verticals and custom modules. 2012-12-04 03:54:36 -05:00
Brian Wilson
5b02e1e3ce add additional html tests 2012-12-03 16:26:08 -05:00
Brian Wilson
1d44ebb10c Add more non-ascii characters to full dataset, and make fixes in xmodule code. 2012-12-03 16:22:25 -05:00
Brian Wilson
0c1ebd8dfb add toylab test data and test changes, including fix to jump_to 2012-11-30 19:05:26 -05:00
David Ormsbee
c2c016c58b Fix MathJax S3 URL to use the standard HTTPS location 2012-11-30 18:00:45 -05:00
David Ormsbee
0b3d739646 Switch to S3 hosted mathjax (I thought we did this ages ago). 2012-11-30 17:01:30 -05:00
Chris Dodge
2aceb2e44a make sure when defining the course namespace in the replace url methods that we explicitly state the parameter name. There are some optional parameters and if we don't define the parameter name, it'll end put being interpreted as a different parameter 2012-11-29 15:56:03 -05:00
Chris Dodge
46870f4391 be sure to always pass in a course namespace - which can be just the location of the module itself since it has the same org/course pair - when rewriting links. Also, allow for an option parameter in get_module() to disable the wrapping of the module's HTML with the xmodule_display.html. This is needed for ancillary course content such as 'about', 'course info', which are now stored as xmodules, but should not be wrapped in xmodule_display.html as it breaks some styling 2012-11-29 15:09:28 -05:00
Chris Dodge
050cb89cf7 fix crash with working with custom tags with XML filestore 2012-11-29 13:24:41 -05:00
Chris Dodge
021ed3bca6 fix crash with working with custom tags with XML filestore 2012-11-29 13:24:07 -05:00
chrisndodge
89ad8cc564 Merge pull request #1086 from MITx/feature/studio/tom/tabs-cleanup 
Static tabs cleanup
 2012-11-29 06:49:28 -08:00
Brian Wilson
9bfa800208 add non-ascii data to toy dataset 2012-11-28 18:28:40 -05:00
Brian Wilson
6a24ecebe7 decode utf-8 when reading html, and encode when writing. 2012-11-28 17:54:18 -05:00
Victor Shnayder
4b58cb9560 Fix attempt tracking, fix test 
- increments attempts on any transition to DONE state
 2012-11-28 15:04:07 -05:00
Victor Shnayder
0a1b731dbc properly reset answer area on module reset 2012-11-28 14:18:44 -05:00
Victor Shnayder
b41b459712 update docstring on x_module.get_score to match reality 2012-11-28 14:09:32 -05:00
Victor Shnayder
4fd1a2fa1a Fix state tracking for self-assessment. 
now keep each set of responses in a separate dictionary
 2012-11-28 14:09:09 -05:00
Victor Shnayder
e3b9238eef reorder imports 2012-11-28 14:08:18 -05:00
Victor Shnayder
f8e45e0a8e Add tests for old logic 2012-11-28 13:21:48 -05:00
Victor Shnayder
a0a5167207 Hook up testing for self assessment modules 2012-11-28 11:12:06 -05:00
Victor Shnayder
ba9280f3e0 Merge pull request #1010 from MITx/feature/alex/regions 
Feature/alex/regions
 2012-11-28 07:09:14 -08:00
Victor Shnayder
b63a787a26 Merge pull request #1081 from MITx/feature/alex/crystallography-update-mitx 
Feature/alex/crystallography update mitx
 2012-11-28 07:04:23 -08:00
Alexander Kryklia
74b30d8c20 removed no-longer relevant template params 2012-11-28 17:02:07 +02:00
Alexander Kryklia
2865c7cad4 moved tests from miller to tests 2012-11-28 16:57:30 +02:00
Alexander Kryklia
dcd52801ef case when user sends less than 3 points, and tests for this case 2012-11-27 16:10:51 +02:00
Alexander Kryklia
b0a85fde54 fix line widths 2012-11-27 14:53:45 +02:00
Alexander Kryklia
95151ad33a tests updates for imageresponse 2012-11-27 14:53:45 +02:00
Alexander Kryklia
896e922858 cleaning and documeting 2012-11-27 14:53:45 +02:00
Alexander Kryklia
adef5d6f7e polygon is created from points via convex_hull 2012-11-27 14:53:45 +02:00
Alexander Kryklia
72f9358f64 tests for imageresponse regions 2012-11-27 14:53:44 +02:00
Alexander Kryklia
5723672e49 speed improvements 2012-11-27 14:53:44 +02:00
Alexander Kryklia
9ce51ec6cf support for single list syntax in regions 2012-11-27 14:53:44 +02:00
Александр
647d1514aa support both regions and rectangles 2012-11-27 14:53:44 +02:00
Александр
b4fb0cc463 fixed line length 2012-11-27 14:53:44 +02:00
Александр
88c98b9a56 added multiple regions support 2012-11-27 14:37:57 +02:00
John Jarvis
474f810b38 Adding lowest_passing_grade() to CourseDescriptor 2012-11-26 16:29:45 -05:00
Chris Dodge
b3dcc140b7 made a special 'module preview' view for Static Tabs in the CMS. Per Tom, he'd like just the Display Name to show up in the static tab editor until the end-user clicks the Edit button 2012-11-26 14:22:13 -05:00
Calen Pennington
8e68573243 Merge pull request #1041 from MITx/fix/cdodge/video-captions 
wire through course asset path information to the video playback module ...
 2012-11-26 08:29:05 -08:00
Chris Dodge
6d45445aef assume that users are putting caption information in /static/subs. We'll enforce this on the xlint utility 2012-11-26 11:19:51 -05:00
Chris Dodge
2d7f1b73d7 consolidate logic to compute caption path to server-side, we don't need to do this client-side 2012-11-26 11:19:51 -05:00
Chris Dodge
71f16d40e1 wire through course asset path information to the video playback module and corresponding .coffee files 2012-11-26 11:19:51 -05:00
Calen Pennington
4e3da342d7 Merge pull request #1048 from MITx/feature/cdodge/xlint 
Feature/cdodge/xlint
 2012-11-26 08:11:34 -08:00
Chris Dodge
fff3782884 cleave xlint entry point in xml_importer.py to be separate from the import method 2012-11-26 11:05:57 -05:00