Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

14096 Commits

Author SHA1 Message Date
Minh Tue Vo
4e1c4c46e6 adding tests for country list in different languages 
updating the version for django_countries
 2014-08-20 15:30:17 -04:00
Sarina Canelake
665479a811 Merge pull request #4868 from bradenmacdonald/fix-idde-bugs 
Fixed: Can set earlier due date as an individual due date extension and related bugs
 2014-08-20 11:47:31 -04:00
Will Daly
be1523f280 Merge pull request #4880 from edx/will/use-new-cybersource-api 
CyberSource API Update
 2014-08-20 11:22:13 -04:00
Will Daly
1ad8d4f2d4 Add verification for CyberSource2 implementation. 
Clean up shopping cart processor API.
Fix UUID JSON serialization bug in CyberSource2 implementation.
Update test suite to use new CyberSource2 implementation.
Fix i18n messages in CyberSource2
Enable CyberSource2 implementation by default.
 2014-08-20 10:39:48 -04:00
Waheed Ahmed
e26efea26f Fixed 500 error on views with incomplete course id in url. 
LMS-11217
 2014-08-20 18:30:58 +05:00
Braden MacDonald
9c93cd8dd6 Fix: Display error when attempting to reset nonexistent due date extension 2014-08-19 23:29:36 -07:00
Braden MacDonald
f4e021093a Fix: 500 response if indiv. due date deleted after normal due date was deleted 2014-08-19 23:23:07 -07:00
Braden MacDonald
3ab8779190 Fix: API allowed an individual due date extension on units with no due date 2014-08-19 23:23:06 -07:00
Braden MacDonald
a08ab9ff11 Fix: an individual extended due date must not precede the normal due date LMS-6563 2014-08-19 23:23:06 -07:00
Braden MacDonald
42eaa4b005 Unit tests for bugs in IDDE API, including LMS-6563 2014-08-19 23:23:06 -07:00
jhelbert
92fa79dbd0 Merge pull request #4871 from edx/jhelbert/api-upgrade-check 
This confirms the data api upgrade
 2014-08-19 16:36:29 -04:00
Justin Helbert
dd7f09d36a This confirms the data api upgrade 2014-08-19 19:03:58 +00:00
Will Daly
f26e88bdd9 Fix messaging for professional ed under auto-registration 2014-08-19 07:53:26 -04:00
Christina Roberts
33815f1cc5 Merge pull request #4853 from edx/christina/stud-2093 
Add a request-token to identify which xblock html was rendered as part o...
 2014-08-15 12:55:34 -04:00
Will Daly
3cd4610b5a Merge pull request #4824 from edx/will/auto-register 
Auto enroll students even if there are multiple course modes
 2014-08-15 11:11:19 -04:00
Calen Pennington
50082387eb Add a request-token to identify which xblock html was rendered as part of the current request 
[STUD-2903]
 2014-08-15 11:04:52 -04:00
Jesse Zoldak
4d5b948928 Merge pull request #4748 from Stanford-Online/jbau/parallel-unit-tests 
make unit tests respect mongo port/host settings (with default)
 2014-08-15 10:56:52 -04:00
Will Daly
714f9bb69f Auto enroll students even if there are multiple course modes 
Add session middleware to an external auth test to fix a test failure with the auto-registration AB-test changes
 2014-08-15 10:26:27 -04:00
Will Daly
1a9f793802 Merge pull request #4842 from edx/will/ecom-90 
Use English for the marketing site buttons in an edx-controlled domain
 2014-08-15 10:23:35 -04:00
njdup
55521590d1 Email content history fix and additions 
This addresses a bug in the email content history table where
"Unknown" was displayed in the number of emails sent column if any sort of
failure occurred during email sending. This behavior has been editted so now
the number of emails that failed to send is displayed, along with the number
of emails that were successfully sent. If the email task is still pending,
"0 sent" is displayed.

As a small addition, the table now also includes the authors of previously
sent emails, and the modal window for an email also displays its author.
 2014-08-14 15:12:31 -07:00
Will Daly
88ebac4faf Use English for the marketing site buttons in an edx-controlled domain 2014-08-14 16:00:44 -04:00
Julia Hansbrough
2204eb7390 Fixed merge conflict between release and master. 2014-08-13 18:11:30 +00:00
Will Daly
905ce6319c Add integration tests for professional ed flow 2014-08-12 18:44:58 +00:00
Diana Huang
9aa095dd21 Adapt flow for new 'professional' mode. 
ECOM-41
 2014-08-12 18:44:46 +00:00
Julia Hansbrough
805c325653 Update redirect and wording for prof ed 
- Changes registraiton button text for professional ed courses
- Professional ed courses do not see "choose your track" page; go straight to verification flow
 2014-08-12 18:44:40 +00:00
Jason Bau
b55362b925 make unit tests respect mongo port/host settings (with default) 
settings are read in from environment variable
 2014-08-11 14:17:29 -07:00
Julia Hansbrough
b9a285f1e7 Merge pull request #4756 from edx/flowerhack/prof-ed-reg-button 
Redirect to show_reqs for prof ed
 2014-08-08 17:03:29 -04:00
Julia Hansbrough
91e90b3673 Update redirect and wording for prof ed 
- Changes registraiton button text for professional ed courses
- Professional ed courses do not see "choose your track" page; go straight to verification flow
 2014-08-08 21:02:16 +00:00
Nimisha Asthagiri
9efe5d92c5 Merge pull request #4720 from edx/split/add-and-fixes 
Split/add and fixes
 2014-08-08 14:12:02 -04:00
Adam
26b08a0205 Merge pull request #4736 from edx/usman/lms11205-embargomiddleware-invalidkeyerror 
Catch InvalidKeyError in course_id_from_url().
 2014-08-08 13:27:25 -04:00
Nimisha Asthagiri
d2b59cb6e0 get_items API: have qualifiers be a separate parameter instead of assuming kwargs. 2014-08-08 12:38:42 -04:00
Usman Khalid
f9ee21f434 Incomplete course ids should return a 404. 2014-08-08 20:34:44 +05:00
Julia Hansbrough
3de1ab83de Basic fix for upgrade text bug 2014-08-08 14:31:49 +00:00
jsa
d96de4249d Merge branch 'release' 2014-08-07 16:22:39 -04:00
Clinton Blackburn
1a4e067712 Added link from instructor dashboard to analytics dashboard 2014-08-07 12:13:34 -04:00
David Baumgold
e99a14eb3f Merge pull request #4654 from edx/db/kill-check-for-code 
Replace `check_for_get_code` with `assert_request_status_code`
 2014-08-07 08:28:50 -04:00
Usman Khalid
9599c31aa0 Catch InvalidKeyError in static_tab view. 
LMS-11189
 2014-08-07 15:41:07 +05:00
Waheed Ahmed
05b87fd99b Implemented process_response method to clear requestcontext global variable in mako middleware. 
LMS-6622
 2014-08-06 19:58:20 +05:00
David Baumgold
5457775cfe Replace check_for_get_code with assert_request_status_code 
More flexible, uses the word "assert", method instead of function
 2014-08-05 13:36:49 -04:00
chrisndodge
246a431760 Merge pull request #4590 from edx/cdodge/fix-reg-codes 
eCommerce enhancements (pt. 2)
 2014-08-05 13:12:52 -04:00
Diana Huang
1e1b321b69 Merge pull request #4655 from edx/diana/allow-only-verified 
Allow verified to be offered without audit
 2014-08-05 11:26:29 -04:00
Calen Pennington
ea4e76b0bc Merge pull request #4254 from marcore/fix-branding-course-listing-opaque 
Fix filter with new opaque key, allowing user to set COURSE_LISTING as o...
 2014-08-05 10:31:33 -04:00
asadiqbal08
33bdf935f0 Retrieving active coupon codes from model 2014-08-05 10:01:31 -04:00
Muhammad Shoaib
33d5b49e81 added course price set/view/edit functionality 
added CoursmodeArchive model to save the old prices history

analytics -> instructor_analytics

analytics -> instructor_analytics
 2014-08-05 10:00:13 -04:00
asadiqbal08
dc46170f36 registration code checkout flow 
Redirecting to dashboard after free user enrollment.
 2014-08-05 10:00:12 -04:00
Muhammad Shoaib
878eaa9f77 added django admin pages for Coupon Table 
added the suggested changes by cdonge
 2014-08-05 10:00:12 -04:00
Muhammad Shoaib
4333e53997 added registration-codes generation functionality 
rebased and resolve conficts with cdoge/registration_codes

feature enhancement request: added transaction group name text field to the download buttons as an extra optional query paramerter
 2014-08-05 10:00:11 -04:00
Muhammad Shoaib
08ff030521 updated the course registration models 2014-08-05 10:00:11 -04:00
asadiqbal08
5a9fc036a6 Course Instructor as financeadmin role, will be able to download all purchase transactions in the course as a CSV file 2014-08-05 10:00:10 -04:00
Diana Huang
604bfabb88 fixup! Allow verified to be offered without audit 2014-08-05 09:32:39 -04:00