Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christine Lytwynec
7b36645eb2 Merge pull request #6024 from edx/clytwynec/fix_no_prereq_install 
fix NO_PREREQ_INSTALL
 2014-11-21 17:06:57 -05:00
Christine Lytwynec
e9e595749d fix NO_PREREQ_INSTALL 2014-11-21 14:24:14 -05:00
Renzo Lucioni
03f38dd8b4 Use analytics.identify instead of the old utility function 2014-11-21 12:53:59 -05:00
Renzo Lucioni
73dd6fe2c7 hotfix-2014-11-21 2014-11-21 12:11:44 -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
Sarina Canelake
c8ba02a971 Merge pull request #6012 from edx/sarina/remove-eo-artifacts 
Remove 'eo' artifacts when doing test runs
 2014-11-20 20:47:20 -05:00
Sarina Canelake
9a7338e5cb Remove 'eo' artifacts when doing common/lib test runs 2014-11-20 17:14:10 -05:00
Kevin Luo
193277cb36 Fix diff branch paver option to take value 2014-11-20 13:26:10 -08:00
Mark Hoeber
62d129c7c7 Merge pull request #6007 from edx/markhoeber-dev-guide-link-fix 
Dev Guide Link Fix
 2014-11-20 15:57:26 -05:00
Mark Hoeber
acf7db4838 Link fix attempt 2014-11-20 15:18:26 -05:00
Don Mitchell
21608f340c Error on import into split 
if import restores a deleted draft element which was never published
PLAT_297
 2014-11-20 12:03:17 -05:00
Renzo Lucioni
55922f896d hotfix-2014-11-20 2014-11-20 12:00:19 -05:00
Anton Stupak
25146946cd Merge pull request #5970 from edx/anton/fix-course-times-settings 
TNL-772: Fix course time settings.
 2014-11-20 16:47:35 +02:00
stephensanchez
7d36d11b35 Remove enrollment updates from the Enrollment API. 2014-11-20 09:36:30 -05:00
Adam Palay
624360d1d6 serve mathjax from mathjax's cdn (TNL-823) 2014-11-20 09:36:16 -05:00
Waheed Ahmed
92bf2f1c72 Merge pull request #5995 from edx/waheed/tnl822-added-alt-attribute-image-map-input-problem 
Added alt attribute in image map input problem.
 2014-11-20 19:21:10 +05:00
polesye
b6d8291996 TNL-772: Fix course time settings. 2014-11-20 14:56:12 +02:00
Waheed Ahmed
430aa4f834 Added alt attribute in image map input problem. 
TNL-822
TNL-825
 2014-11-20 16:58:26 +05:00
Sylvia Pearce
6d8f2a4ae0 More tweaks to calculator tooltip 2014-11-19 15:04:17 -05:00
Sylvia Pearce
14e022ca30 Tweaks to calculator tooltip 2014-11-19 14:17:30 -05:00
Sylvia Pearce
1b285be264 Second try at a new calculator tooltip 2014-11-19 13:32:49 -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
Sylvia Pearce
d7d86cddc7 Update calculator tooltip 2014-11-18 13:57:47 -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
7232c084cf Merge pull request #5945 from edx/waheed/tnl395-updated-open-sans-webfonts 
Updated open sans webfonts with latest.
 2014-11-18 15:16:38 +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
Renzo Lucioni
8e91def1c2 Merge pull request #5978 from edx/release 
Release
 2014-11-17 16:26:16 -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
Renzo Lucioni
52b6ef8978 Merge pull request #5976 from edx/hotfix-2014-11-17 
disable "go to payment button" on click (ECOM-643)
 2014-11-17 15:15:08 -05: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
Stephen Sanchez
ffa08453f2 Merge pull request #5975 from edx/sanchez/change_api_student_id 
Update the API and Data Layer to get the student from the models.
 2014-11-17 11:42:42 -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
Ben Patterson
4db5b31138 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.

Conflicts:
	scripts/reset-test-db.sh
 2014-11-17 11:28:23 -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
Will Daly
fe735e29ac Merge pull request #5972 from edx/will/remove-page-view-events 
Remove redundant pageview segment.io events (ECOM-619)
 2014-11-17 10:51:16 -05:00
Adam Palay
e7b23faa86 disable "go to payment button" on click (ECOM-643) 2014-11-17 10:38:44 -05:00
stephensanchez
75e45bc2ee Update the API and Data Layer to get the student from the models. 2014-11-17 15:09:33 +00: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
Renzo Lucioni
5d15691762 Merge pull request #5964 from edx/renzo/password-reset-selenium 
Renzo/password reset selenium
 2014-11-17 09:40:50 -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