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

16546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sef Kloninger
0246339819 fix crash in peer eval xmodule 
As documented in Jira LMS-806:

Steps to reproduce:
* as one user, for a peer evaluated problem, enter something that needs
  peer grading
* as another user, log in and fire up the peer grading panel. You should
  see something that needs attention, a yellow exclamation badge
* clicking on the "do grading" panel will fail with a 500, stacktrace
  attached.
* it's possible that the question where this is being done must first have
  professor calibration done in order for peers to be able to actually get
  work to grade.

Don Mitchell debugged this with me and saw some problems in the ways
that the peer_evaluation xmodule code was accessing dates. Instead of
using the normal lms accessors, by going straight into the _module_data
it would be bypassing some important code (caching?). Fixing this to be
more standard did the trick.
 2013-07-31 13:31:25 -07:00
Don Mitchell
b80aad2308 Merge pull request #528 from edx/dhm/rename_revision 
Rename CourseLocator.revision to branch
 2013-07-31 13:18:17 -07:00
David Baumgold
59c367b883 Merge pull request #542 from edx/db/fix-pylint 
Fix some pylint issues
 2013-07-31 13:12:54 -07:00
David Baumgold
248793c127 Fix some pylint issues 2013-07-31 15:42:11 -04:00
David Ormsbee
e68ddcd057 Merge branch 'release' 2013-07-31 15:33:30 -04:00
Frances Botsford
b6777118c6 removing animate class from course creation for now 2013-07-31 15:25:38 -04:00
Calen Pennington
094bf7e55d Merge pull request #536 from edx/cale/make-render_template-mocking-clearer 
Make render_template mocking clearer
 2013-07-31 11:37:55 -07:00
Brian Wilson
635d36fcf9 Add audit log definition, and use for logging of logins in external_auth and student apps. Move test_login to student app. Improve conditional tests for Shibboleth login logic. (Does not include reconfiguring log settings.) 2013-07-31 13:32:21 -04:00
frances botsford
2ac27550a5 Merge pull request #537 from edx/fix/frances/studio-ie-menu-bug 
fix for ie bug where drop down menus were still clickable when collapsed
 2013-07-31 10:19:56 -07:00
Calen Pennington
b64aa813c8 Make render_template mocking clearer 2013-07-31 12:19:33 -04:00
Frances Botsford
9ab21be98c fix for ie bug where drop down menus were still clickable when collapsed 2013-07-31 12:17:21 -04:00
Calen Pennington
e43dbd29c4 Merge pull request #487 from edx/cale/lms-xblock-student-view 
Cale/lms xblock student view
 2013-07-31 09:04:38 -07:00
Will Daly
b27857ca17 Merge pull request #534 from edx/will/fix-signup-test 
Fix broken Studio signup.feature acceptance test
 2013-07-31 08:32:01 -07:00
Brian Talbot
b85f92de8d Studio: wraps new course creation form in authorship rights logic 2013-07-31 11:29:00 -04:00
Don Mitchell
68e1bcf42e Remove edu from doc string examples & typos 2013-07-31 11:24:51 -04:00
Peter Fogg
25955a79c4 Merge pull request #492 from edx/peter-fogg/fix-stud-146 
Fix word cloud modules not exporting correctly.
 2013-07-31 08:19:32 -07:00
Jonah Stanley
8d11c246e1 Merge pull request #516 from edx/jonahstanley/upgrade-chrome-version 
Jonahstanley/upgrade chrome version
 2013-07-31 08:17:46 -07:00
Ned Batchelder
15859dd880 Merge pull request #522 from edx/ned/quiet-mongoimport-noise-during-tests 
Quiet mongoimport noise during tests
 2013-07-31 07:25:57 -07:00
Ned Batchelder
4cb8f58b27 Quiet mongoimport noise during tests 2013-07-31 10:25:09 -04:00
jkarni
bba0611584 Merge pull request #532 from edx/jkarni/fix/superfluous-fn 
Remove get_preview_module.
 2013-07-31 07:21:29 -07:00
Vasyl Nakvasiuk
1233d73e01 Merge pull request #497 from edx/alex/graphical_slider_tool_for_studio 
"Graphical Slider Tool" integration into studio
 2013-07-31 06:36:49 -07:00
Don Mitchell
f2977704fe Remove unused tests 
which a previous refactoring had replaced. Coverage of locator.py is
100%
 2013-07-31 09:35:21 -04:00
Calen Pennington
99f9894f1c Switch LMS over to using XBlock rendering commands 
This makes the LMS use an XBlock's student_view, rather than an
XModule's get_html to render for display. However, it does not yet use
wrap_child to handle instructor debug information or url rewriting.

[LMS-219]
 2013-07-31 09:22:10 -04:00
Will Daly
a48c7cfc26 Replaced direct call to browser.is_text_present() with 
`world.css_find()` to protect against StaleElementException
in Jenkins.
 2013-07-31 08:38:46 -04:00
Vasyl Nakvasiuk
61327bc599 fix python code styles 2013-07-31 10:43:06 +03:00
Brian Talbot
50b930a772 Studio: syncs up visual and semantic standards b/t create course and user forms 2013-07-30 18:42:03 -04:00
Brian Talbot
16187462b3 Studio: syncs up visual and semantic standards b/t create course and user forms 2013-07-30 18:21:07 -04:00
Jim Abramson
c7ff657b4d Merge pull request #531 from edx/hotfix/jsa/user_api_basic_auth 
make user api work with basic auth
 2013-07-30 14:52:27 -07:00
Julian Arni
5451bb642c Code cleanup. 
From PR review.
 2013-07-30 17:43:43 -04:00
Julian Arni
9725cff71e Remove get_preview_module. 
And replace calls with calls to load_preview_module.
 2013-07-30 17:31:48 -04:00
Chris Dodge
beda411e28 improve error message regarding uniqueness 2013-07-30 17:29:02 -04:00
Brian Talbot
ec9ea28e92 Studio: abstracting out shared creation form action properties 2013-07-30 17:29:02 -04:00
Chris Dodge
d005323ace update error message to be more specific to what the user needs to fix 2013-07-30 17:25:47 -04:00
Chris Dodge
d321406cc3 fix indent 2013-07-30 17:25:47 -04:00
Chris Dodge
f50d304166 missed a local variable 2013-07-30 17:25:47 -04:00
Frances Botsford
2ce2f08664 fix for extra long error on course creation 2013-07-30 17:25:47 -04:00
Chris Dodge
279896e484 put new unique functions inside the primary function 2013-07-30 17:25:47 -04:00
Chris Dodge
6399eda118 be sure to mark javascript local variables with var 2013-07-30 17:25:47 -04:00
Frances Botsford
9d788275ba I18N and tip text adjustment on studio course creation 2013-07-30 17:25:46 -04:00
Frances Botsford
d9ac60b008 updated changelog with Studio course creation improvements 2013-07-30 17:25:46 -04:00
Frances Botsford
e6cf16011d sass fix for course creation 2013-07-30 17:24:44 -04:00
Chris Dodge
4b3f62eff0 add some client side validation to make sure org/course/run is URL sage 2013-07-30 17:24:44 -04:00
Chris Dodge
f29819ca4a add some field specific error messages regarding uniqueness 2013-07-30 17:24:44 -04:00
Frances Botsford
2c61ad45bd adjusted error message style on course creation 2013-07-30 17:24:44 -04:00
Chris Dodge
1cd70ee386 fix some error messages and also make localizable strings 2013-07-30 17:24:43 -04:00
Chris Dodge
39b024b10c fix broken unit tests 2013-07-30 17:24:43 -04:00
Chris Dodge
60f03f5dcc fixing tests 2013-07-30 17:24:43 -04:00
Chris Dodge
184184066c wip: implement error feedback 2013-07-30 17:24:43 -04:00
Chris Dodge
c750ebe8e3 change help text on course create - Course names can be changed, but not the org, course, or run 2013-07-30 17:24:43 -04:00
Frances Botsford
7bb47f39a1 removed hardcoded error text from course creation form 2013-07-30 17:24:43 -04:00