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

34141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jillian Vogel
6fd5ba5a69 MA-240 Added window beforeunload handler to the ActiveVideoUploadList view, 
which shows a notification if there are any "Queued" or "Uploading" videos still in progress.
 2015-12-04 07:38:22 +10:30
Jillian Vogel
cbcd96dfbe MA-204 Added self to AUTHORS 2015-12-04 07:38:17 +10:30
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
1ff41eb362 Merge pull request #10819 from edx/ned/fix-missing-translator-comments 
Fix missing translator comments
 2015-12-03 14:28:15 -05:00
Bill DeRusha
52f1db4334 Merge pull request #10769 from edx/bderusha/hc-dash 
Update dashboard for audit track
 2015-12-03 14:13:39 -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
Dan Powell
696e1962d9 Add Dan Powell <dan@abakas.com> to AUTHORS 2015-12-03 13:42:18 -05:00
Ahsan Ulhaq
fc953a6699 Update Track Selection page 
ECOM-2929
 2015-12-03 23:42:14 +05:00
Dan Powell
31646e4a72 Don't render unconfigured marketing links in CMS footer. 2015-12-03 13:41:53 -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
Syed Hasan raza
86227e7711 Merge pull request #10793 from edx/shr/bug/AN-4509-logging-raise-exception-UnicodeDecodeError 
Raise UnicodeDecodeError exception after logging the exception
 2015-12-03 22:54:24 +05:00
Renzo Lucioni
1cee9a0dcd Merge pull request #10714 from edx/renzo/programs-authoring-page 
Add a Studio view and template to host the Programs authoring app
 2015-12-03 12:12:23 -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
Renzo Lucioni
e2833d8fc6 Add a Studio view and template to host the Programs authoring app 
The Programs authoring app is a Backbone SPA maintained in a separate repository. The app handles its own routing and provides a UI which can be used to create and publish new Programs (e.g, XSeries). ECOM-2598.
 2015-12-03 10:47:12 -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
David Baumgold
3b5d9fe95a Merge pull request #10761 from jbzdak/tnl-363 
Fixes TNL-363: EdX OpenID provider doesn't handle unicode e-mails
 2015-12-03 10:17:58 -05:00
wajeeha-khalid
ef383a8902 Merge pull request #10790 from edx/jia/MA-1748 
jia/MA-1748 patch read states for users
 2015-12-03 20:15:00 +05:00
Ben Patterson
613c39b00f Merge pull request #10803 from edx/benp/fix-flaky-teams-events 
Enforce order on these events to solve flaky condition.
 2015-12-03 09:31:14 -05:00