Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,222 Commits 1 Branch 0 Tags
2bbea43d06d0bd95ee1153b1e91c8e243de1a349
Commit Graph

33222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
2bbea43d06 Adding Bok Choy Test for HTML editing 
TNL-3296 would have been prevented with this test, adding it now to
prevent similar issues in the future. Squashed commit with doc changes,
review feedback, and run-20-times-to-ensure-not-flaky-then-unmark
all included.
 2015-10-07 14:09:03 -04:00
Andy Armstrong
2ca355b881 Merge pull request #9605 from edx/andya/team-discussion-flaky-tests 
Fix flaky team discussion test
 2015-10-07 12:07:25 -04:00
Andy Armstrong
8914aaf8d4 Refactor discussions code to address flaky test 
TNL-3247

Removed remaining synchronous AJAX calls from discussions
Updated the profile view tests to use an attached view for testing
Removed one-time JQuery intiialization that could fail and break multiple tests
 2015-10-07 11:22:48 -04:00
Clinton Blackburn
c1686a939c Merge pull request #10072 from edx/release 
Hotfixes for 2015-10-06
 2015-10-07 10:09:03 -04:00
chrisndodge
c044099044 Merge pull request #10074 from edx/muhhshoaib/SOL-1267-ecommerce-tab-lost-expand-collapse-regions 
SOL-1267 eCommerce tab on Instructor Dashboard has lost the expand/collapse regions
 2015-10-07 08:56:12 -04:00
Waheed Ahmed
412d86b703 Merge pull request #10065 from edx/waheed/plat747-fix-get-courses 
Fixed split get_courses.
 2015-10-07 17:38:32 +05:00
chrisndodge
734e55eaca Merge pull request #10073 from edx/cdodge/add-columns-to-enrollment-report 
Add email and manual enrollment reason into the Enrollment Report
 2015-10-07 07:57:41 -04:00
Waheed Ahmed
2dd26a8d60 Fixed split get_courses. 
PLAT-747
 2015-10-07 16:39:53 +05:00
Muhammad Shoaib
f876f3f457 SOL-1267 
-fixed the bug in the accordion of the e-commerce html file
 2015-10-07 13:58:46 +05:00
raeeschachar
ee0cd9e873 Merge pull request #10011 from edx/raees-chrome-bok-choy-test-undo-changes 
Fixed 2 bok choy tests failing on chrome
 2015-10-07 12:07:52 +05:00
Afeef Janjua
ee203ed930 Merge pull request #10015 from edx/afeef/bugfix/tnl-3258-fix-confirm-navigation-popup-unmodified-group-configurations 
TNL-3258 Reset group configuration model when a child content group i…
 2015-10-07 11:13:46 +05:00
Chris Dodge
8609f80db0 Add email and manual enrollment reason into the Enrollment Report 2015-10-06 22:34:54 -04:00
Clinton Blackburn
c76e2492ec Merge pull request #10070 from edx/clintonb/credit-receipt-fix 
Fix broken receipt page
 2015-10-06 21:35:47 -04:00
Clinton Blackburn
be4f37f26b Credit fixes 
- Fixed receipt page button
- Fixed message on dashboard

ECOM-2492
 2015-10-06 17:51:39 -04:00
Clinton Blackburn
3182394cd7 Merge pull request #10063 from edx/hotfix/2015-10-06a 
Credit Hotfix
 2015-10-06 16:29:24 -04:00
Edward Zarecor
8afb36057b Merge pull request #10060 from edx/release 
Release
 2015-10-06 15:51:43 -04:00
Mark Hoeber
dc5ed68420 Merge pull request #10062 from edx/markhoeber-doc2326 
Add Video File Size Warning to Upload Template
 2015-10-06 15:50:11 -04:00
Clinton Blackburn
d9007455c1 Removed mailing address from provider request 
Given the time crunch this is the safest option for dealing with newlines.

ECOM-2492
 2015-10-06 14:15:14 -04:00
raeeschachar
cb02b62b7c Fixed test_undo_changes and test_manaul_change that were failing on Chrome 2015-10-06 23:07:49 +05:00
Mark Hoeber
34820aba24 Add Video File Size Warning to Upload Template 2015-10-06 13:59:40 -04:00
wajeeha-khalid
574807f051 Update accounts.rst 2015-10-06 21:59:20 +05:00
Clinton Blackburn
2653f0ad6b Fixed credit form submission bug 
Firefox requires the form to be attached to a DOM element

ECOM-2492
 2015-10-06 11:49:45 -04:00
Edward Zarecor
7427d82c65 Merge pull request #10058 from edx/hotfix/2015-10-06b 
Hotfix/2015 10 06b
 2015-10-06 11:18:58 -04:00
Robert Raposa
8954d00a77 Merge pull request #10054 from edx/robrap/im-an-author 
Add self to AUTHORS
 2015-10-06 11:08:46 -04:00
Matt Drayer
ada5fda935 Merge pull request #10056 from edx/asadiqbal08/SOL-1255 
asadiqbal08/SOL-1255: Remove all character limits in signatory fields
 2015-10-06 10:59:50 -04:00
wajeeha-khalid
c17078b85d Merge pull request #10009 from edx/jia/MA-1341 
MA-1341 User Account: returned updated value from Patch
 2015-10-06 19:26:42 +05:00
wajeeha-khalid
9472f70d64 MA-1341 User Account: returned updated value from Patch 
updated docstring
 2015-10-06 17:45:49 +05:00
asadiqbal
0b28fd23f8 SOL-1225 2015-10-06 14:52:38 +05:00
Robert Raposa
10e0206610 Add self to AUTHORS 2015-10-06 04:30:57 -04:00
Calen Pennington
7e55437db6 Allow retry_failed_photo_verifications to take a list of receipt_ids to retry 2015-10-05 22:46:45 -04:00
Calen Pennington
e57619b007 When retrying, use the previously copied photo_id 2015-10-05 22:46:45 -04:00
Peter Fogg
7f4bd900d1 Add management command to set SoftwareSecure verification status. 2015-10-05 22:46:45 -04:00
zubair-arbi
c78b1be515 add new column 'copy_id_photo_from' for 'SoftwareSecurePhotoVerification' model to track initial verification with 'photo_id_key' 2015-10-05 22:46:45 -04:00
Peter Fogg
87e3988c6a Merge pull request #10042 from edx/peter-fogg/flaky-tests 
Mark flaky tests (TNL-3514 and TNL-3515).
 2015-10-05 16:13:30 -04:00
Clinton Blackburn
17f0193362 Merge pull request #10044 from edx/merge-release-into-master 
Merging changes for hotfix/2015-10-05
 2015-10-05 16:11:31 -04:00
Brian Beggs
143ca802ae Merge pull request #10043 from edx/revert-9934-usman/use-included-staticfiles-app 
Revert "Upgrade django-pipeline and staticfiles"
 2015-10-05 15:29:17 -04:00
Bill DeRusha
fe23052511 Merge pull request #9979 from edx/bderusha/boardman-traffic 
Add IP to all python Segment tracking calls
 2015-10-05 14:55:55 -04:00
Peter Fogg
dbeb9beb2d Mark flaky tests (TNL-3514 and TNL-3515). 2015-10-05 14:47:25 -04:00
Clinton Blackburn
f967cfce8b Merged release to master 
Resolved conflicts from hotfix-2015-10-05
 2015-10-05 14:46:32 -04:00
Brian Beggs
0ca679e244 Revert "Upgrade django-pipeline and staticfiles" 2015-10-05 14:40:28 -04:00
Ned Batchelder
b7cf392009 Merge pull request #10027 from edx/ned/better-immutable-field-exception 
Include a message in the teams.ImmutableMembershipFieldException
 2015-10-05 14:36:03 -04:00
Clinton Blackburn
882c2fa326 Merge pull request #10030 from edx/hotfix/2015-10-05 
Hotfix for 2015-10-05
 2015-10-05 14:34:17 -04:00
Clinton Blackburn
775ca26c3a Limited grades to seven characters 
ECOM-2433
 2015-10-05 11:58:08 -04:00
Matt Drayer
0a347e1234 Merge pull request #10013 from edx/asadiqbal08/SOL-1262 
SOL-1262 Update Studio Button Copy
 2015-10-05 09:46:57 -04:00
Clinton Blackburn
0dba843608 Multiple credit fixes 
- Added support for Unicode characters when creating the signature
- Using <textarea> for form data to support newline characters
- Generating form with jQuery instead of relying on existing DOM element
- Removed duplicated credit request code
- Corrected spaing on dashboard
- Enabled functionality by default

Dashboard cleanup
-- Cleaned styles
-- Added wrapper class to use for hiding the actions
-- Cleaned JS toggling of error container
-- Corrected dashboard and receipt text

ECOM-2172
 2015-10-05 09:35:10 -04:00
Matt Drayer
1d121b81c6 Merge pull request #10012 from edx/ziafazal/MAYN-129 
MAYN-129: additional payment details were not shown
 2015-10-05 07:56:57 -04:00
Matt Drayer
86e523e667 Merge pull request #10018 from edx/saleem-latif/MAYN-141 
MAYN-141: WL Favicon not displaying correctly
 2015-10-05 07:52:58 -04:00
Matt Drayer
890a675054 Merge pull request #10005 from edx/saleem-latif/MAYN-131-complete-fix 
MAYN-131: Update Unsupported Browser message
 2015-10-05 07:50:38 -04:00
Chris Dodge
466064575b bump to edx-proctoring v. 0.9.16 2015-10-05 07:32:37 -04:00
asadiqbal
aec1b95945 SOL-1262 2015-10-05 16:28:28 +05:00