Commit Graph

17572 Commits

Author SHA1 Message Date
Brian Talbot
59a7a47b02 Verification: changes formatting of billing address/info on receipt view 2013-09-10 16:51:21 -04:00
Brian Talbot
253f8e2d15 Verification: revises UI header copy 2013-09-10 16:51:21 -04:00
David Ormsbee
851047210e Merge pull request #922 from edx/ormsbee/fix_verify_progress_status
Fix verify progress status
2013-09-10 13:44:15 -07:00
David Ormsbee
e8a48d6144 Update JS to reflect new link IDs to unbreak the top nav status indicator. 2013-09-10 16:41:29 -04:00
Diana Huang
01eaeff8fc Merge pull request #918 from edx/diana/custom-price-fixes
Clean up - Add chosen price to the choose mode page
2013-09-10 11:58:47 -07:00
Diana Huang
b597cdfdae If user has previously selected a price, show it on the choose page 2013-09-10 14:35:57 -04:00
David Ormsbee
fe349751a1 Merge pull request #917 from edx/ormsbee/check_flash_video_permissions
Check flash video permissions before enabling next step
2013-09-10 11:30:49 -07:00
David Ormsbee
dea1878efe Require that permission be given for Flash camera before we process snapshots. 2013-09-10 14:17:58 -04:00
Diana Huang
37ad3662bd Merge pull request #915 from edx/jkarni/fix/textbook-upload
Jkarni/fix/textbook upload
2013-09-10 10:50:38 -07:00
Julian Arni
c08a1b3e62 Fix element name conflict 2013-09-10 13:48:12 -04:00
David Ormsbee
ba1f17e54b Merge pull request #913 from edx/ormsbee/certs_small_ux
Small UI fixes
2013-09-10 10:34:32 -07:00
David Ormsbee
740e5bace7 Prevent being able to click on disabled button in IE.
Enable display of course org, num in receipt page.
2013-09-10 13:32:52 -04:00
Brian Talbot
d066692bce Verification: revising textarea reset formatting and increasing close modal control size 2013-09-10 13:03:25 -04:00
Frances Botsford
18b4b0b03f modal functionality for edit name on vcerts 2013-09-10 13:03:09 -04:00
Frances Botsford
5c7443be38 cleanup copy on reqs, photo, and choose pages 2013-09-10 09:13:00 -04:00
Diana Huang
ba3cf691b9 Merge pull request #910 from edx/alex/add_lti_to_rc
Alex/add lti to rc
2013-09-10 05:42:43 -07:00
Valera Rozuvan
ee02c06250 Add Learning Tools Interoperability (LTI) blade.
LTI blade allows to include LTI components to courses.
Python integration, Jasmine and acceptance tests are included.
2013-09-10 12:30:42 +03:00
Diana Huang
dc42e1f954 Merge pull request #894 from edx/diana/confirmation-email
Clean up text of Order Confirmation E-mail.
2013-09-09 13:52:06 -07:00
Diana Huang
24efb4e8d6 Clean up text of Order Confirmation E-mail. 2013-09-09 15:56:01 -04:00
David Ormsbee
34d0fe1554 Merge pull request #890 from edx/ormsbee/verifyuser3
User verification / validated certificates feature
2013-09-09 11:30:09 -07:00
Diana Huang
d3454e58b5 Undo some of the hacks to make receipt rendering work. 2013-09-09 14:02:28 -04:00
David Ormsbee
ec3db3efde Make Certificate tests subclass ModuleStoreTestCase to fix missing course 2013-09-09 13:54:27 -04:00
David Ormsbee
af8475ad31 Make sure CourseFactory creates desired courses before shopping cart tests run. 2013-09-09 13:09:17 -04:00
Brian Talbot
0052b87c37 Merge pull request #886 from edx/talbs/lms-disabledui
LMS: General Disabled Link/Button State Styling
2013-09-09 08:50:59 -07:00
Brian Talbot
422c6282e4 LMS: adds in pseudo-state styling for disabled buttons/links (by attribute or standard class names) 2013-09-09 11:43:55 -04:00
David Ormsbee
8491927ef7 Default empty course_name just to unbreak the test. Need to actually extract out verification-specifics from the receipt templates, but design is working on them right now. 2013-09-09 11:14:28 -04:00
David Ormsbee
9f40263f7b Fix broken callout to template partial from receipt page. 2013-09-09 11:00:01 -04:00
David Ormsbee
48f867bd6b Merge branch 'master' into ormsbee/verifyuser3
Conflicts:
	lms/envs/common.py
2013-09-09 10:18:25 -04:00
jkarni
b53d55543d Merge pull request #823 from edx/jkarni/feature/multiple-assets-upload
Add support for multiple file uploads
2013-09-09 06:47:58 -07:00
chrisndodge
9c6987d010 Merge pull request #873 from edx/fix/cdodge/enable-course-image-setting
also even when we have a marketing site, we still need a course image fo...
2013-09-06 16:58:54 -07:00
Brian Talbot
79a9c8677a Verification: revises presentation of customized certificate receipt ciew 2013-09-06 17:23:43 -04:00
Diana Huang
238a2d53e3 Don't allow people into the verification flow if they've already been verified 2013-09-06 17:20:24 -04:00
Vik Paruchuri
499d272adc Merge pull request #825 from edx/fix/vik/staff-information
Staff information about duplicate ORA submissions
2013-09-06 14:14:31 -07:00
Adam
3184939138 Merge pull request #885 from edx/release
Release
2013-09-06 13:51:03 -07:00
Adam
c5a732206c Merge pull request #883 from edx/hotfix/cdodge/fix-tab-rename
fix edit tab bug and add unit test
2013-09-06 13:47:48 -07:00
Sarina Canelake
d84de2f890 Merge pull request #884 from edx/sarina/instrument-bulk-email
Add datadog tracking for bulk email
2013-09-06 13:28:07 -07:00
Sarina Canelake
4b9df2e998 Add datadog tracking for bulk email 2013-09-06 16:18:40 -04:00
Chris Dodge
10b7c13652 add comment 2013-09-06 16:05:41 -04:00
Chris Dodge
12bd7309d2 add content assertions 2013-09-06 16:03:09 -04:00
Jay Zoldak
5ece64433d Fix certificates acceptance test after come css changes 2013-09-06 15:31:08 -04:00
David Baumgold
3b627e8c80 Merge pull request #879 from edx/db/remove-template-loader
Remove Studio JS template loader
2013-09-06 12:26:50 -07:00
Don Mitchell
0848360436 Merge pull request #844 from edx/dhm/editable_metadata
refactoring of platform to xblock 0.3 w/ refactoring of inheritance in the platform to a consistent representation.
2013-09-06 11:58:36 -07:00
Chris Dodge
c7f2f27708 fix bug and add unit test 2013-09-06 14:47:59 -04:00
Calen Pennington
0cac1c3bee Merge pull request #881 from cpennington/dhm/editable_metadata
Include mixins in advanced component class loading and preview modules
2013-09-06 10:52:03 -07:00
Diana Huang
ec67bf4bec Only show start date on receipt if it's in the future. 2013-09-06 13:48:40 -04:00
Calen Pennington
38de05c76c Include mixins in advanced component class loading and preview modules 2013-09-06 13:37:03 -04:00
Vik Paruchuri
d3580994c8 Merge pull request #870 from edx/fix/vik/oe-nopath
Fix nopathtoitem error
2013-09-06 10:01:19 -07:00
Adam Palay
8fe38236d0 Merge branch 'release' after hotfix 5c39c79 2013-09-06 12:36:53 -04:00
Adam
12e82221e5 Merge pull request #877 from edx/hotfix/jsa/FOR-150
update mitxmako lookup / fixes FOR-150
2013-09-06 09:33:50 -07:00
Will Daly
99b47da2f4 Merge pull request #878 from edx/will/static-page-test-fix
Updated static-pages test to add retry logic
2013-09-06 09:22:46 -07:00