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

4132 Commits

Author SHA1 Message Date
JonahStanley
67326cfae8 Fixed xmodule tests to not rely on full 
Also fixed things in the toy course where needed
 2013-07-11 10:12:09 -04:00
David Baumgold
cb62797306 Merge pull request #347 from edx/update-sass 
Update SASS and Bourbon, add Neat
 2013-07-10 11:09:11 -07:00
Chris Dodge
1b377260cc change log levels on the delete course utility. Otherwise they get filtered out in production environments (min set to WARN level) 2013-07-10 12:34:39 -04:00
Frances Botsford
a0962cc3b9 updated sass transitions to use newer bourbon syntax 2013-07-10 09:18:00 -04:00
Brian Talbot
d046fdf743 resolves local Sass warnings/errors around missing mixins referenced in xmodule styling 2013-07-10 09:17:59 -04:00
Frances Botsford
4187090dac removed non-existent sass extends from LMS: .table-wrapper, .dullify, .trans, .problem-set 2013-07-10 09:17:59 -04:00
David Baumgold
27796219c7 Changed @include background-size() to background-size 
Bourbon's background-size mixin has been deprecated, and they recommend to use the
official spec.
 2013-07-10 09:17:58 -04:00
David Baumgold
5bd79a8669 Changed @include box-shadow() to box-shadow 
Bourbon's box-shadow mixin has been deprecated, and they recommend to use the
official spec.
 2013-07-10 09:17:58 -04:00
David Baumgold
41374838cb Changed @include border-radius() to border-radius 
The official border-radius mixins were deprecated and removed in Bourbon 3.0.
https://github.com/thoughtbot/bourbon/pull/95
 2013-07-10 09:17:58 -04:00
Calen Pennington
dcaed88cb2 Merge pull request #313 from edx/cale/use-super-for-calling-parent-__init__-methods 
Use super for calling parent __init__ methods
 2013-07-10 06:17:41 -07:00
David Baumgold
e1ed5c3d2d docstrings 2013-07-09 19:16:10 -04:00
David Baumgold
090d0d4464 Fix up unit tests 2013-07-09 19:16:08 -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
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
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
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
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
bcc2268216 add code to actually go through and delete the draft modules 2013-07-03 11:23:44 -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
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
09d3ca0ab6 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:40:47 -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
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