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

14433 Commits

Author SHA1 Message Date
Chris
ff242a3eac Merge pull request #12694 from edx/clrux/ac-454-repeat 
AC-454 visual indicator in video menus + safe transcripts
 2016-06-14 08:46:47 -04:00
Chris Rodriguez
55d84d34b8 AC-454 adding visual clarify for selected menu options 2016-06-14 07:53:15 -04:00
Awais Qureshi
a361d44bfd Merge pull request #12666 from edx/awais786/ECOM-4217-certs-invalidate-by-instructor 
Adding logic to check if cert is invalidate then user cannot see the …
 2016-06-14 13:50:17 +05:00
Simon Chen
8d672bc832 ECOM-3206 allow run selection and enrollment (#12685) 2016-06-13 15:08:00 -04:00
Brian Jacobel
781a20497b Merge pull request #12735 from edx/bjacobel/dsc-image-overflow 
Fix overflowing images in forum posts/responses
 2016-06-13 14:25:42 -04:00
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
Brian Jacobel
5e0e337654 Fix overflowing images in forum posts/responses 2016-06-13 12:30:13 -04:00
Sofiya Semenova
0431bacbe1 Merge pull request #12656 from edx/ssemenova/tabindex 
Removing instances of positive integer tab index values
 2016-06-13 09:23:48 -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
ssemenova
e7e1f647aa replace positive tab index values in the platform 
TNL-4705
 2016-06-10 15:35:51 -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
AlasdairSwan
1ff0a3b45e Merge pull request #12709 from edx/alasdair/ECOM-4469-modals-sass-cleanup 
Clean up the help tab Sass included on Pattern Library pages
 2016-06-10 06:22:23 -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
AlasdairSwan
a856325731 Stay Clean 2016-06-09 14:49:37 -04:00
Calen Pennington
a7ed99ba79 Add __init__.py to tests folders to make them proper modules 2016-06-09 14:38:33 -04:00
Ned Batchelder
b4248d28e1 Merge pull request #12707 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-06-09 14:25:09 -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
Calen Pennington
cfd1620703 Merge pull request #12630 from cpennington/dont-leak-current-requests-in-tests 
Dont leak current requests in tests
 2016-06-09 12:03:34 -04:00
Ned Batchelder
78f2d9e1eb Update translations (autogenerated message) 
Update translations (autogenerated message)
 2016-06-09 12:00:04 -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
Muhammad Ammar
6eef8ee944 Merge pull request #12663 from edx/ammar/fedx-198-enforce-heading-problems 
enforce display name in CAPA problems
 2016-06-09 17:34:06 +05:00
muhammad-ammar
8024bae255 enforce display name in CAPA problems 
FEDX-198
 2016-06-09 16:42:19 +05: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
437b249d68 Use django_crum to access the current request in request_cache 2016-06-08 16:35:25 -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
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