Commit Graph

12886 Commits

Author SHA1 Message Date
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
Saleem Latif
37f10a3846 Make sure web view renders certs only if downloadable. 2015-12-01 16:10:05 +05:00
Saleem Latif
a8e44b3097 Cert Exception: Add error states and messages 2015-12-01 12:46:04 +05:00
Aamir
a0db0d8297 Merge pull request #10520 from edx/aamir-khan/ECOM-1447-login-error-message
Aamir khan/ecom 1447 login error message
2015-12-01 11:44:31 +05:00
wajeeha-khalid
092cc4b278 MA-1211; Discussion API - make boolean params case insensitive 2015-12-01 11:25:27 +05:00
Bill DeRusha
8c69f22689 Merge pull request #10722 from edx/bd/sp-init
Initial migrations for verified deadlines for self paced
2015-11-30 16:28:25 -05:00
Nimisha Asthagiri
8c4eefd53f Merge pull request #10724 from edx/mobile/support-web-certs-MA-1667
MA-1667: Update Mobile API to support Web Certificates
2015-11-30 14:41:47 -05:00
Bill DeRusha
78896c60b5 Initial migrations for verified deadlines for self paced 2015-11-30 10:30:23 -05:00
asadiqbal
7c68d80c67 SOL-1417 2015-11-30 14:40:08 +05:00
wajeeha-khalid
bbe35dcaef MA-1742; return read status for GET thread details 2015-11-30 11:54:08 +05:00
Brian Beggs
89a7e42576 Merge pull request #10742 from edx/bbeggs/acceptance-test-migration-fix
Migrations will now run during Acceptance tests
2015-11-26 09:34:51 -05:00
wajeeha-khalid
6e5e185b4e Merge pull request #10738 from edx/jia/MA-1593
MA-1593; include post in comment count
2015-11-26 11:18:30 +05:00
Jim Abramson
8f4c2264a1 Merge pull request #10701 from edx/renzo/studio-programs-tab
Add Programs tab to Studio
2015-11-25 16:37:34 -05:00
Nimisha Asthagiri
115ab3c11b Merge pull request #10720 from edx/mobile/course-about-url-MA-1712
MA-1712: Update Mobile API to include course_about
2015-11-25 15:38:45 -05:00
Renzo Lucioni
70d57327eb Add Programs tab to Studio
Extends the Programs ConfigurationModel, cleans up Programs-related utilities and corresponding tests, and corrects caching. Uses the Programs API to list programs within Studio. ECOM-2769.
2015-11-25 14:56:50 -05:00
Nimisha Asthagiri
0b90326470 MA-1667: Update Mobile API to support Web Certificates 2015-11-25 13:49:27 -05:00
Nimisha Asthagiri
330120bb7a MA-1712: Update Mobile API to include course_about 2015-11-25 13:48:45 -05:00