Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,790 Commits 1 Branch 0 Tags
68fa1984fa5a806dad685491e004cbeeeb2cd6fa
Commit Graph

2855 Commits

Author SHA1 Message Date
Chris Dodge
b6090952da randomize_module.py was missing 'import lxml' to support definition_to_xml(). Also, fix serialization of show_timezone to expect a bool 2013-05-23 14:24:36 -04:00
chrisndodge
a8084628e1 Merge pull request #1956 from edx/feature/cdodge/autoprovision-forums-master 
Feature/cdodge/autoprovision forums master
 2013-05-23 09:27:36 -07:00
David Baumgold
0a7222b123 Allow an AJAX call to specify that it should not notify on error 
Because there are some cases where it's OK to fail, and it's not the user's fault
 2013-05-22 15:55:56 -04:00
Chris Dodge
9b88528b04 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-22 13:20:49 -04: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
Chris Dodge
fbbae44988 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 
Conflicts:
	cms/djangoapps/contentstore/views/course.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/management/commands/show_permissions.py
	lms/djangoapps/django_comment_client/models.py
	lms/djangoapps/django_comment_client/tests/test_utils.py
	lms/envs/common.py
 2013-05-20 10:22:36 -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
e947218285 Merge master to here. 2013-05-16 14:21:51 -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
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
Chris Dodge
ce52be1e57 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-15 09:59:26 -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
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
Victor Shnayder
4f2c3b78da fix order of operations to make things rotate correctly 2013-05-13 16:27:27 -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
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
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