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

37304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sofiya Semenova
1cda718f8f Merge pull request #12611 from edx/ssemenova/icon2 
Changing icon tags from i to span 

TNL-4692
 2016-06-07 13:36:57 -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
Douglas Hall
98a392c301 Merge pull request #12683 from edx/douglashall/LOC-78/upgrade_lti_consumer_to_1_0_9 
LOC-78 Upgrade xblock-lti-consumer to fix i18n LTI launch parameter
 2016-06-07 11:20:26 -04:00
Michael Frey
c8d3e88a90 Merge pull request #12682 from edx/master-test 
Release June 7, 2016
 2016-06-07 11:18:20 -04:00
AlasdairSwan
a7cd4daee5 ECOM-4216 Styling the header 2016-06-07 10:53:00 -04:00
ssemenova
c1f793172f change icon tags from i to span 
TNL-4692
 2016-06-07 10:52: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
raeeschachar
6b7a094dd4 Merge pull request #12660 from edx/raees/bokchoy_test_fields_my_public_profile 
Raees/bokchoy test fields my public profile
 2016-06-07 19:35:58 +05:00
Douglas Hall
8ce63fef9b LOC-78 Upgrade xblock-lti-consumer to fix i18n LTI launch parameter 2016-06-07 10:24:02 -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
Christina Roberts
267e67d9e3 Merge pull request #12677 from edx/christina/update-ora-version 
Update for ora xblock static file handling.
 2016-06-07 10:05:55 -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
Michael Frey
7cf984d644 Merge branch 'release' into master-test 2016-06-07 09:26:55 -04:00
Calen Pennington
d49e1e91cb Separate discussion blackout tests into a separate ModulestoreTestCase 2016-06-07 09:16:29 -04:00
raeeschachar
5110480dce Fixed test fields on my public profile 2016-06-07 08:52:30 -04:00
Michael Frey
5885696498 Merge pull request #12648 from edx/rc/2016-06-07 
Release Candidate rc/2016-06-07
 2016-06-07 08:01:30 -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
d76f31bc90 Merge pull request #12627 from cpennington/test-certificates-shared-modulestore-test-case 
Don't modify courses inside SharedModuleStoreTestCase test methods in…
 2016-06-06 15:50:47 -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
Calen Pennington
4367460709 Merge pull request #12668 from cpennington/test-tracker-global-settings 
Use copies of tracker settings dicts in tests so that changes don't l…
 2016-06-06 15:26:20 -04:00
Renzo Lucioni
ffd1e29dd1 Show Programs tab on program detail pages 2016-06-06 15:00:14 -04:00
Ben Patterson
b9a38db626 Merge pull request #12647 from edx/benp/pa11ycrawler-update-AC-488 
AC-488. Use tip of pa11ycrawler repo to fix intermittent JSON decodin…
 2016-06-06 14:34:02 -04:00
clrux
1786e25bf2 Merge pull request #12665 from edx/clrux/ac-490 
AC-490 using latest a11y checks and ignoring section test
 2016-06-06 14:26:17 -04:00
cahrens
29db293054 Update for ora xblock static file handling. 
TNL-4710
 2016-06-06 14:25:58 -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
e93d112c04 Make UrlResetMixin.reset_urls a public method (so that it can be used inside test methods) 2016-06-06 13:27:38 -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
3207311e50 Use copies of tracker settings dicts in tests so that changes don't leak between tests 2016-06-06 13:19:52 -04:00
Chris Rodriguez
6be4f84aff Using latest version from NPM and ignoring section tests for now 2016-06-06 13:10:51 -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
Matt Drayer
eb6a1dbd6a Merge pull request #12664 from edx/rc/2016-06-07-mattdrayer 
mattdrayer/WL-493: Enable bulk purchase via Otto for unauthenticated users
 2016-06-06 11:25:26 -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
Awais Qureshi
ab75b402bd Merge pull request #12574 from edx/awais786/ECOM-4214-support-tool-modifications 
Remove support tool limitation based on verified enrollment deadline
 2016-06-06 18:01:51 +05: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
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
Douglas Hall
c47a117771 Merge pull request #12640 from edx/hotfix/2016-06-03 
WL-494 MAYN-285 Hotfix Release Candidate 2016-06-03
 2016-06-03 20:31:07 -04:00