This website requires JavaScript.
7f91ce40ae
Restful api for course advanced settings STUD-948
2013-11-21 10:25:20 -05:00
18f342c076
Merge pull request #1781 from zubair-arbi/zub/bugfix/std979-displaynameclashes
2013-11-26 06:26:57 -08:00
829cd7d861
Fix unique vertical url + add test STUD-979
2013-11-26 14:30:17 +05:00
bbfa7742cc
Studio: correcting hiding state of notification UI for < IE9 STUD-815
2013-11-25 20:57:35 -05:00
2b5b4f4cc6
Merge pull request #1760 from edx/talbs/lms-upsell-ui
2013-11-25 15:49:27 -08:00
6733d04a95
Merge pull request #1317 from edx/ned/upgrade-coverage
2013-11-25 14:23:52 -08:00
3ad705cd16
Removing external_auth addition to cms, and skipping test
2013-11-25 17:08:18 -05:00
63bc8c9645
Merge pull request #1771 from edx/flowerhack/fix/lms-1526
2013-11-25 14:07:20 -08:00
b822df4ee2
Added refund datetime info to Orders, OrderItems
2013-11-25 21:52:12 +00:00
f002ce4908
Changed unit identifier to be readonly, not disabled
2013-11-25 16:53:38 -05:00
d2a2aaa716
LMS: adds in collapse/expand UI for dashboard view upsell
2013-11-23 22:31:11 -05:00
1795e157be
Upgrade coverage to 3.7
2013-10-11 07:26:16 -04:00
c023797bd0
Merge pull request #1583 from edx/ned/fix/lms-1337
2013-11-25 13:33:18 -08:00
e4ebb586e8
Update mode appropriately when user enrolls
2013-11-25 21:08:34 +00:00
cccd61ebf3
Make remaining dialogs in wiki accessible.
2013-11-04 15:12:31 -05:00
f3aa720c16
Merge pull request #1769 from edx/frances/fix/studio-edit-headerimage-bug
2013-11-25 12:39:58 -08:00
bf9ac26a06
Corrected CMS tests so that one is passing, added external_auth to cms apps Several pylint fixes and bad super call
2013-11-25 14:17:42 -05:00
df0e1c49fa
Merge pull request #1768 from edx/ned/merge-master-to-rc-2013-11-21
2013-11-25 12:16:30 -08:00
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
368c5758a5
Fix CHANGELOG conflicts again.
2013-11-25 15:01:26 -05:00
9a106a32d5
Merged master to rc/2013-11-21
2013-11-25 14:56:09 -05:00
ceb15209e1
Merge pull request #1767 from edx/will/revert-1711
2013-11-25 11:53:23 -08:00
bf94083d2c
Revert PR 1711; disabling JS tests again
2013-11-25 14:50:40 -05:00
31ee6f0983
Merge pull request #1766 from edx/flowerhack/fix/order-and-orderitem-refunds
2013-11-25 11:45:12 -08:00
304ccc918d
Merge pull request #1728 from edx/christina/components
2013-11-25 11:17:07 -08:00
fe5e2b3527
Refunding CertificateItem now marks parent Order refunded as well
2013-11-25 18:38:34 +00:00
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:54:45 -05:00
50128cfb5c
Convert edit_subsection, edit_unit, and publishing to RESTful URLs.
2013-11-20 14:17:26 -05:00
037cec6c16
Merge pull request #1711 from edx/valera/enable_all_video_jasmine_tests
2013-11-25 10:46:03 -08:00
ace8df3916
Turned back on several Video Jasmine tests.
2013-11-19 17:37:08 +02:00
96c7cb5ffd
Added tests for signup skipping
2013-11-25 12:58:08 -05:00
3f0f7fa3d4
Merge pull request #1752 from edx/gprice/inline-discussion-error-recovery
2013-11-25 10:05:53 -08:00
0f324baaca
Fixed PEP8 and indentation issues
2013-10-07 11:50:58 -04:00
5d066db1bf
Add feature to do auto signup with external auth This adds a feature flag: AUTH_USE_MIT_CERTIFICATES_IMMEDIATE_SIGNUP that does an automatic signup of users if they are using external authentcation.
2013-09-30 21:31:29 -04:00
7a56e00d53
Merge pull request #1604 from edx/jarv/verified-certs
2013-11-25 07:37:13 -08:00
93823db336
Merge pull request #1756 from edx/will/devstack-view-live
2013-11-25 07:03:23 -08:00
b996cae137
Merge pull request #1759 from edx/talbs/update-gitignore
2013-11-23 18:51:19 -08:00
6941d1d7b4
adding additional IDE files to global .gitignore
2013-11-23 21:24:39 -05:00
e9ebdb0403
Merge pull request #1755 from edx/jbau/fix/marketing-test
2013-11-23 08:03:08 -08:00
17e54a8a07
Added LMS_BASE to devstack settings to enable View Live in Studio
2013-11-23 10:42:12 -05:00
e7b386c40a
fixes a branding test which was passing for a trivial (wrong) reason
2013-11-22 23:03:55 -08:00
329419696e
Merge pull request #1746 from cpennington/fix-lms-1532
2013-11-22 10:01:43 -08:00
e968c0c0fa
Merge pull request #1743 from cpennington/fix-beta-tester-roles
2013-11-22 10:01:32 -08:00
24aa0decb4
fix OrgInstructorRole definition and add tests
2013-11-21 16:43:49 -05:00
c0f570ceab
Fix [LMS-1528] (500 error when checking for beta access)
2013-11-21 11:05:00 -05:00
820e771171
Add failing test for [LMS-1528]
2013-11-21 10:58:27 -05:00
0c2c68117d
Add release notes for 061a46beef
2013-11-21 10:10:57 -05:00
90bbb7b1cd
Merge pull request #1706 from edx/anton/code-response-improvements
2013-11-22 09:46:58 -08:00
87f19469b9
Merge pull request #1750 from edx/sarina/dormsbee_grades_download
2013-11-22 09:28:09 -08:00
3c042b52fd
Clear out the cache xmodule_instance after an exception in XModule init
2013-11-21 23:06:08 -05:00
8d62fa14d8
Tests for LMS-1532
2013-11-21 23:02:22 -05:00
cf524906e0
more granular transactions in grading [LMS-1480]
2013-11-12 13:18:27 -05:00
3efcc3d6ef
Merge pull request #1753 from edx/ned/pr-1745-lms-1492
2013-11-22 08:50:08 -08:00
75532987ce
Properly convert files from Webob to pure files.
2013-11-21 20:40:20 -05:00
1c27ec3d7e
Add two tests of problems-with-files
2013-11-21 20:30:24 -05:00
6d94b71203
Clean up test files, no substantive changes.
2013-11-21 20:06:10 -05:00
938bd6b4e7
Merge pull request #1745 from edx/ned/lms-1492
2013-11-22 08:42:14 -08:00
586b1f72ef
Fix typo in comment.
2013-11-22 11:27:18 -05:00
7ab31f5478
Merge pull request #1710 from edx/dhm/restful_settings
2013-11-22 08:23:12 -08:00
8d564f219d
Use Choices to track possible modes.
2013-11-22 11:18:15 -05:00
de7d2cd08c
Properly convert files from Webob to pure files.
2013-11-21 20:40:20 -05:00
4ace4f98cc
Add two tests of problems-with-files
2013-11-21 20:30:24 -05:00
7e074f1a7e
Add error recovery to inline discussion loading
2013-11-21 18:18:14 -05:00
17864353a5
Restful course settings
2013-11-15 12:54:06 -05:00
901ad22652
Make ENABLE_S3_GRADE_DOWNLOADS disabled by default, enabled in dev.
2013-11-22 09:23:40 -05:00
a99fd08004
Fix error case where we have items in our grading csv output that are not present in a given student's gradeset.
2013-11-20 15:46:49 -05:00
e2423386cb
UX for Data Download tab on instructor dash
2013-11-20 11:05:10 -05:00
e0aa8cf78a
Grade report celery task and direct file push to S3 from the new instructor dashboard.
2013-11-14 16:08:53 -05:00
83c5e8b8bf
BLD-126: Code response improvements.
2013-11-19 14:15:22 +02:00
7e508248ed
Merge pull request #1738 from edx/anton/update-calculator-hints
2013-11-22 05:36:09 -08:00
b7438bc9a4
BLD-400: Update the calculator hints tooltip.
2013-11-21 14:40:02 +02:00
7606810c30
Update course_navigation.html
2013-11-22 10:10:06 +01:00
51fa7e0c3b
Merge pull request #1739 from edx/alex/fix-transcripts-500-error
2013-11-22 00:40:35 -08:00
3bbc7430f2
BLD-530: Fix 500 error in transcripts.
2013-11-21 15:31:23 +02:00
d1f511e14b
Clean up test files, no substantive changes.
2013-11-21 20:06:10 -05:00
835893c2ed
Merge pull request #1736 from edx/jbau/fix/cw-migrations
2013-11-21 13:54:09 -08:00
8d01a36e54
Merge pull request #1742 from edx/ned/cherry-pick-pr-1740
2013-11-21 07:44:57 -08:00
3ab17d7523
Allow colons in Locator fields.
2013-11-21 08:41:26 -05:00
3f44ff2f4b
Merge pull request #1675 from edx/christina/tab-new
2013-11-21 07:39:31 -08:00
1b2be30c45
Convert tabs to RESTful URL.
2013-11-14 15:45:16 -05:00
7bab863c22
Merge pull request #1698 from edx/anton/multiple-answers-string-response
2013-11-21 07:14:29 -08:00
99cf0ec54a
Merge pull request #1727 from edx/christina/public
2013-11-21 06:57:24 -08:00
e150207232
Merge pull request #1740 from edx/bug/locator_parse
2013-11-21 06:40:52 -08:00
77c208a1cf
BLD-474: Allow multiple answers for string response.
2013-11-18 12:56:16 +02:00
e8beb4d19b
Allow colons in Locator fields.
2013-11-21 08:41:26 -05:00
d526027da0
Merge pull request #1721 from edx/talbs/update-gitignore
2013-11-21 05:30:30 -08:00
df97df6fde
Merge pull request #1606 from zubair-arbi/zub/bugfix/std293-coursehandout
2013-11-21 01:53:08 -08:00
005e313f1c
Merge pull request #1677 from edx/valera/alert_screenreader_video_end
2013-11-21 00:47:31 -08:00
6910ac9535
Addressing reviewer's comments.
2013-11-19 12:44:37 +02:00
752851744c
Adding tests.
2013-11-18 11:36:19 +02:00
062c3b45a2
Initial commit.
2013-11-15 12:03:31 +02:00
f0bbd34ad6
Merge pull request #1715 from robertjmarks/master
2013-11-20 21:39:21 -08:00
f0874d41c4
Fix 0010 courseware migration
2013-11-20 20:38:19 -08:00
696f1df043
Pass through the certificate mode correctly.
2013-11-20 15:21:31 -05:00
fdf7ea2cc0
Merge pull request #1726 from cpennington/hotfix-fix-OEE-ajax-url
2013-11-20 13:20:45 -08:00
2b3d6b239c
Merge pull request #1730 from edx/db/remove-backbone-sourcemap-comment
2013-11-20 13:18:58 -08:00
e4817f5b4e
Removed Backbone sourcemap comment
2013-11-20 15:55:28 -05:00
92238d7f7b
Merge pull request #1729 from edx/adam/more-granular-grading-transactions-2
2013-11-20 12:09:49 -08:00
538be891bc
Merge pull request #1725 from edx/anton/transcripts-fix-acceptance-test
2013-11-20 11:44:15 -08:00
7b72a18551
more granular transactions in grading [LMS-1480]
2013-11-12 13:18:27 -05:00
Don Mitchell