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

5319 Commits

Author SHA1 Message Date
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
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
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
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
Julian Arni
7fbd1a7221 Merge branch 'master' into HEAD 2013-07-02 14:27:05 -04:00
Renzo Lucioni
51f694b18d Remove Segment.io whitelist from Logger 2013-07-02 13:49:33 -04:00
Renzo Lucioni
42efd33cfa Refactor Segment.io integration with sequentials and instructor dashboard pages 2013-07-02 13:49:33 -04:00
Giulio Gratta
7452381f1c making sequence titles available to non-sighted users 2013-07-02 09:26:40 -07:00
Ned Batchelder
cd0aa7f360 Make CourseFactory more useful: accept arbitrary kwargs. 2013-07-02 11:36:46 -04:00
Calen Pennington
87edb5aeac Pylint errors 2013-07-02 10:35:27 -04:00
Adam Palay
c692428fe5 fix pylint violations 2013-07-02 10:22:26 -04:00
Felix Sun
560cd9b068 Fixed bug when user votes w/o permission - now displays a friendly error message instead of failing. 
Fixed bug when hinter module displays a hint, then is asked to display nothing.  (Used to not update in this case.)
 2013-07-02 09:54:56 -04:00
Felix Sun
15317de252 Made explanation for hints field in crowdsource_hinter.py more clear. 
Fixed various commenting things.

Removed an unused function in the crowdsourced module coffeescript.

Improved commenting in hint_manager.

Fixed pep and pylint violations.
 2013-07-01 19:05:31 -04:00
Carlos Andrés Rocha
d6631e5c3d Improve styling of the crowdsource hinter 2013-07-01 19:05:31 -04:00
Adam Palay
bdacc7646c clean up track/models 2013-07-01 18:21:47 -04:00
Adam Palay
03aee3ed79 add tests 2013-07-01 18:21:47 -04:00
Adam Palay
af75e1f785 log student answers using POST instead of GET 2013-07-01 18:21:47 -04:00
Felix Sun
77e4e2a009 Edited text of crowdsourced hinter template to Piotr's suggestions. Added some HTML formatting to same. 2013-07-01 18:03:36 -04:00
Felix Sun
728ccd4bca Fixed some docstring formatting things. 
Expanded test coverage a little.
 2013-07-01 18:03:36 -04:00
Felix Sun
801853f691 Fixed a small, but dangerous, string-to-integer casting bug in hint_manager. 
Expanded tests of hint_manager.

Enabled the hint_manager by default in development environments.
 2013-07-01 18:03:36 -04:00
Felix Sun
4071a57f68 Fixed broken tests. Made the hint manager enabled in testing environments - this lets us test the hint manager. 2013-07-01 18:03:36 -04:00
Felix Sun
696cc3a4db Fixed numerous code-formatting issues and pep8 violations. 
Began enforcing one-vote-per-person.  This can be disabled with debug="True" in the <crowdsource_hinter> tag.

Started tests of the hint manager.
 2013-07-01 18:03:36 -04:00
Felix Sun
2c16801a25 Properly fomatted the tab-based UX for hint-voting. 
Chiseled a little at writing template tests.
 2013-07-01 18:03:36 -04:00
Felix Sun
d57380dd2e Moved the hinter rendering onto a mako template. 
Hinter now displays vote count after voting.

Began testing templates.
 2013-07-01 18:03:36 -04:00
Felix Sun
4a406901b3 Moved the crowdsourced hinter module into mako template form. 
Fixed some bugs in the tests for crowdsourced hinter.
 2013-07-01 18:03:36 -04:00
Felix Sun
376aaa1d8f Made correct/incorrect determination in coffeescript a little more sensitive. Still very hacky. 2013-07-01 18:03:36 -04:00
Felix Sun
93d457de54 Fixed epic git rebase meltdown. No new features. 2013-07-01 18:03:35 -04:00
Felix Sun
2088da4edc Made tests of the crowdsource hinter module more standardized and easier to read. Fixed database non-initialization bug in crowdsource hinter module. 2013-07-01 18:03:35 -04:00
Felix Sun
aba99084f2 Finished prototype of hint moderation view. Began re-writing tests of the crowdsource hinter module. (Old tests no longer cover all the code, now that moderation has been added.) 2013-07-01 18:03:35 -04:00
Felix Sun
0c0de20a2f Began work on instructor view to hinting system. 
Added moderation feature - you can now choose to hold all hints for moderator approval before showing.
 2013-07-01 18:03:35 -04:00
Felix Sun
415ea63bc0 Working prototype of crowdsourced hinting module. 
Conflicts:
	common/static/coffee/src/logger.coffee
 2013-07-01 18:03:35 -04:00
Julian Arni
fd756b9f85 Only refresh when waitfor is an attribute. 
Silly workaround for the fact that tests set the answers, but not the inputs,
  so refreshAnswers changes the test result even though it shouldn't.
 2013-07-01 18:02:42 -04:00