Commit Graph

4251 Commits

Author SHA1 Message Date
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
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
Chris Dodge
5df23d15f2 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
Conflicts:
	cms/djangoapps/contentstore/views/course.py
2013-05-14 10:57:11 -04:00
Chris Dodge
ef78c99f70 pep8/pylint violations fixes 2013-05-14 10:53:10 -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
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
Vik Paruchuri
a5549fd7fb Add in some assert statements 2013-05-13 12:25:23 -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
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
Alexander Kryklia
2d68e4ee9f PEPifying 2013-05-13 14:44:09 +03:00
Alexander Kryklia
ecb9857bda imports forgotter RawDescriptor 2013-05-13 14:44:09 +03:00
Alexander Kryklia
dccadff3a6 changes descriptor in word_cloud to Raw 2013-05-13 14:44:09 +03:00
Alexander Kryklia
6e46dc5447 correct calculation of percents 2013-05-13 14:44:09 +03:00
Alexander Kryklia
23802f873b add tests for percents and for total percents 2013-05-13 14:44:09 +03:00
Anto Stupak
116b07df6d word cloud: return percents. Attribute name is changed 2013-05-13 14:44:09 +03:00
Anto Stupak
0f83170d6f word cloud: return percents. Additional attribute and labels for text on hover are added 2013-05-13 14:44:08 +03:00
Anto Stupak
c70fa41d69 word cloud: return percents 2013-05-13 14:44:08 +03:00
Vasyl Nakvasiuk
f1d1a3f606 refactoring after Python code review 2013-05-13 14:44:07 +03:00
Valera Rozuvan
7b5d5a0499 Removed Object.keys() usage. Now uses simple Array.push() to retrieve all keys. 2013-05-13 14:44:07 +03:00
Valera Rozuvan
13bed39dde Refactoring after peer review. 2013-05-13 14:44:07 +03:00
Valera Rozuvan
f4b247d2bb Refactoring, documenting, moving all HTML generation to template. 2013-05-13 14:44:07 +03:00
Vasyl Nakvasiuk
97855bb4c1 add test_good_ajax_request for WordCloud 2013-05-13 14:44:07 +03:00
Vasyl Nakvasiuk
cb1d3a30bb pep8 2013-05-13 14:44:06 +03:00
Vasyl Nakvasiuk
3bccf54835 remove trash code 2013-05-13 14:44:06 +03:00
Anto Stupak
6763584216 Word cloud JS: data is not loaded without page refresh. Fixed. Also was fixed bug, when font-size is 0 2013-05-13 14:44:06 +03:00
Vasyl Nakvasiuk
72b094e5e9 fix get_state 2013-05-13 14:44:05 +03:00
Vasyl Nakvasiuk
9495059fdc add "get_state" dispatch for WordCloud 2013-05-13 14:44:05 +03:00