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

37341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Eric Fischer
2241ca59b0 remove flaky decorator (#12655) 2016-06-08 13:22:33 -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
Tasawer Nawaz
6bd35fd6c6 Merge pull request #12644 from edx/tasawer/story/ecom-4559-update-receipt-page 
Update Receipt page
 2016-06-08 23:28:15 +08:00
Peter Fogg
905c5c567c Merge pull request #12692 from edx/peter-fogg/bulk-change-enrollment-help-text 
Correct help text for the bulk_change_enrollment command.
 2016-06-08 11:04:25 -04:00
Christina Roberts
1f26cd2ec6 Merge pull request #12681 from edx/christina/delete-landing 
Delete old cruft from 2012/2013.
 2016-06-08 10:18:53 -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
Peter Fogg
17fb925cd4 Correct help text for the bulk_change_enrollment command. 2016-06-08 09:59:59 -04:00
Tasawer
38104eb6ed Update Receipt page 
ECOM-4559
 2016-06-08 18:00:47 +05:00
alisan617
849e3b7911 Merge pull request #12686 from edx/alisan/author 
adding myself to the author file
 2016-06-07 22:02:28 -04:00
Eric Fischer
ed2644a115 Bump installed edx-proctoring version (#12669) 2016-06-07 18:17:03 -04:00
Brian Jacobel
61e64fbfdf Merge pull request #12615 from edx/bjacobel/focus-test-to-bokchoy 
Move the flaky focus unit test removed in #12433 to a bok choy test
 2016-06-07 16:37:33 -04: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
61a5e7137f Merge pull request #12629 from cpennington/cleanup-files-badging-tests 
Cleanup uploaded files after badging tests
 2016-06-07 14:24:35 -04:00
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
cahrens
1fa4319140 Delete old cruft from 2012/2013. 2016-06-07 13:34:31 -04:00
Calen Pennington
c42c86aef0 Cleanup uploaded files after badging tests 2016-06-07 13:27:11 -04:00
Eric Fischer
50d314d9a2 Add Backbone global to jshintrc 
Underscore was previously defined, it seemed odd to not have Backbone as well.
 2016-06-07 13:15:23 -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
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
Brian Jacobel
57b4cb7fb3 Move the flaky focus unit test removed in #12433 to a bok choy test 2016-06-07 10:00:49 -04:00
alisan617
0870373e5f adding myself to the author file 2016-06-07 09:59:31 -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