Commit Graph

39204 Commits

Author SHA1 Message Date
Nimisha Asthagiri
0bbb49bdd7 Merge pull request #10871 from edx/mobile/mobile-api-updates
Update Mobile API for PDF certificates and Course Detail
2015-12-07 20:53:28 -05:00
chrisndodge
b4411dde08 Merge pull request #10872 from edx/bderusha/hcfa-update-1
Update spacing in FA form
2015-12-07 18:48:45 -05:00
Nimisha Asthagiri
a5ddc3bf0a Update Mobile API for PDF certificates and new Course Detail format.
MA-1767
2015-12-07 17:38:42 -05:00
Bill DeRusha
b05488f826 Update spacing in FA form 2015-12-07 17:34:58 -05:00
David Baumgold
2e33499819 Fall back on core asset for footer logo
if the staticfiles finder can't find the one that the footer API returns
2015-12-07 16:21:55 -05:00
Christine Lytwynec
b490bd168a Merge pull request #10832 from edx/clytwynec/auto-auth-redirect
Clytwynec/auto auth redirect
2015-12-07 15:56:23 -05:00
AlasdairSwan
cb37d0a3f4 Merge pull request #10868 from edx/alasdair/fa-form-rjs-bundle
Added fa factory to rjs bundler
2015-12-07 15:55:18 -05:00
AlasdairSwan
4117064a2f Added fa factory to rjs bundler 2015-12-07 15:05:38 -05:00
clrux
10d2e81833 Merge pull request #10866 from edx/clrux/ac-245
Fix: correcting play/skip icon for bumper
2015-12-07 15:04:42 -05:00
Peter Fogg
c84258d84e Merge pull request #10858 from edx/bderusha/hcfa-language
Update copy for HCFA & don't show audit certs
2015-12-07 14:58:53 -05:00
David Baumgold
00a33a8338 Merge pull request #10865 from edx/disable-footer-on-courseware-chromeless-rc
Disable footer for courseware-chromeless.html
2015-12-07 14:55:08 -05:00
Christine Lytwynec
df638088ca pr fixes 2015-12-07 14:21:00 -05:00
Bill DeRusha
692e5d777a Update copy for HCFA
Update Zendesk ticket to correctly add group.

Add logic to hide new audit certs
2015-12-07 14:18:55 -05:00
David Baumgold
ad95413c79 Merge pull request #10855 from edx/disable-footer-on-login-page
Use `disable_footer` variable to disable footer on login page
2015-12-07 14:07:47 -05:00
Chris Rodriguez
4161ae9980 Tests 2015-12-07 14:05:07 -05:00
Chris Rodriguez
bb3ac95f24 Fix: correcting play/skip icon for bumper 2015-12-07 14:05:07 -05:00
David Baumgold
1a2ffbda68 Disable footer for courseware-chromeless.html 2015-12-07 13:54:23 -05:00
Jim Abramson
98b63a79fc Merge pull request #10862 from edx/jsa/programs-token-endpoint
Implement an endpoint to get id_tokens for programs.
2015-12-07 13:49:31 -05:00
Sarina Canelake
a753d1efcf Merge pull request #10856 from edx/remove-unused-translations
Remove outdated language files
2015-12-07 13:36:18 -05:00
clrux
678686177c Merge pull request #10801 from edx/clrux/ac-263
Xmodule: darkening 'correct' green color for WCAG AA requirements
2015-12-07 13:28:00 -05:00
jsa
2fbfcfd2ff Implement an endpoint to get id_tokens for programs.
ECOM-2440
2015-12-07 12:52:00 -05:00
Adam
0f3a0946dd Merge pull request #10859 from edx/mushtaq/moment-requirejs-loading-fix
Load requirejs-config before module-js
2015-12-07 12:20:56 -05:00
Chris Rodriguez
c7ade04090 Xmodule: darkening 'correct' green color for WCAG AA requirements 2015-12-07 11:59:57 -05:00
Christine Lytwynec
9f5273a7d1 pr fixes 2015-12-07 11:50:41 -05:00
Mushtaq Ali
e49f90ed25 Merge pull request #10804 from edx/mushtaq/tnl3825-fix-show-user-course-specific-team
Fix display course specific user teams
2015-12-07 21:44:56 +05:00
Syed Hassan Raza
9ff080f650 Course_key naming convention 2015-12-07 21:24:50 +05:00
chrisndodge
df3a2e3e3a Merge pull request #10857 from edx/disable-footer-on-login-page-rc
Use `disable_footer` variable to disable footer on login page
2015-12-07 11:19:31 -05:00
clrux
33928c502c Merge pull request #10797 from edx/clrux/ac-255
LMS: darkening footer copyright text for WCAG
2015-12-07 11:16:37 -05:00
clrux
62039f70e3 Merge pull request #10798 from edx/clrux/ac-256
Xmodule: syncing link color with LMS
2015-12-07 11:16:15 -05:00
clrux
5cf41a0586 Merge pull request #10800 from edx/clrux/ac-261
Xmodule: darkening gray text for WCAG AA requirements
2015-12-07 11:15:42 -05:00
David Baumgold
f4023e821f Use disable_footer variable to disable footer on login page
Rather than Mako block hack
2015-12-07 10:39:42 -05:00
Sarina Canelake
e917c7f5a6 Remove outdated language files 2015-12-07 10:28:27 -05:00
David Baumgold
72fc25ae12 Use disable_footer variable to disable footer on login page
Rather than Mako block hack
2015-12-07 10:26:47 -05:00
Sarina Canelake
337eabbb00 Merge pull request #10836 from edx/kill-foldit
Remove 'FoldIt' XModule
2015-12-07 10:18:40 -05:00
Mushtaq Ali
1d57ef220e Fix course specific user teams in teams dashboard page 2015-12-07 18:46:01 +05:00
chrisndodge
6b6cbfa484 Merge pull request #10843 from edx/cdodge/address-honor-mode-breakage
White Labels need to still use the 'honor' course mode even through t…
2015-12-07 08:39:26 -05:00
Mushtaq Ali
06442036ce Load requirejs before module-js 2015-12-07 16:26:37 +05:00
Syed Hasan raza
4f131fec9c Merge pull request #10806 from edx/shr/bug/TNL-3076-Handout-links-not-updated-at-import
Update handout link with current course_id
2015-12-07 14:13:47 +05:00
Awais Qureshi
7b21674852 Merge pull request #10751 from edx/awais786/ECOM-2866-new-checkout-page-for-testing
Awais786/ecom 2866 new checkout page for testing
2015-12-07 14:12:08 +05:00
Syed Hassan Raza
36db063566 set path explicitly for storing cookie 2015-12-07 14:10:58 +05:00
Syed Hassan Raza
706716694a Update handout link with current course_id 2015-12-07 13:21:10 +05:00
Eugeny Kolpakov
e908b569eb Merge pull request #10823 from edx/hash_update/XBlock
Dependency update: Bumped XBlock version
2015-12-07 10:37:53 +07:00
Chris Dodge
1592a32de3 White Labels need to still use the 'honor' course mode even through the default has changed 2015-12-06 20:36:26 -05:00
Sarina Canelake
af9cff47e5 Merge pull request #10837 from edx/kill-licenses
Remove "Licenses" djangoapp
2015-12-06 11:39:15 -05:00
Sarina Canelake
84a96e40c4 Remove 'Fold It' XModule 2015-12-06 11:38:05 -05:00
Sarina Canelake
af8a0bb676 Remove "Licenses" djangoapp 2015-12-06 10:55:15 -05:00
David Ormsbee
67a31ac577 Add course/org info to New Relic in courseware and XBlock rendering.
This will make it much easier for us to slice courseware requests by
organization and course in Insights performance analysis.
2015-12-04 20:06:24 -05:00
Braden MacDonald
a654d5e7ac Add additional data to custom SSO auth form extension points 2015-12-04 15:38:18 -08:00
Sarina Canelake
2cfeb34f45 Merge pull request #10825 from edx/kill-psycho
Remove psychometrics app
2015-12-04 17:23:20 -05:00
Nimisha Asthagiri
7429a32ba8 Merge pull request #10799 from edx/mobile/course-api-fields-MA-1661
Update Course About API to include effort and video (MA-1661)
2015-12-04 17:17:21 -05:00