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

15073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Calen Pennington
babbc37a0a Merge pull request #287 from edx/cale/teach-rake-test_$lib-to-understand-specific-test-names 
Teach rake test_$lib to understand specific test names
 2013-07-01 13:05:38 -07:00
Calen Pennington
1a7b833146 Merge pull request #269 from edx/dhm/incidental-functionality-improvements 
Incidental functionality improvements from Next Gen Modulestore work
 2013-07-01 13:04:20 -07:00
David Baumgold
60e9a77af5 Merge pull request #233 from edx/db/ajax-server-error 
Make server errors return JSON if requested via AJAX
 2013-07-01 12:48:25 -07:00
David Baumgold
7824b8c8f2 Fix coffeescript issue on Linux 
On Linux, coffeescript refuses to compile unless the `catch` keyword has an error
variable to bind to. On Mac, it works just fine either way. Go figure.
 2013-07-01 15:09:41 -04:00
David Baumgold
1fee805c9a Adjust indentation to make coffeescript happy 2013-07-01 15:09:41 -04:00
David Baumgold
8bfcbb6675 Make notifyOnError handler try to parse response as JSON 2013-07-01 15:09:41 -04:00
David Baumgold
923bcc555c Make CMS errors JSON-able if requested via AJAX 2013-07-01 15:09:41 -04:00
David Baumgold
ce6b319288 Added jsonable_server_error in common/util/views.py 2013-07-01 15:09:41 -04:00
jnater
f9369b4f7b Merge pull request #307 from edx/jnater/modulestore_config 
Moved xml_store_config, mongo_store_config, and draft_mongo_store_config...
 2013-07-01 11:56:09 -07:00
Jean Manuel Nater
72b4561e3a Moved xml_store_config, mongo_store_config, and draft_mongo_store_config to xmodule/modulestore/tests/django_util.py 
Removed some repeated instances of xml_store_config.
Reverted some changes to mongo_store_config so each modulestore gets it's own uuid.
 2013-07-01 14:45:53 -04:00
Felix Sun
b015a22627 Merge pull request #303 from edx/felix/hinter2 
Felix/hinter2
 2013-07-01 11:39:30 -07:00
Carlos Andrés Rocha
eedeaf286b Revert "Fixed abtests to use the preferences scope correctly." 
This reverts commit 74d20c2028.
 2013-07-01 13:23:24 -04:00
Felix Sun
74d20c2028 Fixed abtests to use the preferences scope correctly. 
Made abtests display its children in the right order.
 2013-07-01 13:16:55 -04:00
Don Mitchell
ef9c299413 Work around XBlock limitations to force persistance of field mutation 2013-07-01 12:33:08 -04:00
Don Mitchell
2fc7d3308c Customtags can't be inserted by studio 2013-07-01 12:33:08 -04:00
Don Mitchell
a2524c517f Force locations to be Location objects earlier 2013-07-01 12:33:08 -04:00
Don Mitchell
ddfbe59814 Make DraftModuleStore mongo only 
DraftModuleStore was originally designed as a mixin, but never used that
way, and with the upcoming changes to use the versioned module store,
never will be. This changes removes a circular dependency between
mongo.py and draft.py.
 2013-07-01 12:33:08 -04:00
Don Mitchell
7892fd7421 Remove extraneous test for already handled edge case 2013-07-01 12:31:36 -04:00
Don Mitchell
db59acaa60 Assert date equality directly, rather than by using a delta of 0 2013-07-01 12:31:36 -04:00
Don Mitchell
274f1d17f3 Test start_date in course settings 2013-07-01 12:31:36 -04:00
Don Mitchell
3188bb0645 WIP: Use approximate comparison when checking for changes to start dates 2013-07-01 12:31:35 -04:00
Felix Sun
0c4d6ba6d9 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 11:52:52 -04:00
Carlos Andrés Rocha
0b25e76194 Improve styling of the crowdsource hinter 2013-07-01 10:34:20 -04:00
Peter Fogg
388644bc90 Merge pull request #302 from edx/peter-fogg/fix-upload-confirmation 
Show a confirmation on asset delete. Fixes STUD-375.
 2013-07-01 07:32:59 -07:00
Felix Sun
aae5758a99 Edited text of crowdsourced hinter template to Piotr's suggestions. Added some HTML formatting to same. 2013-07-01 10:25:05 -04:00
Felix Sun
970a7f0916 Fixed some docstring formatting things. 
Expanded test coverage a little.
 2013-07-01 10:25:04 -04:00
Felix Sun
b6760cebca 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 10:25:04 -04:00
Felix Sun
6890563d43 Fixed broken tests. Made the hint manager enabled in testing environments - this lets us test the hint manager. 2013-07-01 10:25:04 -04:00
Felix Sun
f219228e4a Made the hint management instructor view off by default. 2013-07-01 10:25:04 -04:00
Felix Sun
ab303e7567 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 10:25:04 -04:00
Felix Sun
242d0c28ae Properly fomatted the tab-based UX for hint-voting. 
Chiseled a little at writing template tests.
 2013-07-01 10:25:04 -04:00
Felix Sun
c79ca38f6e Moved the hinter rendering onto a mako template. 
Hinter now displays vote count after voting.

Began testing templates.
 2013-07-01 10:25:04 -04:00
Felix Sun
bb922ed8d8 Moved the crowdsourced hinter module into mako template form. 
Fixed some bugs in the tests for crowdsourced hinter.
 2013-07-01 10:25:04 -04:00
Felix Sun
ad40905a38 Made correct/incorrect determination in coffeescript a little more sensitive. Still very hacky. 2013-07-01 10:25:04 -04:00
Felix Sun
475ac62c79 Fixed epic git rebase meltdown. No new features. 2013-07-01 10:25:04 -04:00
Felix Sun
6ccfa2e38d 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 10:25:03 -04:00
Felix Sun
b64fe5c537 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 10:25:03 -04:00
Felix Sun
100f6bf11e 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 10:25:03 -04:00
Felix Sun
6f6a451784 Working prototype of crowdsourced hinting module. 
Conflicts:
	common/static/coffee/src/logger.coffee
 2013-07-01 10:25:03 -04:00
Peter Fogg
1809fde60c Pylint cleanup. 2013-07-01 09:16:25 -04:00
Sarina Canelake
712f17a47e Merge pull request #257 from edx/sarina/fix-unknown-user-profile 
When user profile isn't found, throw a 404 rather than 500
 2013-06-28 15:24:25 -07:00
Sarina Canelake
e5f97b372b pep8 fixes 2013-06-28 18:00:41 -04:00
Jay Zoldak
b1424a75b8 Add a test for 404 raised when requesting the profile page of a user that does not exist 2013-06-28 16:51:24 -04:00
Sarina Canelake
09501a62e2 Handle exception with a 404 2013-06-28 16:14:56 -04:00
Diana Huang
d5c5fb344e Merge pull request #290 from edx/diana/open-id-namespace 
Handle issues decoding openid requests more gracefully
 2013-06-28 13:00:19 -07:00
Diana Huang
f33bfd1c6c Address code review feedback 2013-06-28 15:03:44 -04:00
Peter Fogg
b3cd6af9aa Change deleted Alert to a Notification, with a timeout. 2013-06-28 14:46:58 -04:00
Don Mitchell
1c5706fb1f Add JSON encoder for datetimes to xml export 
During policy export, we want to write any python datetime objects found
as iso timestamps, rather than throwing exceptions.
 2013-06-28 14:19:10 -04:00