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

15584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
433e5e9087 Merge pull request #349 from hikari-boulders/patch-1 
update create-dev-env.sh, change one small character
 2013-07-08 14:14:15 -07:00
cahrens
23ffa2a616 Show note field, update filterable. 2013-07-08 16:55:32 -04:00
cahrens
73f4b1c676 Overloading methods does not work with variable names changed. 2013-07-08 16:43:30 -04:00
cahrens
69a998780a Remove test case moved to test_admin. 2013-07-08 16:10:43 -04:00
cahrens
28115af488 The course creator view adds granted users course creator status. 
Includes unit tests and modifications to authz.py.
 2013-07-08 16:08:06 -04:00
cahrens
5e8e3353ca Pylint/pep8 cleanup. 2013-07-08 16:07:02 -04:00
jkarni
ab4dfc248f Merge pull request #217 from edx/feature/jkarni/jsinput 
Feature/jkarni/jsinput
 2013-07-08 12:51:04 -07:00
Julian Arni
fd6abc88e2 Incorporate review comments 2013-07-08 14:32:02 -04:00
cahrens
2cceda948c Disable test point when run under CMS. 
The template exists when django admin is enabled, but the mappings in CMS' urls.py do not exist.
 2013-07-08 13:12:44 -04:00
Will Daly
e477cceefb Merge pull request #346 from edx/will/disable-flakey-tests 
Disabled tests that are failing in Jenkins
 2013-07-08 09:55:09 -07:00
cahrens
b53899aa54 Merge branch 'master' into christina/course-creator-table 2013-07-08 12:12:04 -04:00
cahrens
293ee0b0ae Update comment. 2013-07-08 12:09:53 -04:00
hikari-boulders
61806b2308 update create-dev-env.sh, change one small character 
in line 470, changed "curl -O" to "curl -OL" such that the scripts runs without problems.
 2013-07-08 17:55:15 +02:00
ichuang
f136edb469 tracking in idashboard should only log json-serializable objects 2013-07-08 11:52:39 -04:00
Sarina Canelake
bc0e590842 Merge pull request #343 from edx/sarina/pylint-R0921 
Ignore Pylint R0921
 2013-07-08 07:53:44 -07:00
Will Daly
7085b95bc0 Disabled video test that was failing on Mac OS X 2013-07-08 10:51:31 -04:00
chrisndodge
57d82dea10 Merge pull request #330 from edx/fix/cdodge/delete-course-delete-drafts 
[STUD-380] Fix/cdodge/delete course delete drafts
 2013-07-08 07:24:24 -07:00
Will Daly
01eb93eb47 Disabled tests that are failing in Jenkins 2013-07-08 10:02:01 -04:00
Carlos Andrés Rocha
1fbab8e9fa Merge pull request #295 from edx/rocha/celery-virtual-host 
Add setting to set the virtual host of a Celery broker
 2013-07-08 06:58:31 -07:00
Carlos Andrés Rocha
dd8f1f5385 Rename get to data in crowdsourced hinter module 2013-07-08 09:55:06 -04:00
Felix Sun
bc1dea3de1 Fixed bug: When student submits empty string, hinter returns a 500 error. 
Added tests to catch said bug.

Fixed some pylint violations.
 2013-07-08 09:55:06 -04:00
Felix Sun
b68c117854 Fixed bug: When student submits empty string, hinter returns a 500 error. 
Added tests to catch said bug.

Fixed some pylint violations.
 2013-07-08 09:05:29 -04:00
ichuang
ec20f568ea remove extra bracket which had crept into instructor dashboard 2013-07-08 08:17:38 -04:00
Sarina Canelake
ff4888cbc5 Ignore Pylint R0921 2013-07-08 08:03:13 -04:00
Carlos Andrés Rocha
06529054de Merge hotfix 2013-07093 into master 
Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
	common/lib/xmodule/xmodule/css/crowdsource_hinter/display.scss
	common/lib/xmodule/xmodule/js/src/crowdsource_hinter/display.coffee
	common/static/coffee/src/logger.coffee
	common/templates/hinter_display.html
	lms/envs/test.py
	lms/urls.py
 2013-07-03 18:55:21 -04:00
Jason Bau
7bc52394ad Parameterize aws s3 bucket name for forum uploads 
especially since s3 namespace is _global_
 2013-07-03 15:26:32 -07:00
Ned Batchelder
759b486586 Provide a null log function for OpenID to keep it from spewing during tests. 2013-07-03 17:58:42 -04:00
Ned Batchelder
4d8eb53362 Merge pull request #335 from edx/ned/fix-course-factory 
Fix broken tests by simplifying the CourseFactory
 2013-07-03 14:32:29 -07:00
cahrens
f1f6acb5c7 Updates to admin table view. 
Also hooks up the granted and deny events to the course creator group.
 2013-07-03 17:07:06 -04:00
Ned Batchelder
31a72093e0 Fix broken tests by simplifying the CourseFactory 
The data argument was being treated specially, but that was just
because we didn't have **kwargs support.  Now we do.  There are
two uses of data=, one we convert to kwargs, the other was actually
unused, so remove it completely.
 2013-07-03 17:04:18 -04:00
Chris Dodge
3acff0a77a remove unnecessary type check on the module store. XML module stores will throw an exception when deleting an item... 2013-07-03 16:27:30 -04:00
Chris Dodge
e92799bb2e switch from prints to logging.debug. Also refactor some duplicate code 2013-07-03 16:12:23 -04:00
Ned Batchelder
14ed02c164 Merge pull request #327 from edx/ned/pylint-tweaks 
Pylintrc changes to improve things, including removing the reports.
 2013-07-03 12:29:21 -07:00
Ned Batchelder
a453de2fca Merge pull request #323 from edx/ned/fix-lms-530 
Fix LMS-530: Reflected XSS in chapter and page numbers
 2013-07-03 12:28:19 -07:00
Calen Pennington
d75a901aaa Use super for calling parent __init__ methods 2013-07-03 15:18:09 -04:00
Calen Pennington
573abb8091 Merge pull request #321 from edx/cale/pylint-errors 
Pylint errors
 2013-07-03 12:16:29 -07:00
Jonah Stanley
0be0df1b59 Merge pull request #325 from edx/jonahstanley/fix-flakey-tests 
Made a css_html to obtain the html of the css element.
 2013-07-03 11:55:25 -07:00
David Baumgold
5de4b4ef14 Refactor rake tasks for pylint/pep8 
Split components with : instead of _
 2013-07-03 14:50:59 -04:00
Ned Batchelder
1d5dfaa131 Add tests for image books, and more tests for the other kinds too. 2013-07-03 14:42:41 -04:00
chrisndodge
8dd32b2a12 Merge pull request #312 from edx/fix/cdodge/add-sandbox-whitelisting-to-cms 
add a 'can_execute_unsafe_code' callback method (ala LMS) to allow for w...
 2013-07-03 11:21:28 -07:00
Chris Dodge
a224c1e8a3 need to change aws.py to take the COURSES_WITH_UNSAFE_CODE from the envs.json file 2013-07-03 14:01:33 -04:00
Chris Dodge
656f2b15fd remove redundent test until we get clarity as to if unit tests are actually using the codejail functionality or not 2013-07-03 13:46:32 -04:00
Chris Dodge
ccfc4fc012 remove extra line space at end of file 2013-07-03 13:46:32 -04:00
Chris Dodge
5088450ed3 add another unit test to explicitly exercise the can_execute_unsafe_code() method 2013-07-03 13:46:32 -04:00
Chris Dodge
b32c4aaa56 actually, seems like we should be using double quotes for docstrings 2013-07-03 13:46:32 -04:00
Chris Dodge
aa7f1f867d actually, I think we use single quotes for docstrings 2013-07-03 13:46:32 -04:00
Chris Dodge
bcbac3aaa4 add docstring to newly refactored method 2013-07-03 13:46:32 -04:00
Chris Dodge
7962ad7dd0 remove incorrect comment 2013-07-03 13:46:31 -04:00
Chris Dodge
bf3a7287f0 do some lamda magic to refactor out the whitelist checking code to be shared between LMS and CMS 2013-07-03 13:46:31 -04:00
Chris Dodge
11ef3961bc try to add some additional diff coverage which should get us to 100% 2013-07-03 13:46:31 -04:00