Commit Graph

22621 Commits

Author SHA1 Message Date
Ahsan Ulhaq
03db7a7fd1 Merge pull request #8228 from edx/ahsan/ECOM-1602-update-ICRV-requirments-status-new
update the ICRV requirments status
2015-06-16 23:17:14 +05:00
Ahsan Ulhaq
7d11768358 update the ICRV requirments status
After receiving the response from software secure update the ICRV
requirement status in CreditRequirementstatus table.

ECOM-1602
2015-06-16 22:27:54 +05:00
Greg Price
905512b6c8 Merge pull request #8505 from edx/gprice/discussion-api-course-endpoint
Add discussion API course endpoint
2015-06-16 13:04:16 -04:00
Chris
944382241c Merge pull request #8434 from edx/clrux/ux-2291-course-nav-gradient-a11y
Increasing contrast in course nav accordions
2015-06-16 13:00:26 -04:00
Chris
b621870f27 Merge pull request #8218 from edx/clrux/UX-2252-accessibility-fixes-payment-page
Accessibility tweaks and patching RTL
2015-06-16 12:14:20 -04:00
Greg Price
d18b24b051 Add discussion API course endpoint
This endpoint returns course metadata relating to discussions as a
starting point for clients.
2015-06-16 11:27:54 -04:00
Awais
4d5a4b035d ECOM-1683 removing regen-cert code. 2015-06-16 20:08:57 +05:00
Chris Rodriguez
926f2c0355 Removing element selectors 2015-06-16 10:47:23 -04:00
Chris Rodriguez
3561b5c7a0 PR feedback and receiept template updates 2015-06-16 10:46:11 -04:00
chrisndodge
fcc97a3f76 Merge pull request #8478 from edx/afzaledx/MAYN-78
MAYN-78 Extend Coupon/Discount Reports
2015-06-16 10:43:16 -04:00
Frances Botsford
ab985aadbd modernize the dashboard button styles 2015-06-16 10:38:29 -04:00
Afzal Wali
ac72e26256 Fixed the empty list price issue.
Added columns to the CC purchases report. (added Qty and Total Discount. Moved the Total Amount to the last index).
Coupon code report.
2015-06-16 17:46:05 +05:00
Chris Rodriguez
8f8f1184a5 PR feedback 2015-06-16 07:34:07 -04:00
Ahsan Ulhaq
d35b652843 Display Eligibility table on progress page
1-Adding basic html for displaying eligibility table
2-Updated Eligibility Requirements Dynamically

ECOM-1523
2015-06-16 16:19:33 +05:00
Greg Price
5318f21e77 Merge pull request #8485 from edx/gprice/discussion-api-endorse
Add comment endorsement to discussion API
2015-06-15 17:10:05 -04:00
Matt Drayer
c3b78ea90a Merge pull request #8448 from edx/ziafazal/SOL-886
certificates event tracking SOL-886
2015-06-15 15:09:35 -04:00
Andy Armstrong
c28003b50d Merge pull request #8416 from edx/andya/common-list-component
Create a common paginated list view
2015-06-15 14:55:20 -04:00
Greg Price
439f72f918 Merge pull request #8524 from edx/gprice/discussion-api-parent-id-fix
Fix bug in discussion API comment update
2015-06-15 14:49:53 -04:00
Andy Armstrong
1689004189 Create a common paginated list view
TNL-2384

Refactored Studio's PagingView to use RequireJS Text and moved it
to common so that it can also be used by LMS.
2015-06-15 13:51:09 -04:00
Will Daly
2175b5baa4 Merge pull request #8509 from edx/will/deprecate-course-about-v0
Deprecate course details API v0
2015-06-15 13:14:32 -04:00
Greg Price
3c48585c8e Fix bug in discussion API comment update
This bug caused any attempt to update a comment with a non-null
parent_id to result in a 500 error without applying the update. The bug
was introduced in commit 2c7590d197.
2015-06-15 12:20:47 -04:00
Calen Pennington
9821323946 Merge pull request #8504 from cpennington/bdero/ccx-query-tests
A version of #8260 that is consistent on jenkins and locally
2015-06-15 11:51:33 -04:00
Sarina Canelake
09425c3d8f Merge pull request #8402 from edx/sarina/annotate-middleware
Fix dark lang and django.middleware.locale behaviors LOC-72 LOC-85
2015-06-15 11:29:15 -04:00
Calen Pennington
b06d256f99 Clear all caches before measure FieldOverride performance 2015-06-15 11:10:27 -04:00
Calen Pennington
e4bc328c3a Reduce the number of queries when walking parents in MongoModuleStore by avoiding cache misses on the data due to missing runs 2015-06-15 11:09:43 -04:00
Calen Pennington
67bde5e2e9 Measure XBlock instantiations in FieldOverride performance tests 2015-06-15 11:08:57 -04:00
Calen Pennington
5962c4eb8f Better simulate a request happening in the LMS in FieldOverride performance tests 2015-06-15 11:06:45 -04:00
Zia Fazal
6afaa3cce3 certificates event tracking
some optimisations

refactored code and added created event

added test to make sure generate event is emitted

changes based on feedback on 6/11

added certificate web page and tests

fixed quality violations
2015-06-15 19:53:47 +05:00
Brandon DeRosier
5c6ccc8f0b Add CCX SQL query/mongo read tests 2015-06-15 09:50:44 -04:00
Sven Marnach
52f56ddd37 Add feature flag to allow hiding the discussion tab for individual courses. 2015-06-14 20:36:45 +02:00
Sarina Canelake
ed2f73e6d2 Add i18n regression tests (LOC-72, LOC-85) 2015-06-12 18:14:26 -04:00
Sarina Canelake
d312d0e152 Port django.middleware.locale.LocaleMiddleware from Django 1.8 2015-06-12 18:14:24 -04:00
Calen Pennington
83fce4d61f Merge pull request #8395 from jazkarta/ccx-custom-ids
MIT CCX: Use CCX Keys
2015-06-12 16:19:12 -04:00
Will Daly
c31a510607 Deprecate course details API v0 2015-06-12 15:59:20 -04:00
Chris Rodriguez
a0f757f82a Increasing contrast in course nav accordions 2015-06-12 15:52:58 -04:00
cewing
cb431ccb24 MIT CCX: Use CCX Keys: further revisions in response to code review
only require ccx-keys once

get_current_ccx will now expect a CourseKey instance as its argument, and will raise a value error if this expectation is not met.

document reason for local import

add special methods to pass attribute setting and deletion through to the wrapped modulestore

add __setattr__ and __delattr__ per code review, update __init__ to work with new methods

style change per code review

clean up context manager usage as recommended by code review

remove unused code and imports

convert modulestore type tests to use the `get_modulestore_type` api, remove unused imports

code quality: add docstrings

increase coverage for utils tests

fix bug found in testing.

increase test coverage on modulestore wrapper

code quality fixes

code-quality: ignore import error, but mark site for future consideration
2015-06-12 11:20:30 -07:00
Will Daly
7a3c1f04dd Merge pull request #8502 from edx/alasdair/ECOM-1724-footer-a11y-update
ECOM-1724 a11y footer updates
2015-06-12 13:22:11 -04:00
Calen Pennington
c1ace04483 Merge pull request #8391 from edx/alawibaba/plat5892
First draft.
2015-06-12 12:39:38 -04:00
Calen Pennington
b9f5eef4ae Log an exception before swallowing it in a KeyValueMultiSaveError 2015-06-12 12:37:49 -04:00
Calen Pennington
0f6ef44476 Don't pass in a user object to DjangoUserStateClient 2015-06-12 12:37:49 -04:00
Ali Mohammad
69772ef20e Convert access to StudentModuleHistory to use the UserStateClient API. 2015-06-12 12:37:34 -04:00
Will Daly
2fd68dc983 ECOM-1724 a11y footer updates
* Add action text to social media links.
* Make the alt text for mobile links more descriptive.
2015-06-12 11:34:39 -04:00
Nimisha Asthagiri
1a15bd7bed Merge pull request #8209 from edx/mobile/xblock-support
Course Blocks + Navigation API (feature flagged) for Mobile
2015-06-12 11:25:23 -04:00
David Ormsbee
3ec2206410 Merge pull request #8501 from mcgachey/lti-auth-fix
[LTI Provider] Basic LTI authentication
2015-06-12 11:11:32 -04:00
Renzo Lucioni
d61cee95a8 Merge pull request #8500 from edx/renzo/commerce-cleanup
Avoid POSTing unnecessary payment processor parameter
2015-06-12 11:09:59 -04:00
Renzo Lucioni
3de0af1616 Merge pull request #8498 from edx/release
Release
2015-06-12 11:09:16 -04:00
Phil McGachey
c3106bc4bd This change cleans up the work in progress request at #8176
This is an initial authentication implementation that allows LTI users to
log in transparently to edX. The behavior is driven by pilot users at
Harvard; this was the most requested feature.

The patch creates a new database model that maps users' LTI identifiers
to newly-created edX accounts. If an LTI launch comes in with a user_id
field that is not in the database, a new edX account is created with a
random user name and password. This account is then stored in the
database, so that it is permanently associated with the LTI user ID.

This patch takes a simplistic approach to session management. If a user
is logged in with a different account when they perform an LTI launch,
they will be logged out and then re-logged in using their LTI account.

In order to keep the patch simple, I have split out some refactoring
that needs to be done into a separate branch that I'll post once this
has been merged. Since we no longer redirect to the login page, we don't
need to maintain two separate LTI endpoints (one for the LTI launch and
one for authenticated users), or deal with the session management that
requires. There are also multiple fetches of the LtiConsumer object
(one in the view, one in the signature validation) that the later
patch will consolidate into one.

This branch fixes the previous conflicts with the test refactoring
carried out in PR 8240.
2015-06-12 10:21:48 -04:00
Nimisha Asthagiri
4921ec48c8 MA-792 Course Blocks and Navigation API (user-specific) 2015-06-12 09:27:20 -04:00
Nimisha Asthagiri
037ef3be77 Video module support for student_view_json. 2015-06-12 09:27:17 -04:00
cewing
ef4836503f MIT CCX: Use CCX Keys - responses to code review
remove references to middleware that were missed previously

use key apis rather than local implementation of key conversion.  remove local implementationa

remove spurious test for attribute

fix test setUp to avoid unneeded flattening

code quality fixes

add security check ensuring that the coach is coach for *this* CCX.

prevent ccx/deprecated course id problems

1.  do not allow ccx objects to be created if the course id is deprecated
2.  filter out any ccx memberships that involve deprecated course ids (in case there are bad ccxs in the database)

Fix test failures and errors arising from incorrect code path execution

Create context manager to handle unwrapping and restoring ccx values for the modulestore wrapper, employ it throughout modulestore wrapper implementation
2015-06-12 00:01:24 -07:00