Commit Graph

19856 Commits

Author SHA1 Message Date
polesye
2ea166313b Fix comment. 2013-12-11 16:52:46 +02:00
polesye
e5f583294a Address comments. 2013-12-11 13:28:34 +02:00
polesye
39e97225ff Fix tests. 2013-12-11 13:28:33 +02:00
polesye
2e87b1a66f BLD-543: Fix bug with reordering in Studio. 2013-12-11 13:28:33 +02:00
David Ormsbee
d5bff2e28c Merge pull request #814 from edx/bugfix/ichuang/make-edit-link-use-static-asset-path
fix: make edit link use static_asset_path in xmodule_modifiers.py
2013-12-10 13:58:13 -08:00
Julia Hansbrough
421f02518b Merge pull request #1744 from edx/flowerhack/feature/verified-cert-events
Events for entering verified flow & buying
2013-12-10 11:47:47 -08:00
David Baumgold
2bc4198760 Merge pull request #1853 from edx/db/update-comments
Updating comments and docs for MITx -> edX transition
2013-12-10 11:10:37 -08:00
Calen Pennington
80fd12b9aa Merge pull request #1692 from cpennington/pure-xblock-handler-urls
Update handler_url support to match the latest in the xblock repo, for both js and python runtimes
2013-12-10 10:54:55 -08:00
Julia Hansbrough
2f9380c296 response to cr 2013-12-10 18:51:45 +00:00
Julia Hansbrough
5b5fa7c202 response to cr 2013-12-10 18:45:34 +00:00
David Baumgold
fb13bed947 Updating comments and docs for MITx -> edX transition 2013-12-10 13:21:18 -05:00
Will Daly
bc7b0ef7e8 Merge pull request #1909 from edx/will/disable-more-js-tests
Disable failing JS tests
2013-12-10 10:07:26 -08:00
Will Daly
4d6c8ccae9 Disable failing JS tests 2013-12-10 13:04:52 -05:00
Calen Pennington
9e7ccd8edc Run tests in lms/lib 2013-12-10 12:04:47 -05:00
Calen Pennington
d937da8d47 Update handler_url support to match the latest in the xblock repo, for both js and python runtimes
[LMS-1613]
2013-12-10 12:04:18 -05:00
Calen Pennington
541ee6e707 Merge pull request #1857 from cpennington/studio-better-xblock-logging
Add debug logging of exceptions that happen during rending of studio_view or student_view in Studio
2013-12-10 09:00:50 -08:00
Mark Hoeber
153b7560d6 Merge pull request #1908 from edx/sylvia/documentation/ora-237
ORA-237: Number in "Available for Grading" column drops rapidly
2013-12-10 08:51:31 -08:00
spearce
b99f991f81 ORA-237: Number in "Available for Grading" column drops rapidly
Added the following under "Grade an Open Response Assessment Problem":

After you've graded enough responses for AI assessments to start, the
number of responses in the Available to grade column decreases rapidly
as the algorithm grades responses and returns them to your students in
just a few seconds. No student data is lost.

Also corrected a few minor formatting problems.
2013-12-10 11:45:52 -05:00
Greg Price
c84164510e Merge pull request #1882 from edx/gprice/remove-moderator-toggle
Remove forum user profile moderator toggle button
2013-12-10 07:40:39 -08:00
Greg Price
8f9f3bb914 Merge pull request #1883 from edx/gprice/markdown-button-keypress
Activate Markdown editor buttons on keypress
2013-12-10 07:38:15 -08:00
Mark Hoeber
41602e65e8 Merge pull request #1898 from edx/sylvia/documentation/bld-552
Created "MathJax in Studio" page
2013-12-10 07:31:06 -08:00
Will Daly
9b4b3dfa12 Merge pull request #1903 from edx/will/fix-underscore-staff-grading
Add underscore to staff grading template
2013-12-10 06:29:46 -08:00
Will Daly
8374989c11 Add underscore to staff grading template 2013-12-09 23:55:29 +00:00
Sarina Canelake
461b4739cb Merge pull request #1776 from edx/sarina/inst-dash-acceptance
Instructor dashboard acceptance tests
2013-12-09 15:53:33 -08:00
Sarina Canelake
874d7a02d6 Fix LTI acceptance tests 2013-12-09 18:28:41 -05:00
Sarina Canelake
b406ba0f83 Acceptance tests for grades download
Refactor instructor dash acceptance tests.
Add additional acceptance tests for buttons on 'Data Download' tab.

LMS-58
2013-12-09 18:28:41 -05:00
Sarina Canelake
c547ac7286 Fix bulk email acceptance test 2013-12-09 18:28:41 -05:00
Calen Pennington
137c54b2c7 Add debug logging of exceptions that happen during rending of studio_view or student_view in Studio 2013-12-09 16:27:49 -05:00
Diana Huang
1ee6d151e2 Merge pull request #1894 from edx/diana/remove-extraneous-text
Remove extraneous refund text
2013-12-09 13:24:09 -08:00
David Baumgold
e032b4ba54 Merge pull request #1897 from edx/db/remove-old-readmes
Remove old READMEs
2013-12-09 12:58:55 -08:00
David Baumgold
b60d060358 Remove old READMEs
These files seem to have been copied over from old XML courses,
and shouldn't be in our repository.
2013-12-09 15:57:22 -05:00
spearce
5e718f939a Created "MathJax in Studio" page
Created "A Brief Introduction to MathJax in Studio" page (as appendix
G) and included a link in "Math Expression Input" topic.
2013-12-09 15:45:52 -05:00
Anton Stupak
0d3d7588bf Merge pull request #1855 from edx/anton/add-dnd-template
Add additional example of DnD.
2013-12-09 12:34:28 -08:00
David Baumgold
724cc02556 Merge pull request #1847 from edx/db/update-npm-package
update npm package name to edx
2013-12-09 12:18:45 -08:00
polesye
7196cf21ee BLD-479: Add additional example of DnD. 2013-12-09 22:04:45 +02:00
David Baumgold
b784979976 Merge pull request #1792 from edx/man2life-i18n-no-forums
i18n (no forums)
2013-12-09 11:28:18 -08:00
Mark Hoeber
63a4811464 Merge pull request #1895 from edx/release-notes/12-9-13
Release notes/12 9 13
2013-12-09 10:41:36 -08:00
Diana Huang
12a771e2f3 Remove extraneous refund text
Bug: LMS-1603
2013-12-09 11:29:10 -05:00
Mark Hoeber
c328daeba5 Edit changes
Edited 12-9-13 file
2013-12-09 10:52:16 -05:00
Mark Hoeber
3f6997e616 Merge pull request #1892 from edx/sylvia/documentation/test
ORA documentation updates
2013-12-09 07:39:31 -08:00
Greg Price
cec58f885b Remove forum user profile moderator toggle button
This button has been broken for at least a year, so the code has
suffered from bit rot and should be reimplmemented if the feature is
necessary in the short term (which is unlikely since it has been broken
for so long).
2013-12-09 10:23:21 -05:00
Valera Rozuvan
3730eb3ba2 Merge pull request #1856 from edx/valera/fix_e_reader_error_new_page
Fix for BLD-465: e-reader error when popping out window.
2013-12-09 03:03:03 -08:00
Valera Rozuvan
9072b9cc5d e-reader error when popping out window
Moving work on BLD-465 from PR 1811.
Fixing missing import clause in Python.
Addressing DB's comment.

BLD-465.
2013-12-09 10:38:57 +02:00
Mark Hoeber
bb1945b84c Release notes for 12-9-2013
Release notes for 12-9-2013
2013-12-08 11:06:48 -05:00
Julia Hansbrough
3b9cd02bea response to cr 2013-12-06 22:57:06 +00:00
Mark Hoeber
62035c03c7 rn for 12/9/13
new file
2013-12-06 16:28:53 -05:00
Don Mitchell
0684f6a40a Merge pull request #1878 from edx/dhm/pymongo_client
Upgrade pymongo usage from deprecated connection to client
2013-12-06 13:14:28 -08:00
Will Daly
f7ffc1d25b Merge pull request #1884 from edx/will/disable-js-course-overview-test
Disabled AJAX Errors Course Overview JS test
2013-12-06 12:49:40 -08:00
Don Mitchell
298e7a2343 Shorten collection name to keep index name w/in limit 2013-12-06 15:37:38 -05:00
Greg Price
b5eeef01a0 Activate Markdown editor buttons on keypress
The buttons now activate on pressing space or enter.

JIRA: FOR-66
2013-12-06 14:51:43 -05:00