Commit Graph

6956 Commits

Author SHA1 Message Date
Valera Rozuvan
96637e9ae7 Change some code styling. Added statistics display. Minor tweaks. 2013-05-13 14:44:04 +03:00
Vasyl Nakvasiuk
6deeb60278 update template for word_cloud, refactor empty json answer 2013-05-13 14:44:04 +03:00
Vasyl Nakvasiuk
ed23aef607 use post.getlist word wordcloud param 2013-05-13 14:44:04 +03:00
Vasyl Nakvasiuk
328b5b3d08 use postWithPrefix + $.param 2013-05-13 14:44:03 +03:00
Valera Rozuvan
82209850e4 Small refactor. 2013-05-13 14:44:03 +03:00
Vasyl Nakvasiuk
2bcc0065b1 use ajaxWithPrefix 2013-05-13 14:44:03 +03:00
Vasyl Nakvasiuk
36c8af611b use user_state, add test_logic test 2013-05-13 14:44:03 +03:00
Vasyl Nakvasiuk
9b9749160e add more docstrings 2013-05-13 14:44:02 +03:00
Vasyl Nakvasiuk
b273011727 add total_count to answer from server 2013-05-13 14:44:02 +03:00
Vasyl Nakvasiuk
66615cab4a fix cloude size 2013-05-13 14:44:02 +03:00
Valera Rozuvan
82f87a915c Added rough version of d3 word cloud. 2013-05-13 14:44:02 +03:00
Vasyl Nakvasiuk
acfbe14e39 word cloud done 2013-05-13 14:44:01 +03:00
Vasyl Nakvasiuk
dac9b5c038 Word Cloud: add full cycle Python + HTML + JS 2013-05-13 14:44:01 +03:00
Vasyl Nakvasiuk
5a36b7c332 Word cloud: add test_import 2013-05-13 14:44:01 +03:00
Vasyl Nakvasiuk
dd5a7e7ba8 initialize JS for word_cloud 2013-05-13 14:44:01 +03:00
Vasyl Nakvasiuk
4b3fe54d48 add test data xml for word_cloud 2013-05-13 14:44:00 +03:00
Vasyl Nakvasiuk
143d2c8636 fix WordCloudDescriptor 2013-05-13 14:44:00 +03:00
Alexander Kryklia
bb9bc42171 adds initial word_cloud_module files 2013-05-13 14:44:00 +03:00
Alexander Kryklia
e5daeb41fb update docstring 2013-05-13 14:44:00 +03:00
Arthur Barrett
beabdf1434 Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-11 14:52:39 -04:00
Chris Dodge
d95e87cf67 insert the textbook XML element when writing definition to xml 2013-05-11 10:34:36 -04:00
cahrens
fd52980a2d Option view, changes getting persisted. 2013-05-10 16:02:22 -04:00
Chris Dodge
1db66957af Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting 2013-05-10 15:44:55 -04:00
Peter Baratta
a1db394bcd Test for infinity in numerical and formula responses 2013-05-10 15:22:23 -04:00
Peter Baratta
f970bbd121 Add tests on the problem level that show the infinite answer bug 2013-05-10 15:21:29 -04:00
dcadams
a05006a415 Merge branch 'master' of github.com:edx/mitx into feature-dcadams-usermanagement 2013-05-10 10:39:00 -07:00
Chris Dodge
d39d44ba49 keep migrations in djangoapp_comment_client 2013-05-10 12:58:00 -04:00
Greg Price
7d544d449f Remove edX news from dashboard if marketing site is enabled 2013-05-10 11:03:49 -04:00
Greg Price
a0fb4d6c85 Merge branch 'master' into drupal-new
Conflicts:
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/base/_base.scss
	lms/templates/forgot_password_modal.html
2013-05-10 10:30:10 -04:00
Chris Dodge
51809965fe Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master 2013-05-10 10:01:53 -04:00
Chris Dodge
1b0eff52ed create test cases to simulate error exporting/importing textbooks 2013-05-10 10:01:10 -04:00
Will Daly
c730d43dbf Resolved import conflict involving django-staticfiles
(lettuce assumes we are using django.contrib.staticfiles).
This allows us to run the django-admin.py harvest test server,
instead of launching the server ourselves.
2013-05-10 09:18:37 -04:00
Calen Pennington
ee52726853 Merge pull request #2000 from edx/fix/cale/dont-show-template-course
Filter out the template course from the mongo modulestore get_courses function
2013-05-10 04:06:33 -07:00
ichuang
2bb180a353 Merge pull request #1935 from edx/fix/formularesponse_needs_samples
formularesponse requires the "samples" attribute
2013-05-09 19:02:57 -07:00
Calen Pennington
ea859bd6c7 Filter out the template course from the mongo modulestore get_courses function 2013-05-09 16:22:23 -04:00
Arthur Barrett
dd583ce4f9 Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-09 14:32:05 -04:00
marco
cad8ae1b9b merged in new data requirements for html 2013-05-09 14:19:31 -04:00
David Baumgold
d09e93142f Merge pull request #1980 from edx/backbone-1.0.0
Upgrade to Backbone 1.0.0
2013-05-09 09:34:35 -07:00
Vik Paruchuri
682d06bcff Fix a lot of pep8 violations 2013-05-09 11:27:44 -04:00
cahrens
bfdbcc2f32 Beginnings of Backbone views/models. 2013-05-09 11:16:12 -04:00
Vik Paruchuri
f72659fa2e Add in asserts 2013-05-09 10:15:07 -04:00
Vik Paruchuri
f9e97cb935 Add test for proper saving 2013-05-09 10:05:48 -04:00
Vik Paruchuri
7a1ef62ee3 Do some code reformatting 2013-05-09 09:56:02 -04:00
Vik Paruchuri
8c12eb78c9 Fix some exceptions 2013-05-09 09:54:57 -04:00
Vik Paruchuri
09d34a02cc Add in some comments 2013-05-09 09:50:32 -04:00
Vik Paruchuri
8323cc7c60 Refactor tests 2013-05-09 09:44:16 -04:00
Vik Paruchuri
7b8b168f2e Move the mockquerydict 2013-05-08 19:21:12 -04:00
Vik Paruchuri
a2e5bd071b Add in tests for peer grading module 2013-05-08 19:17:14 -04:00
Vik Paruchuri
fd46ebd1fa Move some functions, make notification tests more robust 2013-05-08 19:04:07 -04:00
Vik Paruchuri
ff84545f31 Start to add peer grading tests, make dummy system a separate thing 2013-05-08 18:49:28 -04:00