Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,342 Commits 1 Branch 0 Tags
93970f347347d930f49508a7d35de9dbca8bb408
Commit Graph

14396 Commits

Author SHA1 Message Date
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
Waheed Ahmed
817a1585ef Merge pull request #12543 from edx/waheed/ecom-2361-complete-order-history-for-students 
Complete Order History tab for students on account settings page
 2016-06-08 22:53:59 +05:00
Brian Jacobel
6589139e29 Merge pull request #12266 from edx/bjacobel/requirejs-sync 
Load requirejs bundles synchronously
 2016-06-08 13:49:18 -04:00
Ahsan Ulhaq
d31b7cbd68 Complete Order History area for students 
ECOM-2361
 2016-06-08 21:45:07 +05:00
Waheed Ahmed
b2f21ef4f3 Complete Order History tab for students on account settings page. 
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
Eric Fischer
d19098bae2 Update default cohort language (#12695) 2016-06-08 11:59:19 -04: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
Tasawer
38104eb6ed Update Receipt page 
ECOM-4559
 2016-06-08 18:00:47 +05:00
Eric Fischer
1d0e93a0fa Merge pull request #12608 from edx/efischer/add_edx 
Correct references to HtmlUtils in underscore files
 2016-06-07 14:48:33 -04:00
Calen Pennington
c42c86aef0 Cleanup uploaded files after badging tests 2016-06-07 13:27:11 -04:00
Eric Fischer
0c3468a067 Use edx.HtmlUtils properly in incourse_reverify_view 2016-06-07 13:15:23 -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
AlasdairSwan
194d33ea01 Merge pull request #12600 from edx/alasdair/ECOM-4216-style-the-program-details-header 
ECOM-4216 Styling the header
 2016-06-07 11:53:50 -04:00
AlasdairSwan
a7cd4daee5 ECOM-4216 Styling the header 2016-06-07 10:53:00 -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
Andy Armstrong
d8a8bacd91 Merge pull request #12639 from edx/andya/discussion-board-header 
Add styling for content headers to the edx-platform
 2016-06-06 13:46:40 -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
Andy Armstrong
3b05398022 Address code review feedback 2016-06-06 12:36:54 -04:00
Douglas Hall
95054e1a03 Merge pull request #12649 from edx/ibrahimahmed443/MAYN-280-explore-new-courses-button-fix 
fix 'explore new courses' button overlap issue
 2016-06-06 09:58:57 -04:00
Tasawer
c6a6cdd72d Quality fixes. 
ECOM-4214
 2016-06-06 16:50:16 +05:00
Ibrahim Ahmed
0a84b65dcb Merge branch 'master' into ibrahimahmed443/MAYN-280-explore-new-courses-button-fix 2016-06-06 15:55:21 +05: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
Douglas Hall
55eba94e6b Merge pull request #12659 from edx/release 
Merging Hotfix Release 2016-06-03 back to master
 2016-06-04 07:16:45 -04:00
Renzo Lucioni
ff9e5f3f27 Make program details page 404 if no program data found 2016-06-03 17:57:55 -04:00
Andy Armstrong
749f9650ff DO NOT MERGE: show UX reference pages on sandboxes 2016-06-03 16:34:20 -04:00
Andy Armstrong
199c4c350b Support content headers for Pattern Library pages 2016-06-03 16:34:20 -04:00
Douglas Hall
ea654200f5 Put shopping cart bulk purchase behind a settings flag 2016-06-03 14:41:32 -04:00
Matt Drayer
c2c2a67753 mattdrayer/WL-493: Enable bulk purchase via Otto for unauthenticated users 2016-06-03 13:00:45 -04:00
Renzo Lucioni
93ba637e5f Merge pull request #12638 from edx/renzo/fix-failing-a11y 
Fix program details a11y test
 2016-06-03 13:00:13 -04:00
Renzo Lucioni
9c4a3dc9c7 Fix program details a11y test 2016-06-03 11:32:07 -04:00