Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,244 Commits 1 Branch 0 Tags
124afe48738fb0daa327d86b790747b03e30d548
Commit Graph

12943 Commits

Author SHA1 Message Date
David Baumgold
b9bfe11ec9 Merge pull request #10902 from open-craft/unicode-certs 
Fix issue with unicode characters in certificates.
 2015-12-09 14:46:11 -05:00
Bill DeRusha
3e96357867 Merge pull request #10912 from edx/bderusha/auto-deadlines-sp 
Auto setting of verification deadlines with manual overrides
 2015-12-09 13:42:19 -05:00
Bill DeRusha
522095e112 Auto setting of verification deadlines with manual overrides 2015-12-09 11:59:55 -05:00
Christine Lytwynec
175241d709 Merge pull request #10814 from edx/clytwynec/problem-type-a11y-tests 
Problem type bok choy and a11y tests
 2015-12-09 11:51:51 -05:00
AlasdairSwan
46dc9d70ae Finished tests 2015-12-09 10:00:21 -05:00
Matjaz Gregoric
f5c2f49eb5 Fix issue with unicode characters in certificates. 
If platform name or "All rights reserved" translation contain non-ascii characters,
certificate HTML view would break with "'ascii' codec can't encode character...".
 2015-12-09 09:54:09 +01:00
Matt Drayer
1f2f3de4a2 Merge pull request #10809 from edx/asadiqbal08/SOL-1455 
asadiqbal08/SOL-1455 Certs: Revise Exceptions UI
 2015-12-09 00:14:26 -05:00
Sarina Canelake
bc822b7f93 Merge pull request #10873 from edx/kill-callstackmanager 
Remove CallStackManager (PLAT-931)
 2015-12-08 20:46:21 -05:00
Peter Fogg
5ecb9af294 Merge pull request #10896 from edx/release 
Release 2015-12-08
 2015-12-08 18:58:14 -05:00
Peter Fogg
1717320b11 Merge pull request #10883 from edx/peter-fogg/investigate-spooky-migrations 
Add migrations due to field default changes from #10802.
 2015-12-08 18:57:52 -05:00
Peter Fogg
a609e074c7 Fix Unicode errors in financial assistance. 2015-12-08 16:35:38 -05:00
chrisndodge
4334eb9bd1 Merge pull request #10885 from edx/release 
Release
 2015-12-08 15:21:48 -05:00
David Ormsbee
ae1f415597 Merge pull request #10840 from edx/ormsbee/new_relic_course_org_attrs 
Add course/org info to New Relic in courseware and XBlock rendering.
 2015-12-08 14:42:28 -05:00
Christine Lytwynec
a9b308e5e1 Convert some problem type tests to bok choy and add a11y test 2015-12-08 14:39:23 -05:00
Matt Drayer
d305ca766e Merge pull request #10807 from edx/ziafazal/SOL-1335 
ziafazal/SOL-1335: added new endpoint which renders certificate by uuid
 2015-12-08 13:34:00 -05:00
David Baumgold
11b3d9399d Disable footer on finish_auth.html 2015-12-08 11:29:42 -05:00
Sarina Canelake
596e93a293 Add __unicode__ method on StudentModuleHistory 2015-12-08 11:16:02 -05:00
Peter Fogg
f975ae038b Add migrations due to field default changes from #10802. 
Django 1.8 is more sensitive to model changes, and wants to create
migrations in situations that Django 1.4 would not. Changing field
defaults is an example of these situations.
 2015-12-08 10:54:49 -05:00
Sarina Canelake
8928e9ef19 Remove CallStackManager (PLAT-931) 2015-12-08 10:21:55 -05:00
Zia Fazal
4f939f79f9 added new endpoint which renders certificate by uuid 
fixed broken tests and added some optimisations

fixed migration history
 2015-12-08 18:21:04 +05:00
asadiqbal
aca292de35 SOL-1490 2015-12-08 18:15:47 +05:00
asadiqbal
dfd9b463f0 SOL-1455 2015-12-08 17:51:46 +05:00
David Baumgold
73786867b7 Merge pull request #10863 from edx/footer-image-fallback 
Fall back on core asset for footer logo
 2015-12-08 07:32:19 -05:00
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
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
AlasdairSwan
4117064a2f Added fa factory to rjs bundler 2015-12-07 15:05:38 -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
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
David Baumgold
1a2ffbda68 Disable footer for courseware-chromeless.html 2015-12-07 13:54:23 -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
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
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
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
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
Mushtaq Ali
06442036ce Load requirejs before module-js 2015-12-07 16:26:37 +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
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
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
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
Sarina Canelake
e932632b49 Remove psychometrics app 2015-12-04 16:37:34 -05:00
Nimisha Asthagiri
91153aea83 Update Course About API to include effort and video 
MA-1661
 2015-12-04 16:03:06 -05:00
alasdairswan
56ba7850a0 Integrated JS with Peter's Django wrapper 
Rendering form. Updated form field template to accept instructions for all input types
Added setExtraData function to FormView to allow non-form attributes to be added to the model before saving
 2015-12-04 15:54:34 -05:00