Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,607 Commits 1 Branch 0 Tags
3849a8fa81663bccd38065ff521364956a5bc779
Commit Graph

12194 Commits

Author SHA1 Message Date
Diana Huang
deacfebd7e Merge pull request #9607 from edx/diana/teams-event-tracking 
Add teams eventing and tests.
 2015-09-04 11:32:25 -04:00
Diana Huang
a743f4a642 Add teams eventing and tests. 2015-09-04 10:45:01 -04:00
Calen Pennington
7c62d09eba Merge pull request #8930 from ubc/wmono/lti-sso 
Feature: LTI third-party-auth providers
 2015-09-04 10:40:55 -04:00
Matt Drayer
9cc1859eed Merge pull request #9596 from edx/ziafazal/MAYN-118 
MAYN-118: load header extra file
 2015-09-04 10:37:35 -04:00
Kevin Falcone
57a0356b69 Merge pull request #9608 from edx/jibsheet/lti-provider-admin-ui 
Add details to the admin listing of LTI Consumers
 2015-09-04 10:31:58 -04:00
Peter Pinch
70d3868b81 Merge pull request #9475 from mitocw/fix/aq/email_ccx_non_members 
Fixed CCX display name issue in enrollment/unenrollment email templates for non EDX members
 2015-09-04 10:00:28 -04:00
Calen Pennington
05e33677f7 Merge pull request #9615 from edx/release-2015-09-02-merge-to-master 
Release 2015 09 02 merge to master
 2015-09-04 09:43:38 -04:00
Calen Pennington
dbfa6dafed Resolve conflicts in merge to master 2015-09-04 08:50:48 -04:00
Marko Jevtic
080a44b663 (SOL-1105) Requirement for enabling search in devstack 2015-09-04 10:50:40 +00:00
Zia Fazal
6e0ef385a2 load header extra file if request comes from micro site 
use blank header_extra template instead of if statement
 2015-09-04 11:24:06 +05:00
William Ono
9a83e99938 Avoid losing error messages when inside a frame 2015-09-03 22:53:45 -07:00
William Ono
4d1194800e Support LTI third-party-auth providers 
PR #8930
 2015-09-03 22:53:45 -07:00
Calen Pennington
821cc59415 Merge master into release-2015-09-02, leaving conflicts 2015-09-03 16:36:56 -04:00
David Ormsbee
57085c011c Merge pull request #9582 from edx/ormsbee/lti_passback_delay_config 
Add lms/envs/aws.py entry for LTI_AGGREGATE_SCORE_PASSBACK_DELAY
 2015-09-03 16:17:43 -04:00
Kevin Falcone
406d5a9186 Add details to the admin listing of LTI Consumers 
This mimics the data displayed in our oauth2 client listing and allows
you to search on identifying fields.
 2015-09-03 15:07:27 -04:00
Calen Pennington
ec49576eb4 Merge pull request #9387 from cpennington/csm-count-requested-blocks 
Record the number of blocks requested in get_many
 2015-09-03 13:37:30 -04:00
Daniel Friedman
210edb0122 Merge pull request #9546 from edx/dan-f/add-profile-images-to-team-card 
Add membership thumbnails to team cards
 2015-09-03 13:15:28 -04:00
Chris Rodriguez
1c29763441 Overriding white color for messages on dashboard 2015-09-03 11:57:29 -04:00
Frances Botsford
dd78e27155 adjusting team card profile pic styles 2015-09-03 10:58:58 -04:00
Daniel Friedman
0e180bd2c2 Add membership thumbnails to team cards. 
TNL-3172
 2015-09-03 10:58:58 -04:00
Muhammad Shoaib
42181aeafd Merge pull request #9595 from edx/muhhshoaib/MAYN-122-Enrollment-Codes-popup-is-not-completely-visible 
MAYN-122
 2015-09-03 18:56:32 +05:00
Matt Drayer
c812963808 Merge pull request #9584 from edx/mattdrayer/cert-webview-add-org-fields 
mattdrayer/cert-webview-add-org-fields: Added new fields to context
 2015-09-03 09:50:46 -04:00
Muhammad Shoaib
3bbd021a73 MAYN-122 
added the scrolling for the registration_code_generation modal dialog box.
 2015-09-03 18:12:51 +05:00
Waheed Ahmed
8f12fdf6eb Fixed duration not display on youtube player. 
TNL-3056
 2015-09-03 12:14:55 +05:00
Kevin Falcone
ff8e473787 Merge pull request #9588 from edx/release 
Merge two hotfixes to release
 2015-09-02 14:11:29 -04:00
Frances Botsford
0145ae7b6e adjust teams search styles and add search clear 2015-09-02 12:26:08 -04:00
Andy Armstrong
4be74937df Add searching to the teams view 
TNL-1935
 2015-09-02 12:26:07 -04:00
Ben Patterson
9fd1d9079f Merge pull request #9569 from edx/benp/TE-572-disable 
TE-572 disable flaky test.
 2015-09-02 11:27:21 -04:00
Matt Drayer
f74c9b6de5 mattdrayer/cert-webview-add-org-fields: Added new fields to context 2015-09-02 10:10:21 -04:00
Matt Drayer
49158fe0c9 Merge pull request #9535 from edx/ziafazal/MAYN-119 
MAYN-119: Hide shopping Cart menu
 2015-09-02 10:05:47 -04:00
David Ormsbee
d81b674789 Add lms/envs/aws.py entry for LTI_AGGREGATE_SCORE_PASSBACK_DELAY 2015-09-02 09:27:05 -04:00
David Ormsbee
127467f20a Merge pull request #9023 from mcgachey/lti-collated-grades 
[LTI Provider] Grade passback for non-leaf blocks.
 2015-09-02 07:34:10 -04:00
Zia Fazal
4b4ca54674 Hide shopping Cart menu 
Shopping Cart menu should not be visible in case of while label site.

added tests
 2015-09-02 14:55:34 +05:00
Braden MacDonald
2438b27b9c Merge pull request #9330 from open-craft/fix-offline-gradecalc 
Fix Offline Grade Calculation
 2015-09-01 19:41:22 -07:00
Ben Patterson
29e1c49d6a TE-572 disable flaky test. 
This test has become unreliable. More info can be found in the JIRA ticket.
 2015-09-01 18:12:25 -04:00
David Ormsbee
f577a6d278 Add body hash to LTI outcome message. 
This is necessary to properly implement the LTI outcome passback
spec. It was not included previously because it was causing problems
with Canvas, but Blackboard will not accept outcomes unless they are
properly signed.

The requests_oauthlib doesn't support the body hash spec out of the
box, so BodyHashClient needed to be made. Fortunately, it's a pretty
simple spec:

https://oauth.googlecode.com/svn/spec/ext/body_hash/1.0/oauth-bodyhash.html
 2015-09-01 15:29:00 -04:00
David Ormsbee
664544035a Add explicit name for LTI provider outcome celery task. 2015-09-01 15:29:00 -04:00
David Ormsbee
37cdb89a5e Allow LtiConsumer.instance_guid to be blank. 
The instructions say that this should be left blank until the
initial launch, but Django Admin kicks that out because blanks
are not allowed at the model level.
 2015-09-01 15:29:00 -04:00
Peter Fogg
67a6dd08bc Remove unnecessary bindAll calls. 2015-09-01 13:56:20 -04:00
Christina Roberts
9f86f18841 Merge pull request #9503 from edx/christina/composite-index 
Team API Performance Improvements
 2015-09-01 10:30:47 -04:00
Ned Batchelder
af609f103f Merge pull request #9494 from edx/ned/move-recommender-tests 
Move recommender XBlock tests to openedx/tests/external
 2015-09-01 10:20:24 -04:00
Davorin Šego
1d229a3293 Merge pull request #9540 from edx/dsego/SOL-1065 
Use AjaxHelpers instead of Sinon fake server
 2015-09-01 15:53:18 +02:00
Davorin Sego
a0a0078d1f Use AjaxHelpers instead of Sinon fake server 2015-09-01 14:59:21 +02:00
Muhammad Ammar
f2b3ec5766 Merge pull request #9513 from edx/ammar/tnl3125-i18n-and-rtl-fixes 
i18n and rtl fixes
 2015-09-01 16:50:33 +05:00
Amir Qayyum Khan
e15732114d Fixed CCX display name issue in enrollment/unenrollment email templates for non EDX members 2015-09-01 13:22:50 +05:00
muhammad-ammar
4840b46716 i18n and rtl fixes 
TNL-3125
 2015-09-01 12:16:41 +05:00
tasawernawaz
c217d986de Merge pull request #9516 from edx/tasawer/dev-story/ecom-1017-removing-experimental-logistration-endpoints-updated 
Removed unused url endpoints
 2015-09-01 11:50:52 +05:00
frances botsford
072a66e196 Merge pull request #9468 from edx/frances/teams-padding-responsive-followup 
updated responsive body class to .is-view-in-course
 2015-08-31 21:52:01 -04:00
Ned Batchelder
f925a4af9c Move recommender XBlock tests to openedx/tests/xblock_integration 
I want to make clear that these tests rely on XBlocks in other repos,
and that ideally in time we would move these tests into the XBlock repo.
 2015-08-31 17:14:47 -04:00
David Ormsbee
40f833164c Merge pull request #9509 from edx/ormsbee/faster_tests_shoppingcart 
Shift some shoppingcart tests to use SharedModuleStoreTestCase.
 2015-08-31 16:07:58 -04:00