Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,962 Commits 1 Branch 0 Tags
560cd9b0686007f736e4eebd74a5ae649ba6e3d1
Commit Graph

14962 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
bc2cab2fda Made the hint management instructor view off by default. 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
Peter Fogg
0e4bc920ae Merge pull request #284 from edx/peter-fogg/fix-default-videos 
Peter fogg/fix default videos
 2013-06-27 06:23:54 -07:00
Peter Fogg
ee5389800a Fix Lyla showing up everywhere. 
Previously XML data wasn't parsed in VideoDescriptor.__init__, leading
to the defaults being used for video settings.
 2013-06-26 16:30:13 -04:00
Renzo Lucioni
2cd18dfad3 Merge pull request #263 from edx/renzo/segment-io-whitelist-expansion 
Add handful of events to the Segment.io whitelist
 2013-06-26 10:41:11 -07:00
Frances Botsford
6e606291da Merge remote-tracking branch 'origin/release' into rc/2013-06-26 2013-06-26 12:30:18 -04:00
jkarni
38d7ddf024 Merge pull request #245 from edx/jkarni/feature/createdevfolder 
Greater dir naming flexibility.
 2013-06-26 08:19:11 -07:00
Christina Roberts
c5851d39e9 Merge pull request #266 from edx/christina/course-create-permissions 
New course creator group.
 2013-06-26 08:15:14 -07:00
cahrens
e487521289 Update for change in add_user_to_creator_group API. 2013-06-26 10:52:26 -04:00
cahrens
4a697a8da1 Verify that caller of add or remove from creator group is staff. 2013-06-26 10:52:26 -04:00
cahrens
190c07d954 Add smoke coverage for add and remove of course group permissions. 2013-06-26 10:52:26 -04:00
cahrens
2c60a7dbc1 pep8 cleanup 2013-06-26 10:52:26 -04:00
Ned Batchelder
6e5c861018 Merge pull request #272 from edx/fix/LMS-500 
Fix LMS-500: Random class in random module was None
 2013-06-26 07:49:54 -07:00
cahrens
318372f2c0 Introduce course creator group. 2013-06-26 10:48:31 -04:00
Jason Bau
c41c102b7a Update CHANGELOG.rst 2013-06-25 21:37:20 -06:00
Jason Bau
4a3165414d Merge pull request #84 from edx/feature/jbau/activation-after-password-reset-confirm 
Moves user activation from just clicking on reset password to following the link in the password reset email
 2013-06-25 20:34:19 -07:00
Jason Bau
734440f4b9 Refactored tests 2013-06-25 20:21:20 -07:00
Renzo Lucioni
3f49da385f Swap Logger call from check_fd to check 2013-06-25 17:22:05 -04:00
Jay Zoldak
fe82e865aa Merge pull request #267 from edx/zoldak/fix-acceptance-xcontent 
Specify a different xcontent mongo db for the acceptance tests
 2013-06-25 14:04:30 -07:00
Jay Zoldak
6c66736e3c Specify a different xcontent mongo db for the acceptance tests 2013-06-25 16:56:36 -04:00
Christina Roberts
9dad14c48e Merge pull request #265 from edx/christina/activation-email 
Don't mention edge in the subject line; use same message for edx and edg...
 2013-06-25 13:21:51 -07:00
Carlos Andrés Rocha
94e1746500 Merge pull request #258 from edx/rocha/pre-external-grader-cleanup 
Cleanup before adding external grader
 2013-06-25 13:17:11 -07:00
Renzo Lucioni
881d63dae7 Fixed Jasmine tests in light of Logger changes, and wrote test to cover case where data passed is not a dictionary 2013-06-25 16:04:00 -04:00
Will Daly
68c0f04462 Merge pull request #264 from edx/will/update-diff-cover-v0.1.3 
Updated diff-cover to version 0.1.3 to fix a bug
 2013-06-25 12:45:16 -07:00
cahrens
401dc82c46 Don't mention edge in the subject line; use same message for edx and edge. 2013-06-25 15:35:47 -04:00
Renzo Lucioni
84f4361d52 Avoid changing format of data sent to our logs, and prevent problem_check event from firing twice 2013-06-25 15:33:16 -04:00
Renzo Lucioni
bcbce3eff0 Add handful of events to the Segment.io whitelist 2013-06-25 15:33:16 -04:00
Jonah Stanley
b14553d867 Merge pull request #220 from edx/jonahstanley/make-units-parallel 
Jonahstanley/make units parallel
 2013-06-25 11:44:01 -07:00
Ned Batchelder
ed62c5a6f9 Fix LMS-500: Random class in random module was None 
Deleting the module object isn't needed to replace it, and deleting
a module object causes all of its attributes to be set to None.
 2013-06-25 14:23:16 -04:00
Carlos Andrés Rocha
e4ee1c6c9b Rename arguments of modx_dispatch and handle_ajax related functions 
Refactor a bit modx_dispatch
 2013-06-25 13:38:57 -04:00
Carlos Andrés Rocha
2f02496c8f Reorder imports on module_render 2013-06-25 13:31:53 -04:00
brianhw
397583e1ab Merge pull request #262 from edx/fix/brian/changelog 
Update CHANGELOG for per-student problem rescoring.
 2013-06-25 10:24:42 -07:00
Will Daly
c0805c334d Updated diff-cover to version 0.1.3 to fix a bug 2013-06-25 13:23:13 -04:00
JonahStanley
8a9125f121 Test Mongo database is now unique and destroyed in teardown 2013-06-25 11:33:46 -04:00