Chris Dodge
e70db062b2
Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge
...
Conflicts:
requirements.txt
2013-01-03 10:46:24 -05:00
Chris Dodge
7229a9cdaf
perform a new merge from master, resolve conflicts
2013-01-03 10:43:03 -05:00
cahrens
dd7ed956dd
Bug fix for Studio #55 .
2012-12-14 11:37:45 -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
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
Victor Shnayder
ba9280f3e0
Merge pull request #1010 from MITx/feature/alex/regions
...
Feature/alex/regions
2012-11-28 07:09:14 -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
Александр
01b5992372
comment outputs
2012-11-22 18:53:35 +02:00
Александр
4b4b2c9927
added documentation, tests, and rounding to closes 0.05 value
2012-11-22 18:44:31 +02:00
Valera Rozuvan
3e8e576e28
Slight change in caption for lattice select.
2012-11-22 16:52:59 +02:00
Valera Rozuvan
37714d45ac
Merge branch 'feature/alex/crystallography-update-mitx' of github.com:MITx/mitx into feature/alex/crystallography-update-mitx
2012-11-22 13:56:00 +02:00
Valera Rozuvan
19c463b739
Removed radio buttons for selecting the intersection type from crystallography template.
2012-11-22 13:55:50 +02:00
Александр
166ff823a7
removed hidden parameter to template, style='hidden' is set by default for input
2012-11-22 12:53:21 +02:00
Александр
111667defd
UI delta and tests:
2012-11-21 19:02:40 +02:00
Александр
33159824a5
added test for lattices
2012-11-21 18:02:48 +02:00
Александр
d5dd725537
miller indices calculation
2012-11-21 17:53:51 +02:00
Valera Rozuvan
aaeffa5316
Updated template for crystallography so that it corresponds to the cnahges made in the JS part.
2012-11-21 16:52:17 +02:00
Valera Rozuvan
a3db017580
Updated crystallography template to reflect changes made in the JS part.
2012-11-20 14:19:48 +02:00
Valera Rozuvan
9d46ad51be
Merge branch 'feature/alex/crystallography-update-mitx' of github.com:MITx/mitx into feature/alex/crystallography-update-mitx
2012-11-19 18:20:17 +02:00
Valera Rozuvan
ae37b621a8
Update to crystallography html.
2012-11-19 18:19:36 +02:00
Александр
d70b74c701
added miller indexes grading for crystallography problems
2012-11-19 18:18:08 +02:00
Calen Pennington
171e932266
Merge branch 'master' into feature/cale/cms-master
...
Conflicts:
rakefile
2012-11-08 12:28:40 -05:00
Calen Pennington
3230345204
Make coverage reports only include code from the source directories
2012-11-08 12:25:12 -05:00
Ned Batchelder
28bb4724e7
Put the coverage data files in the reports dir, where they will be treated like the disposable things they are.
2012-11-08 11:20:23 -05:00
Ned Batchelder
3dc23eb131
Coverage xml and html reports are now a separate 'xml' and 'html' step from 'test'.
2012-11-08 11:20:22 -05:00
Ned Batchelder
90e3386751
WIP for quieter tests with coverage.
2012-11-08 11:19:33 -05:00
Calen Pennington
bca0134a35
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2012-11-06 16:13:31 -05:00
Victor Shnayder
9db977feae
Merge pull request #1002 from MITx/feature/victor/inputtypes-refactor
...
More inputtype refactor …
2012-11-02 13:05:40 -07:00
Victor Shnayder
79174259cb
Address Ike's comments.
...
- change a few comments / strings
- move extract_choices into the ChoiceGroup class
2012-11-02 14:00:51 -04:00
Calen Pennington
0bfa443520
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2012-11-02 11:09:19 -04:00
Александр
3ed4b77d8c
removed testsing comments
2012-11-01 17:43:41 +02:00
Александр
07a2a105ca
added comments
2012-11-01 17:35:27 +02:00
Александр
5ba2c2e785
converted unittests
2012-11-01 16:48:44 +02:00
Александр
5755325a41
changed syntax to support e1,e2 in AX6 and add convert_to_p behavior
2012-11-01 16:26:54 +02:00
Александр
fa2cf6a49c
add convert_to_perepherial flag and removed order flags
2012-11-01 08:22:33 +02:00
Victor Shnayder
b78fb8dff6
Refactored the rest of the input types
2012-11-01 00:05:48 -04:00
Victor Shnayder
7fcf02a0cc
Further refactor
...
- small Attribute and InputTypeBase interface changes to make things cleaner
- move html quoting into templates (use ${blah | h} syntax)
- converting input types to use new format.
2012-10-31 23:40:19 -04:00
Victor Shnayder
74e23546af
More inputtype refactor
...
- add an Attribute class
- input types just need to declare which attributes they want, and how to transform and validate them, and the base class will do all the rest.
- change OptionInput to new format.
2012-10-31 18:40:10 -04:00
