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

6956 Commits

Author SHA1 Message Date
David Baumgold
2a92a14054 Wrote simple lettuce tests for pdf textbooks 2013-07-09 19:16:09 -04:00
David Baumgold
5e0767ccd0 logging is unused 2013-07-09 19:16:09 -04:00
Frances Botsford
2321a2c563 more updates to PDF textbook UI 2013-07-09 19:16:09 -04:00
David Baumgold
ef81556cc5 Use JsonResponse when it makes sense 2013-07-09 19:16:08 -04:00
David Baumgold
090d0d4464 Fix up unit tests 2013-07-09 19:16:08 -04:00
David Baumgold
27e895393c Added generic JsonResponse class 
Based on http://djangosnippets.org/snippets/154/
 2013-07-09 19:16:07 -04:00
David Baumgold
33a78eaeb7 Fix missing } from bad rebase 2013-07-09 19:16:05 -04:00
David Baumgold
6c313339e1 Updated Backbone-Associations to v0.5.0 2013-07-09 19:16:05 -04:00
David Baumgold
5fa05a50b9 Make gettext perform sanely in test 2013-07-09 19:16:03 -04:00
David Baumgold
3f0efe70cf Added jasmine-stealth library, v0.0.12 2013-07-09 19:16:03 -04:00
David Baumgold
00f76f3cda Added Backbone Associations v0.4.2 2013-07-09 19:16:01 -04:00
Frances Botsford
e237cdca84 round 2 on html and sass for textbook upload 2013-07-09 19:15:59 -04:00
Frances Botsford
9d59a1313c initial html and sass for textbook upload 2013-07-09 19:15:59 -04:00
Chris Dodge
6642cdddae support uploading and referencing assets as streams rather than having to read everything into memory first 2013-07-09 19:15:58 -04:00
Chris Dodge
7d7eee7d0d inital work to use streams/chunks when handling uploaded assets 2013-07-09 19:15:58 -04:00
Felix Sun
bc315c1149 Merge pull request #328 from edx/felix/hinter2 
Felix/hinter2
 2013-07-09 15:29:14 -07:00
Christina Roberts
bd96632139 Merge pull request #345 from edx/christina/course-creator-table 
Admin table for course creators.
 2013-07-09 13:18:35 -07:00
Felix Sun
6c55726134 Fixed naming error in crowdsource_hinter. (Introduced in git merge.) 2013-07-09 14:34:21 -04:00
Felix Sun
596e1ead29 Merge branch 'felix/hinter2' of https://github.com/edx/edx-platform into felix/hinter2 
Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
 2013-07-09 13:28:27 -04:00
Felix Sun
3418feba52 Added error logging for unparsable answers. 2013-07-09 13:26:02 -04:00
JonahStanley
28142d51f9 Added comment about how the resetting of the database works 2013-07-09 08:54:20 -04:00
JonahStanley
b0d70008e4 Changed when the databases are reset 
This might allow parallel features in the future
 2013-07-09 08:54:20 -04:00
JonahStanley
789b711023 Acceptance tests now pull from their own unique database 
These databases/collections are cleared after harvest
 2013-07-09 08:54:19 -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
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
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
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
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
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
Ned Batchelder
1d5dfaa131 Add tests for image books, and more tests for the other kinds too. 2013-07-03 14:42:41 -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
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
bcc2268216 add code to actually go through and delete the draft modules 2013-07-03 11:23:44 -04:00
JonahStanley
0689f0b32d Merge branch 'master' into jonahstanley/fix-flakey-tests 2013-07-03 10:37:27 -04:00
JonahStanley
19513e4134 Refactored all clicks to use the css_click method 2013-07-03 10:34:56 -04:00
JonahStanley
9a5326bca5 Made a css_html to obtain the html of the css element. 
This works like css_click in that it will retry if there was a stale element reference exception
 2013-07-02 16:46:20 -04:00
caesar2164
b3723b1a22 Merge pull request #288 from edx/giulio/accessibility-2 
Round 2 Accessibility Changes
 2013-07-02 13:41:50 -07:00