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
Cliff Dyer
2337b80af5 Merge pull request #12722 from edx/tnl/splittest-zerogroup-test 
modified tests to directly address split test group 0 issues.
 2016-06-13 13:26:29 -04:00
Awais
112aa71fe0 Adding logic to check if cert is invalidate then user cannot see the regen button. 
ECOM-4217
 2016-06-11 15:26:30 +05:00
Robert Raposa
84726d6e1b Merge pull request #12723 from edx/release 
Merge hotfix-2016-06-10 release into master
 2016-06-10 16:01:23 -04:00
clrux
0aa87b8a22 Merge pull request #12452 from edx/clrux/ac-414 
AC-414 adding headings as first child to sections
 2016-06-10 15:23:10 -04:00
J. Cliff Dyer
2696650437 modified tests to directly address split test group 0 issues. 2016-06-10 17:59:02 +00:00
Robert Raposa
d54f79f5bf Switch dashboard from GET to POST. 2016-06-10 13:14:19 -04:00
Chris Rodriguez
257903fe15 AC-414 adding headings as first child to sections 2016-06-10 12:30:03 -04:00
J. Cliff Dyer
4212a3c326 Ensure split-test group zero content is protected 
TNL-4771
 2016-06-10 14:00:17 +00:00
David Ormsbee
249467c9bb Merge pull request #12527 from cpennington/enable-concurrency-in-lms-tests 
Enable concurrency (but not randomization) in LMS unit tests
 2016-06-10 09:19:59 -04:00
PaulWattenberger
f5b42c8955 Initial lms changes for Sailthru (#12706) 
* Initial lms changes for Sailthru

* Fix identified code quality issues

* Fix migration failure

* Fix code quality identified issue
 2016-06-09 16:21:11 -04:00
Calen Pennington
a7ed99ba79 Add __init__.py to tests folders to make them proper modules 2016-06-09 14:38:33 -04:00
Renzo Lucioni
1a7e1a3125 Merge pull request #12700 from edx/renzo/local-program-completion 
Use cached data to find completed programs on LMS
 2016-06-09 13:58:16 -04:00
Renzo Lucioni
6d7938fde0 Use cached data to find completed programs on LMS 
These changes improve the performance of the LMS' program certification task. They also reduce strain on the programs service, especially when attempting to award program certificates to large numbers of students. ECOM-4490.
 2016-06-09 09:57:09 -04:00
PaulWattenberger
9781685719 Revert "Pwattenberger/sailthru" (#12701) 2016-06-08 23:03:22 -04:00
PaulWattenberger
ca02235e64 Pwattenberger/sailthru (#12646) 
* Initial commit of Sailthru lms changes

* Field mapping changes for Sailthru integration

* Merge fix

* Add users to Sailthru list on registration

* FIx minor code format issues

* Several updates based on code review feedback

* Updates based on recomendations from Sailthru

* Clean up unit tests

* Fix last login

* Updates based on code review feedback

* Updates based on code review feedback

* Fix comment

* Cleanup
 2016-06-08 19:38:29 -04:00
Calen Pennington
7d32129b9f Use the Django TestClient for branding unit tests, so that middleware is cleaned up properly 2016-06-08 16:43:31 -04:00
Calen Pennington
fc1e0b6637 Use the Django TestClient for course_creator unit tests, so that middleware is cleaned up properly 2016-06-08 16:43:31 -04:00
Calen Pennington
411f1f7964 Use the Django TestClient for forum unit tests, so that middleware is cleaned up properly 2016-06-08 16:43:31 -04:00
Calen Pennington
57f7271b0b Use the Django TestClient for courseware unit tests, so that middleware is cleaned up properly 2016-06-08 16:43:30 -04:00
Calen Pennington
93970f3473 Allow edxmako to be passed an explicit request to create the RequestContext from 2016-06-08 16:35:25 -04:00
Calen Pennington
25c4398125 Convert edxmako to use django_crum to get the current request 2016-06-08 16:35:24 -04:00
Calen Pennington
e275dfbcdd Merge pull request #12693 from cpennington/reset-language-discussion 
Reset current language after discussion tests, so that other language…
 2016-06-08 16:24:12 -04:00
Simon Chen
7a300483b7 ECOM-4640 make sure honor cert students also see generate cert button (#12687) 2016-06-08 14:58:31 -04:00
Ahsan Ulhaq
b00ce0282a Merge pull request #12679 from edx/ahsan/ECOM-4544-Financial-Assistance-Form-Updates 
Financial Assistance Form Updates
 2016-06-08 23:53:05 +05:00
Ahsan Ulhaq
d31b7cbd68 Complete Order History area for students 
ECOM-2361
 2016-06-08 21:45:07 +05:00
Ahsan Ulhaq
7e88a88604 Financial Assistance Form Updates 
ECOM-4544
 2016-06-08 21:18:49 +05:00
Calen Pennington
c4c4ee31c2 Reset current language after discussion tests, so that other languages don't leak into tests that don't use the LocaleMiddleware 2016-06-08 10:07:49 -04:00
Calen Pennington
c42c86aef0 Cleanup uploaded files after badging tests 2016-06-07 13:27:11 -04:00
Calen Pennington
df2f347ac2 Merge pull request #12670 from cpennington/reset-urls-favicon-tests 
Reset urls favicon tests
 2016-06-07 12:02:45 -04:00
Calen Pennington
f0804390e5 Merge pull request #12673 from cpennington/reset-signature-validator-mocks 
Mock SignatureValidator.verify using patch so that the mock is unset …
 2016-06-07 10:47:42 -04:00
Calen Pennington
12d239801e Merge pull request #12628 from cpennington/test-i18n-reset-translations 
Test i18n reset translations
 2016-06-07 10:44:07 -04:00
Calen Pennington
940d38e2e5 Merge pull request #12671 from cpennington/separate-discussion-blackout-tests 
Separate discussion blackout tests into a separate ModulestoreTestCase
 2016-06-07 10:09:02 -04:00
Calen Pennington
c124fb343b Make test_favicon tests work independently 2016-06-07 10:02:44 -04:00
Calen Pennington
1537f0407a Mock SignatureValidator.verify using patch so that the mock is unset at the end of the test 2016-06-07 10:01:40 -04:00
Calen Pennington
d49e1e91cb Separate discussion blackout tests into a separate ModulestoreTestCase 2016-06-07 09:16:29 -04:00
Eric Fischer
faa7f544d2 Bulk Email Cohorts (#12602) 
Adds cohorts as valid bulk email targets.
 2016-06-06 16:32:59 -04:00
Renzo Lucioni
740266bd82 Merge pull request #12675 from edx/renzo/persist-programs-nav 
Show Programs tab on program detail pages
 2016-06-06 16:30:55 -04:00
Calen Pennington
8518ce8f30 Merge pull request #12674 from cpennington/assert-item-equality-in-ccx-tests 
Only assert on item-equality when checking ccx course modules
 2016-06-06 15:28:07 -04:00
Calen Pennington
5cc40f06fc Merge pull request #12672 from cpennington/separate-courseinfo-tests 
Separate CourseInfo tests into a separate ModulestoreTestCase
 2016-06-06 15:27:40 -04:00
Renzo Lucioni
ffd1e29dd1 Show Programs tab on program detail pages 2016-06-06 15:00:14 -04:00
Renzo Lucioni
f8be1ed168 Merge pull request #12657 from edx/renzo/include-listing-url 
Include program listing URL on detail pages
 2016-06-06 14:25:43 -04:00
Calen Pennington
bdf08fc7e2 Separate CourseInfo tests into a separate ModulestoreTestCase 2016-06-06 13:57:56 -04:00
Renzo Lucioni
f913cc52c4 Include program listing URL on detail pages 
Replaces the hardcoded URL in favor of a URL passed by the server.
 2016-06-06 13:45:18 -04:00
Calen Pennington
acc9bca390 Merge pull request #12626 from cpennington/reset-parameters-fake-payment-tests 
Reset client post parameters after each payment_fake test, because th…
 2016-06-06 13:25:22 -04:00
Calen Pennington
e6c235a4b8 Only assert on item-equality when checking ccx course modules 2016-06-06 13:09:52 -04:00
Tasawer
c6a6cdd72d Quality fixes. 
ECOM-4214
 2016-06-06 16:50:16 +05:00
Matt Drayer
d655e6b6f6 mattdrayer/WL-493: Enable bulk purchase via Otto for unauthenticated users 2016-06-06 07:45:59 -04:00
Douglas Hall
372c8f1d70 Merge pull request #12658 from edx/release 
Merging hotfix/2016-06-07 release to rc/2016-06-07
 2016-06-06 07:31:11 -04:00
Matt Drayer
920fba502c Merge pull request #12642 from edx/mattdrayer/WL-493 
mattdrayer/WL-493: Enable bulk purchase via Otto for unauthenticated users
 2016-06-05 21:54:50 -04:00
Renzo Lucioni
9b58bded9f Merge pull request #12650 from edx/renzo/no-program-data 
Make program details page 404 if no program data found
 2016-06-04 23:15:35 -04:00