Commit Graph

12902 Commits

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
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
005e07cb95 Remove default course mode setting in enrollment api 2015-12-09 19:46:04 -05:00
Peter Fogg
a609e074c7 Fix Unicode errors in financial assistance. 2015-12-08 16:35:38 -05:00
Bill DeRusha
b05488f826 Update spacing in FA form 2015-12-07 17:34:58 -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
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
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
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
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
Feanil Patel
bdd701d29f Merge pull request #10826 from edx/feanil/one_down
Remove This awful code
2015-12-04 12:57:05 -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
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
wajeeha-khalid
c9c1a4bc71 jia/MA-1748 patch read states for users 2015-12-03 12:08:20 +05:00
Eric Fischer
88a389652b CohortMembership Test Fixes
There are 3 main changes in this commit:
* CohortFactory now sets up memberships properly, so consuming tests do not
need to explicitly touch CourseUserGroup.users to add() users.
* test_get_cohort_sql_queries has been updated to 3 and 9 queries when using
and not using the cache, respectively. This is needed due to each operation
needing an extra queery to get the CourseUserGroup from the CohortMembership.
* Adding remove_user_from_cohort(), the counterpart to add_user_to_cohort().
This is also to keep tests from touching the users field directly, and keep
CohortMembership data in sync.
2015-12-02 15:03:52 -05:00
Eric Fischer
731d85f771 CohortMembership Transaction Fixes
An issue arose recently due to ATOMIC_REQUESTS being turned on by default. It
turns out that CohortMemberships had been somewhat relying on the old default
transaction handling in order to keep CohortMemberships and the underlying
CourseUserGroup.users values in-sync.

To fix this, I've made all updates to Cohortmemberships go through an
outer_atomic(read_committed=True) block. This, is conjunction with the already
present select_for_update(), will no longer allow 2 simultaneous requests to
modify objects in memory without sharing them. Only one process will be
touching a given CohortMembership at any given time, and all changes will be
immediately comitted to the database, where the other process will see them.

I've also included some changes to get_cohort(), add_user_to_cohort(), and
remove_user_from_cohort() in order to properly make use of the new
CohortMembership system.
2015-12-02 15:03:28 -05:00
clrux
06eede5d14 Merge pull request #10796 from edx/clrux/ac-253
LMS: changing blue to pink, ensuring contrast, for Studio/Staff
2015-12-02 13:54:37 -05:00
Chris Rodriguez
deaa044669 Changing blue to pink as was previously there 2015-12-02 12:14:15 -05:00
wajeeha-khalid
fee7946988 Merge pull request #10758 from edx/jia/MA-1742
MA-1742; return read status for GET thread details
2015-12-02 21:13:52 +05:00
Chris Rodriguez
284b1a0fdf LMS: darkening blue on Studio links 2015-12-02 11:09:11 -05:00
Awais Qureshi
989389e3f2 Merge pull request #10781 from edx/awais786/ECOM-2980-admin-certs-page
Replacing user dropdown field with user search textbox. On stage due …
2015-12-02 17:10:45 +05:00
Braden MacDonald
4645c6ecdd Allow using a custom login/register form with third_party_auth 2015-12-01 15:43:34 -08:00
Matt Drayer
f6872a0fa4 Merge pull request #10750 from edx/asadiqbal08/SOL-1417-CSV
SOL-1417 Certs: Allow CSV upload for Cert Exceptions
2015-12-01 10:36:32 -05:00
Nimisha Asthagiri
47b0d492e4 Merge pull request #10727 from edx/cdyer/pagination
Add pagination support to course catalog API
2015-12-01 09:09:04 -05:00
Matt Drayer
2320d4220c Merge pull request #10748 from edx/saleem-latif/SOL-1389
SOL-1389: Cert Exception: Add error states and messages
2015-12-01 08:23:24 -05:00
Matt Drayer
f5d9f2829e Merge pull request #10759 from edx/ziafazal/SOL-1439
SOL-1439: removed certificates delivered dependency on certificate eligibility
2015-12-01 08:19:38 -05:00
Matt Drayer
6fca86a736 Merge pull request #10777 from edx/saleem-latif/SOL-1466
SOL-1466: Make sure web view renders certs only if downloadable.
2015-12-01 08:17:52 -05:00
J. Cliff Dyer
f53de2c04a Paginate results of Courses API list endpoint
* Catalog results are now paginated
* Implements the new namespaced pagination described at
  https://openedx.atlassian.net/wiki/pages/viewpage.action?pageId=47481813
* API level code returns pythonic business objects
* View layer performs serialize at the view layer
* Convert views to use DRF generic views
* Removes an unintentional authentication decorator that caused
  the detail endpoint to return a 401 for anonymous users

MA-1724
2015-12-01 08:13:18 -05:00
wajeeha-khalid
11f34c1e8c Merge pull request #10736 from edx/jia/MA-1211
MA-1211; Discussion API - make boolean params case insensitive
2015-12-01 18:11:18 +05:00
Awais
afd6d3f66a Replacing user dropdown field with user search textbox. On stage due to large user's list page is not loading.
ECOM-2980
2015-12-01 16:52:10 +05:00
Zia Fazal
34d630eacf removed certificates delivered dependency on certificate eligibility
split variables on multiple lines

changes after feedback from Afzal
2015-12-01 16:24:06 +05:00