Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
35,515 Commits 1 Branch 0 Tags
209ddc700dfce5bb0aa151c19dafbac8ae7de2d2
Commit Graph

35515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
asadiqbal
3e4d4504ff SOL-1157 -- moving buttons from top to bottom and also using the standard save/cancel buttons in signatory edit view. 
and update the bokchoy test
 2015-09-03 15:32:52 +05:00
Muhammad Ammar
4e5dc9f342 Merge pull request #9533 from edx/ammar/update-mako 
Update mako
 2015-09-03 13:49:03 +05:00
Waheed Ahmed
baa0f45e8a Merge pull request #9406 from edx/waheed/tnl3056-fix-duration-not-displaying-for-youtube-player 
Fixed duration not display on youtube player.
 2015-09-03 13:12:51 +05:00
Tasawer
01ca1f9be1 removing deprecated view VerifyLaterView 
XCOM-285
 2015-09-03 07:19:39 +00:00
Waheed Ahmed
8f12fdf6eb Fixed duration not display on youtube player. 
TNL-3056
 2015-09-03 12:14:55 +05:00
Sven Marnach
4377981486 Optimise getting list of courses from Enrollment API for global staff. 2015-09-02 22:21:58 +02:00
Afzal Wali Naushahi
f80720d09e Merge pull request #9541 from edx/afzaledx/extending_auto_auth_for_verified_users 
Added the ability to change the enrollment mode in the auto_auth API
 2015-09-02 23:27:36 +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
Andy Armstrong
7b77f816ed Merge pull request #9472 from edx/andya/team-search-ui 
Add searching to the teams view
 2015-09-02 13:09:08 -04:00
Kevin Falcone
54cf7124f2 Merge pull request #9566 from edx/hotfix-2015-09-02 
Hotfix 2015 09 02 LTI Provider Fixes
 2015-09-02 13:06:31 -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
Sarina Canelake
4de03b64a9 Merge pull request #9583 from mirjamsk/patch-1 
Update AUTHORS
 2015-09-02 11:52:58 -04:00
Muzaffar yousaf
9473c29710 Merge pull request #9574 from edx/muzaffar/upgrade-sorl-thumbnail 
Upgrade sorl-thumbnail to 12.3.
 2015-09-02 20:32:30 +05: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
Ben Patterson
e47eb205d4 Merge pull request #9577 from edx/benp/ECOM-1165-declare-it-flaky 
Tagging this test as flaky.
 2015-09-02 10:36:11 -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
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