Commit Graph

3683 Commits

Author SHA1 Message Date
Ned Batchelder
b9d134e3d1 Merge pull request #2101 from edx/ned/fix-code-import-for-check-functions
Check functions need access to course-local code also, so we need to sav...
2013-05-22 12:32:43 -07:00
Ned Batchelder
392de8d40e Check functions need access to course-local code also, so we need to save the python path from the problem setup, and use it for the check function. 2013-05-22 13:27:24 -04:00
VikParuchuri
f8e68216a7 Merge pull request #2096 from edx/fix/vik/oe-cache
Fix/vik/oe cache
2013-05-22 09:59:33 -07:00
e0d
e4c3f92372 Merge pull request #2100 from edx/hotfix/e0d/code-jail
Sandbox-installed packages will be really installed instead of -e instal...
2013-05-22 09:05:03 -07:00
Vik Paruchuri
3bd04290f5 Add tests, address review comments 2013-05-22 11:58:03 -04:00
Vik Paruchuri
a44eacd474 Make fields stringy, remove false dict 2013-05-22 10:54:52 -04:00
Ned Batchelder
ce005072b0 Sandbox-installed packages will be really installed instead of -e installed. 2013-05-21 19:21:39 -04:00
Ned Batchelder
e59d345917 Use a different arbitrary dotted module, which Christina doesn't already have imported 2013-05-21 14:27:50 -04:00
Kevin Chugh
ef3204da69 Merge pull request #2059 from edx/feature/zoldak/forum-testing
Feature/zoldak/forum testing
2013-05-17 10:10:55 -07:00
Christina Roberts
f4044ed1e8 Merge pull request #2061 from edx/bug/christina/static-pages
Make sure to get the correct modulestore on delete (static tabs do not e...
2013-05-17 09:59:59 -07:00
cahrens
944d2d61f1 Make sure to get the correct modulestore on delete (static tabs do not exist in draft modulestore).
#324
2013-05-16 17:15:53 -04:00
Ned Batchelder
d0c4afb32f More info in the capa/safe_exec/README 2013-05-16 17:02:45 -04:00
Ned Batchelder
e947218285 Merge master to here. 2013-05-16 14:21:51 -04:00
Ned Batchelder
bbd1d8d09e From code review: the hash was shallow, so nested objects could have hashed differently when they didn't need to. 2013-05-16 13:58:05 -04:00
Ned Batchelder
f05b25d17a Added more to the safe_exec docstring. 2013-05-16 13:15:28 -04:00
Jay Zoldak
b97772a9c6 Gitignore jasmine_test_runner.html in the appropriate place. 2013-05-16 12:39:48 -04:00
Jay Zoldak
ed3df10638 Set up rake task for jasmine tests for discussion forums code. 2013-05-16 10:56:57 -04:00
Ned Batchelder
8f3c1db1ef Add some notes for the future maintainer. 2013-05-15 17:00:39 -04:00
Calen Pennington
ec7c47828f Merge pull request #1961 from edx/feature/cale/maintain-dev-environment
Feature/cale/maintain dev environment
2013-05-15 12:36:36 -07:00
Calen Pennington
52d209d053 Use coffee installed in local node_modules for tests 2013-05-15 15:25:41 -04:00
Calen Pennington
964c21ff2b Add a jasmine test runner for capa 2013-05-15 15:23:56 -04:00
Calen Pennington
ef17e9368c Make capa specify distribute 0.6.28 like the rest of the project 2013-05-15 15:23:56 -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
Ned Batchelder
b32878e6c7 Added instructions for getting capa sandboxed. 2013-05-15 12:59:56 -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
Ned Batchelder
4ea7607648 Check that the directory being added to the Python path is really inside the course. 2013-05-14 14:59:19 -04:00
Calen Pennington
799ad92ecd Add documentation of xmodule template files 2013-05-14 09:37:13 -04:00
Victor Shnayder
4f2c3b78da fix order of operations to make things rotate correctly 2013-05-13 16:27:27 -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
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
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