cahrens
|
2020923f2d
|
Prevent invalid numeric entries.
|
2013-05-20 13:26:27 -04:00 |
|
cahrens
|
5920ea91ee
|
One minor update.
|
2013-05-17 11:00:00 -04:00 |
|
cahrens
|
a6c5e699ea
|
Update combined open ended and peer grading per conversation with Vik.
|
2013-05-16 13:28:48 -04:00 |
|
marco
|
ef14155306
|
cleaned up latex styling, polyfill function wrapper, draft number template update for polyfill
|
2013-05-16 09:50:16 -04:00 |
|
marco
|
bbb6a3c60d
|
resolved metadata-edit conflict, adding in latex item into settings
|
2013-05-15 16:27:04 -04:00 |
|
marco
|
12dae84a07
|
commented out firefox polyfill ad well as xmodule css editor changes
|
2013-05-15 16:07:45 -04:00 |
|
cahrens
|
d72b6b05bf
|
Merge branch 'master' into feature/christina/metadata-ui
Conflicts:
cms/static/sass/views/_static-pages.scss
|
2013-05-15 15:29:27 -04:00 |
|
cahrens
|
fa1dfd716a
|
Update unit test for editable_metadata_fields.
|
2013-05-15 15:25:36 -04:00 |
|
Calen Pennington
|
14bf719538
|
Merge pull request #2019 from edx/fix/cale/xmodule-template-docs
Add documentation of xmodule template files
|
2013-05-15 12:20:10 -07:00 |
|
cahrens
|
d35b29031f
|
Clean up editable_metadata_fields.
|
2013-05-15 14:01:18 -04:00 |
|
marco
|
b3e41d19f6
|
styling for static pages updated
|
2013-05-15 13:29:35 -04:00 |
|
marco
|
0422350e8c
|
final changes to codemirror styling, and clean up style for settings button clearing
|
2013-05-15 12:05:43 -04:00 |
|
marco
|
d264c943a4
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-15 10:54:15 -04:00 |
|
marco
|
e157173c11
|
styling adjustments to codemirror and wrapped polyfill into a function
|
2013-05-15 10:53:54 -04:00 |
|
cahrens
|
d4d38827b4
|
Updates for showanswer.
|
2013-05-15 10:35:40 -04:00 |
|
Vasyl Nakvasiuk
|
b02e92a80c
|
fix word cloud test
|
2013-05-15 11:42:43 +03:00 |
|
Vasyl Nakvasiuk
|
0eb1b97ffc
|
add more docs
|
2013-05-15 11:42:43 +03:00 |
|
Vasyl Nakvasiuk
|
0afe6c11ab
|
word cloud: fix pylint warnings, use MetadataOnlyEditingDescriptor instead of RawDescriptor
|
2013-05-15 11:42:43 +03:00 |
|
Carlos Andrés Rocha
|
9a671f12d7
|
Fix import con resposetype when importing xqueue_interface
|
2013-05-14 17:15:46 -04:00 |
|
cahrens
|
17750a7d6d
|
Use min, max, and step values from server.
|
2013-05-14 14:20:10 -04:00 |
|
cahrens
|
5bd0442ffb
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-14 13:53:03 -04:00 |
|
cahrens
|
82899d6d2e
|
Number view.
|
2013-05-14 12:40:17 -04:00 |
|
Calen Pennington
|
799ad92ecd
|
Add documentation of xmodule template files
|
2013-05-14 09:37:13 -04:00 |
|
cahrens
|
aaffee5081
|
Initial cleanup of open_ended_module and peer_grading_module.
|
2013-05-13 17:27:59 -04:00 |
|
Victor Shnayder
|
4f2c3b78da
|
fix order of operations to make things rotate correctly
|
2013-05-13 16:27:27 -04:00 |
|
cahrens
|
2a8b8e2010
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-13 15:36:15 -04:00 |
|
cahrens
|
8c36918abf
|
Support display names for choices.
|
2013-05-13 15:35:55 -04:00 |
|
Peter Baratta
|
554d342f4e
|
Merge pull request #2018 from edx/fix/peter/numerical_infinite_bug
Fix infinity bug for numericalresponse; add tests
|
2013-05-13 11:08:54 -07:00 |
|
VikParuchuri
|
e122efc5a3
|
Merge pull request #1991 from edx/feature/vik/oe-tests
Feature/vik/oe tests
|
2013-05-13 10:49:33 -07:00 |
|
cahrens
|
e29c940e7c
|
Add display_names, update help, remove unnecessary things from templates.
|
2013-05-13 13:15:07 -04:00 |
|
Vik Paruchuri
|
451784dc92
|
Fix pep8 space issues
|
2013-05-13 12:59:18 -04:00 |
|
Vik Paruchuri
|
df07192a68
|
Querydict comment.
|
2013-05-13 12:42:30 -04:00 |
|
Peter Baratta
|
d80024472c
|
Pylint fixes
|
2013-05-13 12:40:32 -04:00 |
|
Vik Paruchuri
|
a5549fd7fb
|
Add in some assert statements
|
2013-05-13 12:25:23 -04:00 |
|
Peter Baratta
|
06efd40ba9
|
Comment capitalization
|
2013-05-13 11:29:46 -04:00 |
|
Chris Dodge
|
d32e7a5b61
|
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
|
2013-05-13 11:06:49 -04:00 |
|
cahrens
|
5edbf3d8f7
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-13 10:55:32 -04:00 |
|
Valera Rozuvan
|
c56d1b5e78
|
Checked JS files with linter, corrected a few minor issues.
|
2013-05-13 17:37:14 +03:00 |
|
Peter Baratta
|
2b9d78dfd5
|
Pep8 fixes and changes to NaN tests
|
2013-05-13 10:18:19 -04:00 |
|
Chris Dodge
|
3cf865a88f
|
added another unit test check point for export/import of classic textbooks
|
2013-05-13 10:16:18 -04:00 |
|
Calen Pennington
|
b78e044018
|
Move wordcloud template settings into metadata, and remove contents of definition (since no fields edited by studio authors have scope.settings)
|
2013-05-13 09:05:05 -04:00 |
|
Valera Rozuvan
|
1353ae3ec2
|
Added license information to d3 JS file and to the word cloud layout.
|
2013-05-13 14:44:10 +03:00 |
|
Vasyl Nakvasiuk
|
4138c47128
|
merge all word_cloud Xmodule fields to one WordCloudFields class
|
2013-05-13 14:44:10 +03:00 |
|
Alexander Kryklia
|
09f6d2a651
|
updated docstrings
|
2013-05-13 14:44:10 +03:00 |
|
Vasyl Nakvasiuk
|
5e6f3601eb
|
Word Cloud: docstrings + pep8
|
2013-05-13 14:44:10 +03:00 |
|
Alexander Kryklia
|
af8b9eca65
|
removes display_name from studio template
|
2013-05-13 14:44:10 +03:00 |
|
Alexander Kryklia
|
7559cd90d6
|
separates xfields that descriptor use and module use
|
2013-05-13 14:44:10 +03:00 |
|
Alexander Kryklia
|
36d2dd632d
|
adds mako_template string to desctiptor for studio integration
|
2013-05-13 14:44:10 +03:00 |
|
Alexander Kryklia
|
bdc62e7d2e
|
word cloud studio integration
|
2013-05-13 14:44:09 +03:00 |
|
Alexander Kryklia
|
04b712510e
|
PEPifying
|
2013-05-13 14:44:09 +03:00 |
|