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

19636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
d2a2aaa716 LMS: adds in collapse/expand UI for dashboard view upsell 2013-11-25 16:40:32 -05:00
Ned Batchelder
c023797bd0 Merge pull request #1583 from edx/ned/fix/lms-1337 
Make remaining dialogs in wiki accessible.
 2013-11-25 13:33:18 -08:00
Ned Batchelder
cccd61ebf3 Make remaining dialogs in wiki accessible. 
All the dialogs in the wiki are now accessible to screen readers.

Also, the "Switch to selected version" button did the odd thing of
reloading the page with the new version selected, but inside a dialog.
That is now fixed.

The merge dialog has a warning that looks kind of funky still, but you
can read it, unlike the previous code.

LMS-1337
 2013-11-25 16:05:05 -05:00
frances botsford
f3aa720c16 Merge pull request #1769 from edx/frances/fix/studio-edit-headerimage-bug 
Broken image in Studio component help sidebar
 2013-11-25 12:39:58 -08:00
Ned Batchelder
df0e1c49fa Merge pull request #1768 from edx/ned/merge-master-to-rc-2013-11-21 
Merge rc/2013-11-21 to master
 2013-11-25 12:16:30 -08:00
Frances Botsford
d3906f8480 fixed the path to the header example image in the Studio html editor help sidebar 
STUD-981
 2013-11-25 15:11:56 -05:00
Ned Batchelder
368c5758a5 Fix CHANGELOG conflicts again. 2013-11-25 15:01:26 -05:00
Ned Batchelder
9a106a32d5 Merged master to rc/2013-11-21 2013-11-25 14:56:09 -05:00
Will Daly
ceb15209e1 Merge pull request #1767 from edx/will/revert-1711 
Revert PR 1711; disabling JS tests again
 2013-11-25 11:53:23 -08:00
Will Daly
bf94083d2c Revert PR 1711; disabling JS tests again 2013-11-25 14:50:40 -05:00
Julia Hansbrough
31ee6f0983 Merge pull request #1766 from edx/flowerhack/fix/order-and-orderitem-refunds 
Refunding CertificateItem now marks parent Order refunded as well
 2013-11-25 11:45:12 -08:00
Christina Roberts
304ccc918d Merge pull request #1728 from edx/christina/components 
Convert component.py to use RESTful URLs.
 2013-11-25 11:17:07 -08:00
Julia Hansbrough
fe5e2b3527 Refunding CertificateItem now marks parent Order refunded as well 2013-11-25 18:55:58 +00:00
cahrens
b5d72a38d3 Updates from code review. Includes backing out the 
"as_published" changes I previously put in, as now we
are not adding @draft to locations converted from locators.
 2013-11-25 13:55:33 -05:00
cahrens
50128cfb5c Convert edit_subsection, edit_unit, and publishing to RESTful URLs. 
STUD-844
 2013-11-25 13:55:33 -05:00
Valera Rozuvan
037cec6c16 Merge pull request #1711 from edx/valera/enable_all_video_jasmine_tests 
Enable all video Jasmine tests
 2013-11-25 10:46:03 -08:00
Valera Rozuvan
ace8df3916 Turned back on several Video Jasmine tests. 
BLD-463
 2013-11-25 20:22:53 +02:00
Greg Price
3f0f7fa3d4 Merge pull request #1752 from edx/gprice/inline-discussion-error-recovery 
Add error recovery to inline discussion loading
 2013-11-25 10:05:53 -08:00
Diana Huang
7a56e00d53 Merge pull request #1604 from edx/jarv/verified-certs 
Jarv/verified certs
 2013-11-25 07:37:13 -08:00
Will Daly
93823db336 Merge pull request #1756 from edx/will/devstack-view-live 
Added LMS_BASE to devstack settings to enable View Live in Studio
 2013-11-25 07:03:23 -08:00
Brian Talbot
b996cae137 Merge pull request #1759 from edx/talbs/update-gitignore 
Adding Codekit IDE assets/config to .gitignore
 2013-11-23 18:51:19 -08:00
Brian Talbot
6941d1d7b4 adding additional IDE files to global .gitignore 2013-11-23 21:24:39 -05:00
Jason Bau
e9ebdb0403 Merge pull request #1755 from edx/jbau/fix/marketing-test 
fixes a branding test which was passing for a trivial (wrong) reason
 2013-11-23 08:03:08 -08:00
Will Daly
17e54a8a07 Added LMS_BASE to devstack settings to enable View Live in Studio 2013-11-23 10:42:12 -05:00
Jason Bau
e7b386c40a fixes a branding test which was passing for a trivial (wrong) reason 2013-11-22 23:18:11 -08:00
Calen Pennington
329419696e Merge pull request #1746 from cpennington/fix-lms-1532 
Fix LMS-1532 (partially instantiated XModules after an exception)
 2013-11-22 10:01:43 -08:00
Calen Pennington
e968c0c0fa Merge pull request #1743 from cpennington/fix-beta-tester-roles 
Fix for [LMS-1528], plus Changelog entry for the related feature
 2013-11-22 10:01:32 -08:00
Adam Palay
24aa0decb4 fix OrgInstructorRole definition and add tests 2013-11-22 13:00:45 -05:00
Calen Pennington
c0f570ceab Fix [LMS-1528] (500 error when checking for beta access) 2013-11-22 13:00:45 -05:00
Calen Pennington
820e771171 Add failing test for [LMS-1528] 
Also cleans up test_view_authentication to use user factories for
various user classes
 2013-11-22 13:00:45 -05:00
Calen Pennington
0c2c68117d Add release notes for 061a46beef, concerning change to beta-tester groups 2013-11-22 13:00:45 -05:00
polesye
90bbb7b1cd Merge pull request #1706 from edx/anton/code-response-improvements 
Code response improvements.
 2013-11-22 09:46:58 -08:00
David Ormsbee
87f19469b9 Merge pull request #1750 from edx/sarina/dormsbee_grades_download 
Sarina/dormsbee grades download
 2013-11-22 09:28:09 -08:00
Calen Pennington
3c042b52fd Clear out the cache xmodule_instance after an exception in XModule init 
This guarantees that the ErrorModule will be created, instead of
potentially using a partially instatiated broken module. Fixes
[LMS-1532].
 2013-11-22 12:08:29 -05:00
Calen Pennington
8d62fa14d8 Tests for LMS-1532 2013-11-22 12:08:29 -05:00
Adam Palay
cf524906e0 more granular transactions in grading [LMS-1480] 
remove field_data_cache from grades.grade and grades.progress_summary

cleans grading code by adding wrappers
 2013-11-22 12:02:35 -05:00
Ned Batchelder
3efcc3d6ef Merge pull request #1753 from edx/ned/pr-1745-lms-1492 
Ned/pr 1745 lms 1492
 2013-11-22 08:50:08 -08:00
Ned Batchelder
75532987ce Properly convert files from Webob to pure files. 
Webob represents uploaded files as cgi.FieldStorage objects.  The
XModule code expects pure Python file objects.  Each FieldStorage object
is wrapped to present the proper file interface, with file names.

LMS-1492
 2013-11-22 11:47:34 -05:00
Ned Batchelder
1c27ec3d7e Add two tests of problems-with-files 
One test passes already, the other fails.  Fix in next commit.
 2013-11-22 11:47:33 -05:00
Ned Batchelder
6d94b71203 Clean up test files, no substantive changes. 
These changes prepare for the changes to the tests that are coming, but
make no change to the behavior themselves.
 2013-11-22 11:47:33 -05:00
Ned Batchelder
938bd6b4e7 Merge pull request #1745 from edx/ned/lms-1492 
LMS-1492: Convert between webob's cgi.FieldStorage uploaded files to pure file objects.
 2013-11-22 08:42:14 -08:00
Diana Huang
586b1f72ef Fix typo in comment. 2013-11-22 11:27:18 -05:00
Don Mitchell
7ab31f5478 Merge pull request #1710 from edx/dhm/restful_settings 
Restful course settings
 2013-11-22 08:23:12 -08:00
Diana Huang
8d564f219d Use Choices to track possible modes. 2013-11-22 11:22:49 -05:00
Ned Batchelder
de7d2cd08c Properly convert files from Webob to pure files. 
Webob represents uploaded files as cgi.FieldStorage objects.  The
XModule code expects pure Python file objects.  Each FieldStorage object
is wrapped to present the proper file interface, with file names.

LMS-1492
 2013-11-22 11:09:11 -05:00
Ned Batchelder
4ace4f98cc Add two tests of problems-with-files 
One test passes already, the other fails.  Fix in next commit.
 2013-11-22 11:09:11 -05:00
Greg Price
7e074f1a7e Add error recovery to inline discussion loading 
Now the interface will reset apropriately and allow a user to retry
expanding the discussion or loading a new page, and the alert message
will ask the user to retry.

JIRA: FOR-300, FOR-301
 2013-11-22 11:00:10 -05:00
Don Mitchell
17864353a5 Restful course settings 
STUD-946
STUD-947
 2013-11-22 10:55:35 -05:00
David Ormsbee
901ad22652 Make ENABLE_S3_GRADE_DOWNLOADS disabled by default, enabled in dev. 
Having ENABLE_S3_GRADE_DOWNLOADS enabled by default in common.py
could lead to surprising behavior for folks downstream. They'd
suddenly see a grade download screen on their new instructor
dashboard, but the links by default would be local files and
couldn't be used in an actual production environment. So we disable
by default and let people explicitly enable it and set it up for
S3 if they wish.

LMS-58
 2013-11-22 10:06:34 -05:00
David Ormsbee
a99fd08004 Fix error case where we have items in our grading csv output 
that are not present in a given student's gradeset.

General code cleanup and addition of comments.

Instructor dashboard API unit tests.

LMS-58
 2013-11-22 10:06:28 -05:00