Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,059 Commits 1 Branch 0 Tags
464dfcfabc1671f1fe7a0e5e706ee1c623e356a8
Commit Graph

9527 Commits

Author SHA1 Message Date
Will Daly
464dfcfabc Show student verification status on the dashboard. 2014-12-02 09:42:24 -05:00
chrisndodge
c19708973b Merge pull request #5982 from edx/muhhshoaib/WL-99-Invoicing-email-finance 
WL-99 send a copy of the invoice to the finance@edx.org when registration codes are generated
 2014-11-24 13:15:51 -05:00
Renzo Lucioni
03f38dd8b4 Use analytics.identify instead of the old utility function 2014-11-21 12:53:59 -05:00
Muhammad Shoaib
df0bb491fa WL-99 send a copy of the invoice to the finance@edx.org when registration codes are generated 
changed the finance_email in the common.py file

added the test for the FiNANCE_EMAIL settings
 2014-11-21 17:43:37 +05:00
Renzo Lucioni
55922f896d hotfix-2014-11-20 2014-11-20 12:00:19 -05:00
Adam Palay
624360d1d6 serve mathjax from mathjax's cdn (TNL-823) 2014-11-20 09:36:16 -05:00
chrisndodge
4a3700c151 Merge pull request #5969 from edx/muhhshoaib/WL-124-front-end-tests-for-auto-enrollment 
muhhshoaib/wl 124 add front end tests for autoenrollment
 2014-11-19 10:14:22 -05:00
Nimisha Asthagiri
ec552cf154 Merge pull request #5981 from edx/mobile/MA-141 
MA-141 Support webm encoding for VAL-enabled videos
 2014-11-18 10:03:21 -05:00
Akiva Leffert
08cd3272be Merge pull request #5920 from edx/aleffert/additional-beta-checks 
Add a check for beta users in the video_info API
 2014-11-18 09:17:44 -05:00
Muhammad Shoaib
97b45cc2a7 WL-124 added the jasmine tests for the autoenrollment csv 
Added bokchoy tests and assets (csv files) for CSV auto reg and enrollment.
Set the env flag "ALLOW_AUTOMATED_SIGNUPS": true in bok_choy.env.json

Resolved quality issues.

resolved cherry pick conflicts

Improved bokchoy tests as per code review suggestions.

added the BDD in the docstrings for all the test scenarios

changed the bok choy test string

Improved bokchoy tests as per further code review suggestions.

Made a MembershipPageAutoEnrollSection a separate PageObject.
 2014-11-18 18:35:31 +05:00
Waheed Ahmed
2d46a79345 Updated open sans webfonts with latest. 
TNL-395
 2014-11-18 12:18:12 +05:00
Nimisha Asthagiri
caf5d5393b MA-141 Support webm encoding for VAL-enabled videos 2014-11-17 23:34:39 -05:00
Akiva Leffert
546256d700 Add a check for beta users in the video_info API 
Discovered a case I missed on the original version of this. See
https://github.com/edx/edx-platform/pull/5798
JIRA: MA-76

Also fixes checking for mobile_access when course is None
JIRA: MOB-978
 2014-11-17 19:00:27 -05:00
Stephen Sanchez
673d4fbccb Merge pull request #5965 from edx/sanchez/change-order-event 
Updating default values and changing event data.
 2014-11-17 16:55:37 -05:00
Will Daly
4a814c24ba Merge pull request #5948 from edx/will/combine-reg-login-form 
Combined Login/Registration Form
 2014-11-17 16:00:20 -05:00
stephensanchez
0c3df636cb Updating default values and changing event data. 2014-11-17 20:51:06 +00:00
Will Daly
a89b9bacbc Merge pull request #5916 from edx/will/ecom-543 
Send transaction type for donations and verified certificates
 2014-11-17 14:54:54 -05:00
chrisndodge
37e380260c Merge pull request #5951 from edx/cdodge/treat-empty-email-template-names-as-NULL 
Treat an empty string from the admin form to be None/NULL for the Course...
 2014-11-17 11:29:56 -05:00
Nimisha Asthagiri
6f1243e82c Merge pull request #5974 from edx/mobile/MA-135-122 
MA-135, MA-122 Support CDN, alternative sources with VAL-enabled-videos
 2014-11-17 11:12:35 -05:00
Chris Dodge
adbe133f5c Treat an empty string from the admin form to be None/NULL for the CourseEmailTemplateForm 2014-11-17 10:05:12 -05:00
Nimisha Asthagiri
12a22ac886 MA-135, MA-122 Support CDN and alternative sources with VAL-enabled-videos. 2014-11-17 09:56:54 -05:00
AlasdairSwan
c7f5431102 Merge pull request #5973 from edx/alasdair/logistration-password-scroll 
ECOM-650 updated to add auto scrolling for password reset view
 2014-11-17 09:42:17 -05:00
AlasdairSwan
dff0acf54d ECOM-650 updated to add auto scrolling for password reset view 2014-11-17 09:31:22 -05:00
Will Daly
1ebb8ef06b Remove redundant pageview segment.io events 2014-11-17 09:24:50 -05:00
AlasdairSwan
87af92a1a5 Merge pull request #5971 from edx/alasdair/logistration-css-bugs 
ECOM-651 No longer updating -settings by default
 2014-11-17 09:07:43 -05:00
AlasdairSwan
69446678a4 ECOM-651 No longer updating -settings by default 2014-11-17 09:01:47 -05:00
Will Daly
12fec6c918 Send transaction type for donations and verified certificates to CyberSource 2014-11-17 08:10:49 -05:00
Stephen Sanchez
83f8de6c86 Merge pull request #5962 from edx/sanchez/disable-login-button-on-click 
Adding disable logic for buttons.
 2014-11-14 16:29:36 -05:00
Will Daly
ffee7517f0 Add Selenium tests for the combined login/registration form. 2014-11-14 13:57:26 -05:00
John Eskew
126747febc Merge pull request #5960 from edx/jeskew/default_asset_collection_name 
Always create an asset metadata collection in the Mongo modulestore.
 2014-11-14 13:54:52 -05:00
stephensanchez
2486901602 Adding disable logic for buttons. 
Update tests, clean up approach.

Updating jasmine tests.
 2014-11-14 18:35:55 +00:00
Sarina Canelake
810df8b7de Merge pull request #5885 from edx/sarina/name-branded-assets-in-lms 
Consistently name branded assets in lms
 2014-11-14 13:29:22 -05:00
Adam Palay
bc8d0a9976 disable "go to payment button" on click (ECOM-643) 2014-11-14 12:22:30 -05:00
Sarina Canelake
ab54f9cf42 Translate "Powered by Open edX" string 2014-11-14 10:30:37 -05:00
Sarina Canelake
ab5da97c41 Consistently name edX branded elements within the LMS [OPEN-300] 2014-11-14 10:30:37 -05:00
Stephen Sanchez
a84e4598dd Merge pull request #5955 from edx/sanchez/fix-djfs-dependency 
Fix the DJFS dependency.
 2014-11-14 10:15:41 -05:00
John Eskew
546d81a822 Always create an asset metadata collection in the Mongo modulestore. 
If no collection name is specified, use a default name.
https://openedx.atlassian.net/browse/PLAT-294
 2014-11-14 09:44:31 -05:00
Ben Patterson
3ae312caa6 Merge pull request #5954 from edx/benp/mysql56-test-updates 
Don't use 'test' db for mysql since it's reserved.
 2014-11-13 19:50:54 -05:00
stephensanchez
3396b2bb2c Fix the DJFS dependency. 2014-11-13 22:07:39 +00:00
Stephen Sanchez
66ff4e67cb Merge pull request #5946 from edx/sanchez/ecommerce_info_to_ga 
Adding new Google Analytics eCommerce event to shoppingcart.
 2014-11-13 16:51:37 -05:00
Ben Patterson
a19b97c61f Don't use 'test' db for mysql since it's reserved. 
This db name is reserved and used by mysql installations. This can cause
conflicts when trying to populate our own 'test' database on mysql.
 2014-11-13 14:41:50 -05:00
stephensanchez
822f15546a Adding new Google Analytics eCommerce event to shoppingcart. 
Adding new event and test

pylint and comments
 2014-11-13 18:17:52 +00:00
AlasdairSwan
06cbe161a7 After accessibility review removed required field aria-describedby 2014-11-13 13:12:36 -05:00
Will Daly
a5001bab2a Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 
Conflicts:
	lms/static/sass/base/_grid-settings.scss
	lms/static/sass/shared/_footer.scss
	lms/static/sass/shared/_header.scss
 2014-11-13 11:16:16 -05:00
David Ormsbee
43d8c7a712 Merge branch 'release' 
Conflicts:
	lms/djangoapps/shoppingcart/processors/CyberSource2.py
 2014-11-13 10:11:12 -05:00
AlasdairSwan
dfa8167446 Merge pull request #5938 from edx/alasdair/logistration-setvalidity-fix 
ECOM-369 Reunited the missing line with the rest of the page elements an...
 2014-11-13 08:11:48 -05:00
Will Daly
c8751b5b4a Add CSRF cookie to combined login/registration form 
Add CSRF check for login/registration views.
 2014-11-12 16:15:20 -05:00
AlasdairSwan
ecb6a69fe7 ECOM-369 Reunited the missing line with the rest of the page elements and fixed an error with HTML5 validation override 2014-11-12 15:51:18 -05:00
Renzo Lucioni
2fc2207bd2 Merge pull request #5905 from edx/renzo/pep8-pylint-cleanup 
Clean up pep8 and pylint violations
 2014-11-12 14:34:03 -05:00
AlasdairSwan
3eb287151c ECOM-369 accessibility updates 2014-11-12 14:17:41 -05:00