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
Sarina Canelake
92a436b11b
Merge pull request #10834 from edx/kill-admin-dash
...
Remove admin dashboard (AN-3351)
2015-12-04 15:41:39 -05:00
M. Rehan
568bbf9549
Merge pull request #10767 from edx/mrehan/TNL-3821
...
fix wiki alertbox style
2015-12-05 01:05:36 +05:00
Sarina Canelake
f7e141b147
Remove admin dashboard (AN-3351)
2015-12-04 14:39:19 -05:00
Feanil Patel
bdd701d29f
Merge pull request #10826 from edx/feanil/one_down
...
Remove This awful code
2015-12-04 12:57:05 -05:00
Nimisha Asthagiri
d170c92f3b
Refactor course_image_url
2015-12-04 11:25:40 -05:00
Peter Fogg
9401beb837
Merge pull request #10787 from edx/peter-fogg/fa-page
...
Add financial assistance page skeleton and Zendesk submission.
2015-12-04 11:12:06 -05:00
Feanil Patel
356a175969
Remove This awful code
...
We no longer have XML courses so we don't need to compile their coffee script.
2015-12-04 11:11:01 -05:00
Matt Drayer
c41a887762
Merge pull request #10805 from edx/saleem-latif/SOL-1435
...
SOL-1435: Add Certificate Regeneration history table.
2015-12-04 09:56:18 -05:00
Peter Fogg
66719b1b4a
Add financial assistance page.
...
Page skeleton and endpoint to submit FA requests to Zendesk.
ECOM-2824
ECOM-3038
2015-12-04 09:39:22 -05:00
Awais
198d33dc13
New AB Testing URL for checkout page.
...
ECOM-2866
2015-12-04 07:04:59 +00:00
Saleem Latif
1e16e873a4
Add Certificate Regeneration history table.
2015-12-04 10:24:02 +05:00
Peter Fogg
068b439ada
Merge pull request #10821 from edx/peter-fogg/fix-certs-tests
...
Fix broken certificates-related tests.
2015-12-03 18:00:16 -05:00
David Baumgold
58daa365cd
re-enable edx.org comprehensive theme
2015-12-03 17:18:55 -05:00
Ned Batchelder
d344d6f80a
Merge pull request #10815 from edx/ned/add-translator-comments
...
Add translator comments
2015-12-03 16:46:03 -05:00
Peter Fogg
1ba1c213d5
Fix broken certificates-related tests.
2015-12-03 16:30:05 -05:00
Peter Fogg
8b97ca1b24
Merge pull request #10802 from edx/feature/remove-honor-code-certs
...
Remove default honor code.
2015-12-03 14:55:30 -05:00
Ned Batchelder
ed96a9d87a
Add translator comments
...
There are English words in these strings, but they are actually specific
values that must appear as these English words, and so should not be
translated.
2015-12-03 14:47:08 -05:00
Ned Batchelder
67c1cdf5f4
Fix missing translator comments
...
Turns out if the string literal starts on the next line after the
translation function, then the translator comment is lost. So, either
close up short strings, or add a dummy empty string on the first line to
concatenate with the real string.
Ugh.
2015-12-03 13:45:01 -05:00
Bill DeRusha
4b94d6367a
Update dashboard banners and track selection for audit track
...
Remove cert messaging from audit cert/grade info partial
move enrollment display method to helpers
2015-12-03 13:22:08 -05:00
frances botsford
9e1c9ab08c
Merge pull request #10605 from edx/frances/reduce-component-padding
...
Percent-based padding on course-content
2015-12-03 12:02:13 -05:00
Eric Fischer
44eaca08e8
Merge pull request #10772 from edx/efischer/post_rc_fix
...
CohortMembership Transaction Fixes
2015-12-03 10:34:00 -05:00