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

33246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Pinch
ec023c22e6 Merge pull request #10034 from mitocw/fix/gdm/hide_block_from_ccx 
Fixed visibility of hidden blocks in CCX schedule
 2015-10-08 08:54:02 -04:00
Matt Drayer
994f8bd7b4 Merge pull request #10075 from edx/saleem-latif/SOL-1266 
SOL-1266: Display course numbers in certificate configuration
 2015-10-08 08:30:40 -04:00
Matt Drayer
6b93532c63 Merge pull request #10077 from edx/ziafazal/SOL-1258 
SOL-1258: Percentage appearing wrong for specific numbers
 2015-10-08 08:28:08 -04:00
Usman Khalid
f6193c872e Merge pull request #10059 from edx/usman/use-included-staticfiles-app 
Upgrade django pipeline to v.1.5.3.
 2015-10-08 16:10:36 +05:00
Zia Fazal
14c310017b minimum score percentage rounded 
round before converting a decimal into integer
 2015-10-08 12:01:40 +05:00
Saleem Latif
9799d15373 course-number and override course-number added in Certificate Editor View 2015-10-08 11:29:14 +05:00
frances botsford
416ab258ee Merge pull request #9879 from edx/frances/cleanup-on-demand-box-style 
Align On-demand cert message with pattern library styles
 2015-10-07 16:39:48 -04:00
Eric Fischer
0d2dc431c9 Merge pull request #10066 from edx/efischer/edit_studio_test 
TNL-3305 HTML Editing Bok Choy Test
 2015-10-07 15:01:13 -04:00
Calen Pennington
624bc9a734 Merge pull request #9911 from cpennington/fix-plat-858 
Delete DIRECT_ONLY_CATEGORIES from both draft and published branches by default
 2015-10-07 14:41:40 -04:00
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
Giovanni Di Milia
f2a1d0e54b Coaches can't see blocks "hide from students" 
If a block is marked as "hide from students" cannot be seen in the
CCX schedule
 2015-10-07 09:07:29 -04:00
Giovanni Di Milia
aa93585e4e Added myself to AUTHORS 2015-10-07 09:07:28 -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
Calen Pennington
f8f9b91c16 Make unpublish raise the same errors in split and old-mongo when asked to unpublish a DIRECT_ONLY_CATEGORY 2015-10-06 16:54:34 -04:00
Calen Pennington
e65730b9d2 Rationalize all cases around direct-only categories (both as blocks and parents) and delete 2015-10-06 16:54:34 -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
Usman Khalid
111a45664c Use settings.PIPELINE_ENABLED instead of settings.FEATURES[USE_DJANGO_PIPELINE]. 2015-10-06 19:52:38 +05:00
Usman Khalid
dbcd1bf430 Use django.contrib.staticfiles instead of django-staticfiles. 
TNL-3137
 2015-10-06 19:52:38 +05:00
Usman Khalid
130bbd7993 Upgrade to django-pipeline v1.5.3. 
TNL-3137
 2015-10-06 19:52:38 +05: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