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

2643 Commits

Author SHA1 Message Date
David Ormsbee
00f96ec79f Merge pull request #937 from edx/zoldak/add-cert-tests 
Add more certificates test for newly implemented features
 2013-09-11 20:33:53 -07:00
Adam Palay
ee62719025 check if module created from description is None before looking for its child descriptors 2013-09-11 18:33:51 -04:00
Jay Zoldak
fbeb63ee47 Add more certificates test for newly implemented features 2013-09-11 17:29:50 -04:00
Jay Zoldak
1ead54223b Change locators of links to match updated ids 2013-09-11 16:23:51 -04:00
Jay Zoldak
36f7d439aa Change locators of links to match updated ids 2013-09-11 16:18:59 -04: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
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
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
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
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
Diana Huang
6538e9899d Fix some of the shopping cart tests. 2013-09-06 11:47:35 -04:00
Vik Paruchuri
66655080f6 Log a warning if assumption about path is not correct. 2013-09-06 11:12:10 -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
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
Vik Paruchuri
9e1813041a Fix nopathtoitem error 2013-09-05 14:16:28 -04:00
Vik Paruchuri
a6068201e1 Add in a staff warning message about duplicates 2013-09-05 12:29:21 -04:00
Diana Huang
4ab204cce7 Only create a new photo verification if one doesn't already exist. 2013-09-05 08:50:59 -04:00
Jason Bau
08168ec67f Merge pull request #859 from edx/jbau/studio-link-in-instructor-panel 
Add link in lms legacy instructor dashboard to cms course_index
 2013-09-04 13:03:21 -07:00
Diana Huang
a1373f4830 Update content of the order confirmation e-mail. 2013-09-04 15:17:08 -04:00
Jason Bau
ec989e4999 Address review comments for lms_link_to_cms 
* Uses override_settings to provide test variable
* Move location of cms link to upper right
* PEP8 / Pylink
 2013-09-04 11:29:22 -07:00
Sarina Canelake
577aeed35a Don't fetch the editor for XML courses 2013-09-04 11:31:52 -04:00
Diana Huang
2e3a918da2 Clean up and fix some bugs on the 'already verified' page. 2013-09-04 11:31:03 -04:00
Diana Huang
03a4af7add Fix failing tests. 2013-09-04 11:21:31 -04:00
David Ormsbee
78acd083be Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss
 2013-09-04 10:58:30 -04:00
Sarina Canelake
51fcb5247d Merge pull request #855 from edx/sarina/bulkemail-violations 
Cleanup bulk email app
 2013-09-03 14:25:36 -07:00
Jay Zoldak
a432cffc2c Mark tests for unimplemented features as skip so that the acceptance tests will all pass when we merge into master. 2013-09-03 16:42:03 -04:00
Sarina Canelake
bfebe684b3 Cleanup bulk email app 2013-09-03 16:11:34 -04:00
Adam Palay
67890b3c66 resolve merge conflict with hotfix branch 2013-09-03 16:00:24 -04:00
Jay Zoldak
e0110bf108 Change css for payment page for better synchronization. 2013-09-03 13:51:47 -04:00
Anton Stupak
a09e610403 Fix multiple video bug 2013-09-03 18:49:46 +03:00
Jay Zoldak
b9ccc37c57 Automate more scenarios 2013-09-03 10:46:33 -04:00
Jay Zoldak
7bc997d0fb Change CSS after rebase. 2013-09-03 10:46:33 -04:00
Will Daly
e0372b00ef Implemented fake payment page. 2013-09-03 10:46:33 -04:00
Will Daly
a52ca3639b Initial BDD spec for certificates workflow 2013-09-03 10:46:32 -04:00