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

32439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
9ff0a16251 Merge pull request #9603 from edx/clrux/rc-2015-09-02-patch 
Overriding white color for messages on dashboard
 2015-09-03 14:11:06 -04:00
Chris Rodriguez
1c29763441 Overriding white color for messages on dashboard 2015-09-03 11:57:29 -04:00
Kevin Falcone
ff8e473787 Merge pull request #9588 from edx/release 
Merge two hotfixes to release
 2015-09-02 14:11:29 -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
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
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
Syed Hassan Raza
f82662356f Revert "OSPR-535 Partial Credit" 
This reverts commit 7624c63362.
 2015-09-01 14:04:42 -04:00
Feanil Patel
44b40b3fde Merge pull request #9538 from edx/feanil/upgrade_uglify_on_rc 
Upgrade uglify-js to 2.4.24
 2015-08-31 11:30:01 -04:00
Feanil Patel
4e66253c23 Upgrade uglify-js to 2.4.24 
The latest version of uglify-js fixed a vulnerability which allows a specially crafted Javascript file to have altered functionality after minification.

Changelog between the versions we are running can be found in the Readme file from this diff: https://github.com/mishoo/UglifyJS2/compare/v2.4.15...v2.4.24#diff-04c6e90faac2675aa89e2176d2eec7d8

We use the command line without any special arguments so I don't expect any issues.
 2015-08-31 09:32:59 -04:00
Andy Armstrong
a8284058e6 Merge pull request #9517 from edx/andya/disable-flaky-forum-test 
Disable team discussion Jasmine tests
 2015-08-28 11:41:15 -04:00
Ned Batchelder
741f06864a Merge pull request #9502 from edx/ned/import-path-differently 
Change imports from path to use the stablest name.
 2015-08-28 11:12:10 -04:00
David Ormsbee
1f64506c31 Merge pull request #9507 from edx/ormsbee/faster_tests_comment_client 
Convert CohortedTestCase to use SharedModuleStoreTestCase.
 2015-08-28 10:59:09 -04:00
Andy Armstrong
b74a1b9825 Disable team discussion Jasmine tests 
This is a temporary solution until we can fix TNL-3007
 2015-08-28 10:46:41 -04:00
Matt Drayer
a8cc585021 Merge pull request #9498 from edx/ziafazal/MAYN-86 
MAYN-86: Use microsite platform_name and email_from_address if available
 2015-08-28 10:37:28 -04:00
raeeschachar
39c7e30d4d Merge pull request #9514 from edx/raees-chrome-bok-choy-test-about-me-field 
Fixed test_about_me_field failing on chrome bok choy
 2015-08-28 19:37:13 +05:00
Bill DeRusha
9eafe4dfe6 Merge pull request #9489 from edx/bderusha/teams-mock-callback 
Improve teams test run times by skipping signals
 2015-08-28 10:09:17 -04:00
Muzaffar yousaf
f37371e3f0 Merge pull request #9512 from edx/muzaffar/tnl2964-breadcrumbs 
Adjust create new team page breadcrumbs.
 2015-08-28 17:47:21 +05:00
raeeschachar
a908f287f8 Fixed test_about_me_field failing on chrome bok choy 2015-08-28 16:18:06 +05:00
muzaffaryousaf
b45ffa11cc Changing the createNew teams-tab.js method to use the viewWithHeader. 
TNL-2964
 2015-08-28 15:59:21 +05:00
Muzaffar yousaf
28fddda407 Merge pull request #9376 from edx/muzaffar/tnl1914-team-edit-page 
Edit team page for Instructors only.
 2015-08-28 15:31:46 +05:00
Tim Krones
f9756eb436 Merge pull request #9483 from open-craft/OC-791-course-timeline-improved 
Instructor dashboard: Improve course timeline info
 2015-08-28 12:30:27 +02:00
Zia Fazal
f6ec9360e3 Use microsite platform_name and email_from_address if available 
fixed broken test

fixes for broken tests
 2015-08-28 15:24:26 +05:00
Syed Hasan raza
0448925f6b Merge pull request #9354 from edx/shr/bug/MA-824-fix-transcript-for-html5 
fetch transcript for html5 if 404
 2015-08-28 00:58:55 -07:00
muzaffaryousaf
f788caa6cc Edit team page for Instructor only. 
TNL-1914
 2015-08-28 12:47:15 +05:00
David Ormsbee
9bac3579c0 Convert CohortedTestCase to use SharedModuleStoreTestCase. 
Some low hanging fruit optimization of forums tests.
 2015-08-27 20:37:48 -04:00
Sarina Canelake
406c9bc556 Merge pull request #9464 from mirjamsk/mirjamsk/TNL-3096 
Adresses TNL-3096
 2015-08-27 19:36:43 -04:00
Matt Drayer
5140be7d5d Merge pull request #9479 from edx/asadiqbal08/SOL-1152 
asadiqbal08/SOL-1152- Getting error on editing the certificate in deactivated mode.
 2015-08-27 16:40:16 -04:00
Will Daly
325dbe0077 Merge pull request #9466 from edx/will/upgrade-django-model-utils 
Upgrading django-model-utils to 2.3.1
 2015-08-27 13:09:27 -07:00
Bill DeRusha
24a41dc59e Improve teams test run times by skipping signals 
TNL-3126

add **kwargs to skip_signal method
 2015-08-27 16:08:54 -04:00
Braden MacDonald
ba1b84210d Merge pull request #9313 from open-craft/twitter-tpa 
Fix for Twitter compatibility
 2015-08-27 12:21:29 -07:00
Braden MacDonald
586c237543 Fix for Twitter compatibility 2015-08-27 11:19:39 -07:00
Peter Fogg
5d26938158 Merge pull request #9366 from edx/peter-fogg/team-signals 
Add signals for user's discussion activity.
 2015-08-27 14:07:29 -04:00
Muzaffar yousaf
3eaf29fabe Merge pull request #9343 from edx/muzaffar/tnl1930-teams-accessibility 
Muzaffar/tnl1930 teams accessibility
 2015-08-27 22:50:36 +05:00
Utkarsh
d881067f84 Merge pull request #8835 from edx/utkjad/injecting_callstackmanager 
[PLAT -758] Making Call Stack Manager work in StudentModule and StudentModuleHistory, add @trackit, @wrapt dependency, and refine conditions
 2015-08-27 13:42:15 -04:00
Ned Batchelder
ff67dff633 Since the path import changes solved pylint issues, decrease the limit. 2015-08-27 13:39:14 -04:00
muzaffaryousaf
76f3ca8655 Accessibility fixes for team profile page. 
TNL-1930
 2015-08-27 22:02:29 +05:00
Ned Batchelder
2a0259095d Change imports from path to use the stablest name. 
The old line:

    from path import path

produced pylint errors because of the baroque way that path.py defined
"path".  We tried to get them to change how they defined it, but they
deleted the name instead: https://github.com/jaraco/path.py/issues/102

(Jason then changed his mind, but this is a better way to use path.py,
it avoids the pylint error at least.)
 2015-08-27 12:59:25 -04:00
Christina Roberts
df76994ea5 Merge pull request #9415 from edx/christina/insensitive-check 
Do a case insensitive check for conflicts to improve performance.
 2015-08-27 12:57:29 -04:00
mirjamsk
336982e42b Adresses TNL-3096 
Add acceptance test for TNL-3096

Adress comments on pull request

Fix test failing and img issue

Modify tests
 2015-08-27 15:50:33 +00:00
cahrens
41ac90fa7a Use team name prefix and UUID for team_id. 
TNL-3107
 2015-08-27 11:22:35 -04:00
Syed Hassan Raza
a2bca09c86 fetch transcript for html5 with youtubeId if 404 2015-08-27 08:04:57 -07:00
Will Daly
3c400783dd Merge pull request #9467 from edx/will/upgrade-django-mptt 
Upgrade django-mptt to 0.7.4
 2015-08-27 07:45:22 -07:00
Ned Batchelder
b6626620fd Merge pull request #9477 from edx/ned/clarify-advanced-component-types 
Add a comment explaining what ADVANCED_COMPONENT_TYPES should be.
 2015-08-27 10:31:56 -04:00
Jesse Zoldak
15ce2e10c6 Merge pull request #9484 from edx/zoldak/coverage-371 
Updated coverage to 3.7.1
 2015-08-27 10:18:27 -04:00
Waheed Ahmed
6b81f72d0e Merge pull request #9462 from edx/waheed/plat808-added-course-id-in-exception 
Added course in exception message for InvalidTabsException.
 2015-08-27 17:52:04 +05:00
raeeschachar
03520e663d Merge pull request #9417 from edx/raees-chrome-bok-choy-tests 
Fixed test_new_textbook_uplaod test that was failing on Chrome
 2015-08-27 17:33:50 +05:00