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

2889 Commits

Author SHA1 Message Date
VikParuchuri
4a997842c7 Merge pull request #2 from edx/fix/vik/single-step-oe 
Fix js that prevented single step OE problems (ie only self assessment) ...
 2013-05-31 12:10:45 -07:00
Vik Paruchuri
badd3a8d13 Properly stub out the controller_qs variable in the tested module. Test times out without this. 2013-05-31 13:14:19 -04:00
Vik Paruchuri
9281a80089 Fix js that prevented single step OE problems (ie only self assessment) from working 2013-05-31 13:08:41 -04:00
Diana Huang
5118b06ef2 Merge pull request #2147 from edx/diana/fix-error-descriptor 
Fix XML Error Module so that it no longer shows the data to non-staff.
 2013-05-30 08:52:41 -07:00
chrisndodge
5eaa6aea23 Merge pull request #2140 from edx/fix/cdodge/add-randomize-to-list-of-collections 
add the new category which can act as a category
 2013-05-30 06:20:21 -07:00
Diana Huang
910324fb49 Fix XML Error Module so that it no longer shows the data to non-staff. 2013-05-29 16:31:11 -04:00
chrisndodge
42a55fafb2 Merge pull request #1714 from edx/feature/valera/videoalpha1_studio 
Added videoalpha version 1 to the advanced components in studio.
 2013-05-29 12:01:18 -07:00
Chris Dodge
25dae57226 add the new category which can act as a category 2013-05-29 11:16:33 -04:00
Vik Paruchuri
e17276ade8 Fix some pep8 stuff 2013-05-24 16:43:29 -04:00
Vik Paruchuri
9cbb4e090d Swap icons for font awesome 2013-05-24 14:40:33 -04:00
Vik Paruchuri
5050eab74a Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor 2013-05-24 14:26:33 -04:00
Valera Rozuvan
587ac0ecf0 Removed is_graded attribute. In HTML yaml it is not used, and that is not graded. 2013-05-24 10:14:18 +03:00
Valera Rozuvan
1e8c4e9edf Rebase + updated videoalpha template. Now no data_dir attribute and is_graded set to false. 2013-05-24 10:14:18 +03:00
Valera Rozuvan
aaeb3a862d Added Python tests for start_time and end_time parameters. 2013-05-24 10:14:18 +03:00
Lyla Fischer
56f60e06e4 changed 'from' and 'to' to 'start_time' and 'end_time' 2013-05-24 10:14:18 +03:00
Lyla Fischer
d68162f9fa removed from and to labels 2013-05-24 10:14:18 +03:00
Lyla Fischer
c238f76fe8 different default section 2013-05-24 10:14:18 +03:00
Lyla Fischer
53f80d3991 standard video introduction 2013-05-24 10:14:18 +03:00
Valera Rozuvan
6794b73d99 Added videoalpha version 1 to the advanced components in studio. 2013-05-24 10:14:18 +03:00
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
Vik Paruchuri
39663ce947 Add in newlines at end of files 2013-05-22 17:01:49 -04: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
e5dd1a935c Update rubric template 2013-05-22 12:49: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
Vik Paruchuri
1f34561cff Update examples, fix parsing error, avoid collision with capa template 2013-05-21 00:22:33 -04:00
Vik Paruchuri
4dab8f07b0 fix mocking issue 2013-05-20 17:29:11 -04:00
Vik Paruchuri
d0e8965a3c Fix pep8/pylint issues 2013-05-20 16:42:27 -04:00
Vik Paruchuri
3b3cf19c47 Fix tests and add in jasmine test 2013-05-20 15:52:19 -04:00
Vik Paruchuri
23269359c1 Jasmine tests, fix some review issues 2013-05-20 15:31:56 -04:00
Vik Paruchuri
16e1ecf686 fix some pylint violations 2013-05-20 12:46:12 -04:00
Vik Paruchuri
55fda26fd8 Fix tests, fix xqueue error, minor polish 2013-05-20 11:29:19 -04:00
Vik Paruchuri
6bdbbb62d5 Polish up editor, fix issues 2013-05-20 11:09:35 -04:00
Vik Paruchuri
d4b54ceca7 Update open ended editor to parse tasks properly 2013-05-20 10:49:04 -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
Vik Paruchuri
986999c62e Fix cheatsheet, start working on xml replacement 2013-05-20 09:50:15 -04:00
Vik Paruchuri
3a15f93564 Render proper templates when user clicks on editor buttons 2013-05-20 09:20:46 -04:00
Vik Paruchuri
9a7006473e Do basic work on a simple editor for combinedopenended 2013-05-20 09:07:03 -04:00
Vik Paruchuri
4c80325db3 Start working on COE editor, fix name checking in module_render 2013-05-20 08:11:54 -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