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

19863 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
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
Mark Hoeber
f69311f848 Accessibilty updates 
Accessibilty updates
 2013-12-11 10:01:33 -05: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
38276972a5 Fix author name. 2013-12-11 13:59:07 +02: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
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
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
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
Mark Hoeber
bc23a6de30 editing wiki data 
removed boilerplace from beginning of file
 2013-12-09 16:13:32 -05:00
Mark Hoeber
75bf35a333 Adding wiki data file to data formats doc 
Adding wiki data file to data formats doc
 2013-12-09 16:12:36 -05: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