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

6210 Commits

Author SHA1 Message Date
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
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
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
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
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
Sarina Canelake
4b9df2e998 Add datadog tracking for bulk email 2013-09-06 16:18:40 -04:00
Jay Zoldak
5ece64433d Fix certificates acceptance test after come css changes 2013-09-06 15:31:08 -04: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
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
Brian Talbot
6084412544 Verification: changed page title, progress to reflect registration completion + I8TN copy changes 2013-09-06 12:12:58 -04:00
Brian Talbot
6a081ffc38 Verification: adds current step text into receipt view's progress nav 2013-09-06 12:12:58 -04:00
Brian Talbot
0c552141f2 LMS: revises right justification space of verified indicator on Student Dashboard 2013-09-06 12:12:58 -04:00
Frances Botsford
47df7e420f ux adjustments to vcert flow 2013-09-06 12:02:37 -04:00
Diana Huang
6538e9899d Fix some of the shopping cart tests. 2013-09-06 11:47:35 -04:00
Vik Paruchuri
0fbbaa83d6 Fix some staff-facing messages 2013-09-06 11:17:46 -04:00
Vik Paruchuri
66655080f6 Log a warning if assumption about path is not correct. 2013-09-06 11:12:10 -04:00
chrisndodge
b92d88fcbc Merge pull request #401 from edx/feature/ichuang/cas-authentication 
Provide CAS authentication integration
 2013-09-06 07:36:28 -07:00
Frances Botsford
af2424daf1 adjustments to choose and contribution for vcerts 2013-09-06 10:23:46 -04:00
David Ormsbee
90923f3e12 Add min_price var to _contribution.html template 2013-09-06 10:11:29 -04:00
Diana Huang
698872a810 Clean up names and links for receipts/emails. 2013-09-06 10:01:09 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Frances Botsford
4175db0a67 adding basic meta tags - for ie edge and mobile - to main template header 2013-09-06 09:13:03 -04:00
David Ormsbee
4e011326bc Replace placeholder 'Course Name' in paid cert templates with the actual course name 2013-09-05 23:39:35 -04:00
jsa
6e7965d26c update mitxmako lookup / fixes FOR-150 2013-09-05 23:23:52 -04:00
Diana Huang
20d72ea703 Clean up views and start work on edit name modal. 2013-09-05 15:20:48 -04:00
Brian Talbot
f4bdd73839 Verification: adds in verified/enrollment status into dashboard course listings 2013-09-05 14:29:11 -04:00
Brian Talbot
f686990b02 LMS: adds in additional abstract border-variables with logical scale 2013-09-05 14:29:10 -04:00
Brian Talbot
f2e55a3d6a Verification: abstracting out specific color-based Sass variables to be *somewhat* friendly to theming 2013-09-05 14:29:10 -04:00
Frances Botsford
48fed2052f adding in conditional IE hooks in lms main template 2013-09-05 14:18:27 -04:00
Vik Paruchuri
9e1813041a Fix nopathtoitem error 2013-09-05 14:16:28 -04:00
David Ormsbee
22480b821a Fix reset button for photo capture 2013-09-05 14:15:13 -04:00
Frances Botsford
a8989f2fe6 adjusting go to course button for vcert receipt 2013-09-05 12:40:37 -04:00
Vik Paruchuri
a6068201e1 Add in a staff warning message about duplicates 2013-09-05 12:29:21 -04:00
Frances Botsford
304a329b08 initial receipt html and styling for vcert 2013-09-05 12:24:03 -04:00
Brian Talbot
9c96fcf4cd edx.org: ensures that the iframe-based register button has a transparent background 2013-09-05 10:00:34 -04:00