Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,143 Commits 1 Branch 0 Tags
08eb8fa7c19eaff4870cd0bea6d06a80915000eb
Commit Graph

23143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
srpearce
ce44ff898d Merge pull request #1920 from edx/markhoeber/documentation/stud-1007 
Adding accessibility guidelines to "Building a Course with edX Studio" documentation
 2013-12-11 10:39:58 -08:00
e0d
7be524d769 Removing duplicated initialization code. 2013-12-11 12:59:07 -05:00
Julia Hansbrough
6b9a3e2976 Merge pull request #1913 from carsongee/cg/ssl_auth_enhancements 
Adds redirects for login pages and the registration page
 2013-12-11 09:07:32 -08:00
Mark Hoeber
48fcaeb1bc Accessibility edits 
Accessibility edits
 2013-12-11 10:38:32 -05:00
Valera Rozuvan
d31268e790 Minor changes by Valera. 2013-12-11 17:27:23 +02:00
Bertrand Marron
f576673a87 Add email configuration to cms/envs/aws.py 
This allows emails to be sent by Studio.
 2013-12-11 16:11:23 +01:00
Bertrand Marron
4e641b946d Add default email settings 
These are the django default settings.
 2013-12-11 16:11:23 +01:00
cahrens
ec55d8c1a9 Create explicit Locations. 
STUD-1030
 2013-12-11 10:03:34 -05:00
Mark Hoeber
f69311f848 Accessibilty updates 
Accessibilty updates
 2013-12-11 10:01:33 -05:00
polesye
2ea166313b Fix comment. 2013-12-11 16:52:46 +02:00
David Baumgold
d1cb40def1 Merge pull request #1915 from edx/anton/fix-author-name 
Fix author name.
 2013-12-11 06:49:41 -08:00
polesye
79519b7a07 Address comments. 2013-12-11 16:25:07 +02:00
polesye
418d6fa9e1 BLD-413: Add rounding of coordinates. 2013-12-11 15:20:05 +02:00
polesye
38276972a5 Fix author name. 2013-12-11 13:59:07 +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
John Jarvis
0d59301081 Merge pull request #1906 from edx/hotfix/2013-12-10 
Hotfix/2013 12 10
 2013-12-10 16:22:05 -08:00
Carson Gee
484602ad61 Adds redirects for login pages and the registration page so that 
they go through the SSL login process in branding when that feature
is enabled.
 2013-12-10 18:06:26 -05:00
spearce
b065f7f8cc Draft of LTI documentation 
First attempt at writing LTI documentation. Several questions for tech
reviewers.
 2013-12-10 17:01:33 -05: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
Mark Hoeber
7c4a26a000 New Accessibility Chapter 
Adding changes for accessibility
 2013-12-10 16:33:13 -05: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
David Baumgold
28f22393bf whitespace-only changes 2013-12-10 11:45:49 -05:00
Waheed Ahmed
aba25c2de7 In OpenEndedModule latest_score and all_score calculate sum of rubric scores every time for ML grading. 
ORA-72
 2013-12-10 11:17:44 -05:00
Don Mitchell
7e4820af52 Reduce sql queries for groupname tests. (STUD-1039) 
Conflicts:
	cms/djangoapps/auth/authz.py
 2013-12-10 11:17:23 -05:00
Mark Hoeber
ad9da035cf Added user_id_map 
Added user_id_map
 2013-12-10 10:51:10 -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
Bertrand Marron
9d31a4ac4b Stop forcing video player’s speeds widget width 
When translating the “Speed” label using a longer word, the speeds
button gets really ugly.  The dropdown and the button will not always
have equal widths, but it’s better than having the text overlap the
other buttons.
 2013-12-10 12:00:48 +01: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