Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,497 Commits 1 Branch 0 Tags
b839b048ee600aa83aa4c19a38e01cd86ed583ee
Commit Graph

37497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Afzal Wali
257aaaee83 Added the ability to change the enrollment mode in the auto_auth API (used for bokchoy and load tests). 
Modified some tests to use the modified API.

Quality

Quality

Updated the comment.

Quality
 2015-09-02 19:05:34 +05:00
mirjamsk
3a6f4b99fd Update AUTHORS 2015-09-02 15:58:10 +02:00
David Ormsbee
d81b674789 Add lms/envs/aws.py entry for LTI_AGGREGATE_SCORE_PASSBACK_DELAY 2015-09-02 09:27:05 -04:00
Adam
3792d67fd1 Merge pull request #9567 from edx/merge-release-into-master 
Merge release into master
 2015-09-02 09:21:45 -04:00
muhammad-ammar
aa8e363cf9 Update Django-nose 2015-09-02 18:16:32 +05:00
Ben Patterson
b4b0971c04 Tagging this test as flaky. 
ECOM-1165
 2015-09-02 08:38:05 -04:00
muzaffaryousaf
65960ca007 Upgrade sorl-thumbnail to 12.3. 2015-09-02 17:03:16 +05: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
mirjamsk
fb65874930 Addresses TNL-3183 2015-09-02 08:00:42 +00: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
Peter Fogg
06014bfae0 Merge pull request #9559 from edx/peter-fogg/remove-bind-all 
Remove unnecessary bindAll calls.
 2015-09-01 17:36:14 -04:00
Jesse Zoldak
804e110295 Merge pull request #9565 from edx/zoldak/TNL-3183 
Decorate flaky test TNL-3183
 2015-09-01 16:18:30 -04:00
chrisndodge
f8e44f7832 Merge pull request #9536 from edx/muhhshoaib/PHX-122-remove-the-record-in-the-creditRequirementStatus-table 
PHX-122
 2015-09-01 16:05:43 -04:00
Adam
a4759b4158 Merge pull request #9563 from edx/adam/add-video-player-fix-to-rc 
fix issue where video player renders twice (TNL-3064)
 2015-09-01 16:01:56 -04:00
Adam Palay
76fc180cd9 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	common/lib/xmodule/xmodule/css/capa/display.scss
 2015-09-01 16:01:04 -04:00
Jesse Zoldak
7f0b9bceff Decorate flaky test TNL-3183 2015-09-01 15:34:31 -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
Adam
06a20054b0 Merge pull request #9561 from edx/hotfix/2015-09-01a 
Revert "OSPR-535 Partial Credit"
 2015-09-01 15:15:34 -04:00
Adam Palay
f099a7e911 fix issue where video player renders twice (TNL-3064) 2015-09-01 15:11:31 -04:00
Muhammad Shoaib
4d0efa2893 PHX-122 
Fixed the issue when deleting a proctored exam attempt does not remove the record in the CreditRequirementStatus table
 2015-09-01 15:08:11 -04:00
Syed Hassan Raza
f82662356f Revert "OSPR-535 Partial Credit" 
This reverts commit 7624c63362.
 2015-09-01 14:04:42 -04:00
Peter Fogg
67a6dd08bc Remove unnecessary bindAll calls. 2015-09-01 13:56:20 -04:00
Christine Lytwynec
e807cbd589 Merge pull request #9402 from edx/clytwynec/TNL-2153 
Change component types and template links to buttons
 2015-09-01 12:48:46 -04:00
Muhammad Ammar
15c0d3c2e3 Merge pull request #9532 from edx/ammar/tnl3166 
fix flaky
 2015-09-01 21:04:10 +05:00
Marco Morales
f2631faab1 Merge pull request #9529 from edx/marco/UX-2753/partial-credit-icon-status 
Updated partially correct capa icon
 2015-09-01 11:30:18 -04:00
Christine Lytwynec
3470e180fc Change component types and template links to buttons 2015-09-01 10:31:35 -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
Marko Jevtić
6acdfea7aa Merge pull request #9553 from edx/mjevtic/SOL-1160 
(SOL-1160) mark test as flaky
 2015-09-01 15:27:47 +02:00
Davorin Sego
a0a0078d1f Use AjaxHelpers instead of Sinon fake server 2015-09-01 14:59:21 +02:00
Marko Jevtic
1531d8d250 (SOL-1160) mark test as flaky 2015-09-01 12:26:50 +00: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
Ahsan Ulhaq
089ca195b6 Merge pull request #9542 from edx/ahsan/Update-edx-reverification-block-version 
update Reverification block hash
 2015-09-01 15:49:07 +05:00
Ahsan Ulhaq
65099c4ef7 update Reverification block hash 2015-09-01 14:17:06 +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
muhammad-ammar
5e67933175 fix flaky 
TNL-3166
 2015-09-01 10:56:25 +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
a16c951c09 Fix imports and test skips to work properly from openedx 2015-08-31 17:14:47 -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
Andy Armstrong
9ff620dedf Merge pull request #9334 from jolyonb/dragdropfix 
Fixing drag and drop labels
 2015-08-31 17:12:49 -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
Sarina Canelake
25169ccc4d Merge pull request #9147 from open-craft/OC-791-answer-export 
Move problem responses export from legacy instructor dash to new instructor dash
 2015-08-31 15:12:55 -04:00
Clinton Blackburn
bb1631b2e5 Merge pull request #9545 from edx/clintonb/csrf-test 
Added test for CreditCourse endpoint CSRF validation
 2015-08-31 11:53:21 -07:00