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

34229 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matjaz Gregoric
bb25473a7c Remove staff debug category type whitelist. 
Show the 'Staff debug' button on all blocks, including custom xblocks.

Staff debug was only available on selected components for historical reasons,
because it used to be much more intrusive.
 2015-12-09 10:45:32 +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
608c9000b7 Merge pull request #10897 from edx/if-one 
Remove This Awful Code
 2015-12-09 00:03:40 -05:00
Sarina Canelake
edf6730ca0 Pylint fixes to symmath module 2015-12-08 22:56:28 -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
Sarina Canelake
8caad15188 Remove This Awful Code 2015-12-08 17:51:13 -05:00
Peter Fogg
9c8cadacfe Merge pull request #10894 from edx/hotfix/2015-12-08 
Fix Unicode errors in financial assistance.
 2015-12-08 17:35:13 -05:00
Peter Fogg
a609e074c7 Fix Unicode errors in financial assistance. 2015-12-08 16:35:38 -05:00
Renzo Lucioni
a974cec3be Merge pull request #10888 from edx/renzo/programs-auth-url 
Include auth URL data attribute in the programs authoring template
 2015-12-08 15:59:55 -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
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
Renzo Lucioni
3c01ed44d0 Include auth URL data attribute in the programs authoring template 
The authoring app requests JWTs from this endpoint.
 2015-12-08 13:33:20 -05:00
David Baumgold
baae1e5cbc Merge pull request #10884 from edx/disable-footer-on-finish-auth 
Disable footer on finish_auth.html
 2015-12-08 13:26:22 -05:00
Ben Patterson
2d3a4c9fb1 Merge pull request #8915 from edx/benp/add-plato-jul2015 
Add plato JS static code analysis tool.
 2015-12-08 11:39:06 -05:00
chrisndodge
bce1c66b5e Merge pull request #10829 from edx/rc/2015-12-08 
Rc/2015 12 08
 2015-12-08 11:31:53 -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
Matt Drayer
16ddf0ccea Merge pull request #10880 from edx/asadiqbal08/SOL-1490-Jasmin-to-support-SOL-1455 
asadiqbal08/SOL-1490 write Jasmine tests to cover bulk certificate white list exception feature
 2015-12-08 10:12:26 -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
Syed Hasan raza
9fc7c73bf0 Merge pull request #10854 from edx/shr/impr/TNL-3076-Tests-improvement 
Course_key naming convention
 2015-12-08 12:50:30 +05:00
Braden MacDonald
dbb1887c42 Merge pull request #10839 from open-craft/custom-entry-points-provider-id 
Add additional data to custom SSO auth form extension points
 2015-12-07 20:58:24 -08: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
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