Will Daly
3ed96f75a1
Merge pull request #1788 from edx/will/disable-caption-test-2
...
Disabled another video test that failed in master
2013-11-26 11:09:28 -08:00
Will Daly
761699bf74
Disabled another video test that failed in master
2013-11-26 14:01:58 -05:00
Brian Talbot
812c8210da
Merge pull request #1778 from edx/talbs/studio-fix-italics
...
Studio: FIX - Italicize in xmodule/block previews
2013-11-26 09:59:56 -08:00
Brian Talbot
bff94de284
Studio: adding basic italicize text styling into xmodule/block preview UI
...
STUD-963
2013-11-26 12:21:55 -05:00
Brian Talbot
5a5c8c0eb5
Merge pull request #1779 from edx/talbs/fix-studio-notificationsie
...
Studio: FIX - correcting hiding state of notification UI for < IE9
2013-11-26 09:09:17 -08:00
Will Daly
88ccf85d42
Merge pull request #1786 from edx/will/disable-caption-test
...
Disabled video caption tests that failed in master
2013-11-26 09:08:51 -08:00
Will Daly
d00e5a4503
Disabled video caption tests that failed in master
2013-11-26 12:07:04 -05:00
Andy Armstrong
957175e3da
Merge pull request #1773 from edx/andy/unitidentifier
...
Changed unit identifier to be readonly, not disabled
2013-11-26 08:23:27 -08:00
Don Mitchell
38fba2481c
Merge pull request #1754 from edx/dhm/restful_settings
...
Restful api for course advanced settings
2013-11-26 07:39:39 -08:00
David Baumgold
389df17320
Merge pull request #1748 from puntxo/patch-1
...
Update course_navigation.html #os
2013-11-26 07:28:04 -08:00
Don Mitchell
7f91ce40ae
Restful api for course advanced settings
...
STUD-948
2013-11-26 10:17:52 -05:00
zubair-arbi
18f342c076
Merge pull request #1781 from zubair-arbi/zub/bugfix/std979-displaynameclashes
...
Fix unique vertical url + add test
2013-11-26 06:26:57 -08:00
Zubair Afzal
829cd7d861
Fix unique vertical url + add test
...
STUD-979
2013-11-26 14:30:17 +05:00
Brian Talbot
bbfa7742cc
Studio: correcting hiding state of notification UI for < IE9
...
STUD-815
2013-11-25 20:57:35 -05:00
Brian Talbot
2b5b4f4cc6
Merge pull request #1760 from edx/talbs/lms-upsell-ui
...
LMS: Add Collapse/Expand Icon to Dashboard Upsell UI
2013-11-25 15:49:27 -08:00
Ned Batchelder
6733d04a95
Merge pull request #1317 from edx/ned/upgrade-coverage
...
Upgrade coverage to 3.7
2013-11-25 14:23:52 -08:00
Carson Gee
3ad705cd16
Removing external_auth addition to cms, and skipping test
2013-11-25 17:08:18 -05:00
Julia Hansbrough
63bc8c9645
Merge pull request #1771 from edx/flowerhack/fix/lms-1526
...
Update mode appropriately when user enrolls
2013-11-25 14:07:20 -08:00
Julia Hansbrough
b822df4ee2
Added refund datetime info to Orders, OrderItems
...
Finance would like to have info about the date any given refund is requested.
This commit adds a refund_requested_time field to OrderItem and a refund_time to Order.
When a user *requests* a refund, the refund_requested_time field on OrderItem is updated; when a user actually *receives* their refund, the refund_time on Order is updated.
Note that only the refund_requested_teim field is actually used right now; later on, when we're able to actually automate the process of actually giving users refunds, we will start usings Order's refund_time field.
2013-11-25 21:57:46 +00:00
Andy Armstrong
f002ce4908
Changed unit identifier to be readonly, not disabled
...
STUD-863
2013-11-25 16:53:38 -05:00
Brian Talbot
d2a2aaa716
LMS: adds in collapse/expand UI for dashboard view upsell
2013-11-25 16:40:32 -05:00
Ned Batchelder
1795e157be
Upgrade coverage to 3.7
2013-11-25 16:38:16 -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
Julia Hansbrough
e4ebb586e8
Update mode appropriately when user enrolls
...
The "mode" was remaining unchanged when a student unenrolled & re-enrolled in a course--i.e., someone who was verified when first registering would still be verified when unenrolling and re-registering in audit mode. This commit fixes this problem.
LMS-1526
2013-11-25 21:20:15 +00: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
Carson Gee
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 15:30:36 -05: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
Carson Gee
96c7cb5ffd
Added tests for signup skipping
2013-11-25 13:06:28 -05: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
Carson Gee
0f324baaca
Fixed PEP8 and indentation issues
2013-11-25 11:16:06 -05:00
Carson Gee
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-11-25 11:16:06 -05: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
