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

34160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clinton Blackburn
8fcf574029 Corrected Dashboard Display 
- Simplified logic determiningg credit messaging on dashboard
- Fixed bug preventing users from initiating credit request

ECOM-2893
 2015-12-11 13:02:28 -05:00
Clinton Blackburn
dfadb28343 Fixed Permissions Bug 
The permissions class now supports non-GET requests.

ECOM-2893
 2015-12-11 13:02:05 -05:00
Kevin Falcone
f042784b5c Merge pull request #10933 from edx/patch/2015-12-10 
Patch/2015 12 10
 2015-12-10 16:47:23 -05:00
David Baumgold
10fd56e86e Save necessary deprecated Sass variables 2015-12-10 14:36:45 -05:00
David Baumgold
b7b1c63b85 Remove unused edge Sass 2015-12-10 14:36:44 -05:00
David Baumgold
79b3e60f66 Override logo for edge.edx.org 2015-12-10 14:36:44 -05:00
Bill DeRusha
75bbed726d Merge pull request #10915 from edx/hotfix/2015-12-09b 
Enrollment API determines best default enrollment if none passed
 2015-12-10 14:28:28 -05:00
Bill DeRusha
005e07cb95 Remove default course mode setting in enrollment api 2015-12-09 19:46:04 -05:00
Bill DeRusha
a30f7656d2 Merge pull request #10916 from edx/hotfix/2015-12-09a 
Enrollment API determines best default enrollment if none passed
 2015-12-09 17:52:14 -05:00
Bill DeRusha
cdb3e99f39 Enrollment API determines best default enrollment if none passed 2015-12-09 14:50:49 -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
chrisndodge
bce1c66b5e Merge pull request #10829 from edx/rc/2015-12-08 
Rc/2015 12 08
 2015-12-08 11:31:53 -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
Bill DeRusha
b05488f826 Update spacing in FA form 2015-12-07 17:34:58 -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
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
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
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
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
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
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
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
AlasdairSwan
2470072a41 Merge pull request #10830 from edx/alasdair/ECOM-2824-fa-form 
ECOM-2824 Financial Assistance Form
 2015-12-04 15:55:04 -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
frances botsford
e9a323405b Merge pull request #10609 from edx/frances/adjust-studio-cert-limits 
Add certificates signatory limit help text in Studio
 2015-12-04 13:14:28 -05:00
chrisndodge
2677540543 Merge pull request #10828 from edx/release 
Merge pull request #10725 from edx/rc/2015-11-24
 2015-12-04 13:07:49 -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
Ned Batchelder
e0ef89ed3c Merge pull request #10827 from edx/ned/20151204-update-translations 
Update translations (autogenerated message)
 2015-12-04 12:25:18 -05:00
Clinton Blackburn
01f0e2e37c Merge pull request #10824 from edx/clintonb/credit-auth-fix 
Corrected permission class and test
 2015-12-04 11:52:27 -05:00
Ned Batchelder
0ff6cb1447 Update translations (autogenerated message) 2015-12-04 16:37:52 +00: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
Clinton Blackburn
c90880719f Corrected permission class and test 
- The permission now checks the correct request attribute (GET instead of data).
- The Credit API view test has been updated to check for the positive access instead of just denial.

 ECOM-3096
 2015-12-04 10:18:53 -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
David Baumgold
684239892d Merge pull request #10782 from pomegranited/master 
MA-240 Added window beforeunload handler to the ActiveVideoUploadList…
 2015-12-04 09:17:49 -05:00
Ahsan Ulhaq
2e76517ab3 Merge pull request #10820 from edx/ahsan/ECOM-2929-Update-Track-Selection-page 
Update Track Selection page
 2015-12-04 13:03:11 +05:00
Saleem Latif
1e16e873a4 Add Certificate Regeneration history table. 2015-12-04 10:24:02 +05:00
Jillian Vogel
b7f0836be8 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	AUTHORS
 2015-12-04 11:26:55 +10:30
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
31b6f8cc7f Merge pull request #10090 from edx/db/edx.org-comp-theme 
Re-enable the edx.org comprehensive theme
 2015-12-03 17:28:20 -05:00
David Baumgold
58daa365cd re-enable edx.org comprehensive theme 2015-12-03 17:18:55 -05:00
Andy Armstrong
6fd960c855 Merge pull request #10733 from CredoReference/feature/EDX-21 
Don't render unconfigured marketing links in CMS footer.
 2015-12-03 16:59:47 -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