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

32618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gabe Mulley
ab6e76c19b Add in a comment describing the reasoning for the names 2015-09-08 16:35:41 -04:00
Gabe Mulley
c652cb2d1d Fix order of tracking backends 2015-09-07 19:53:37 -04:00
Afeef Janjua
3ac27a5d6b Merge pull request #9625 from edx/afeef/bugfix/tnl-3094-unit-ribbon-courseware-z-index-fix 
pushed the unit ribbon in lms courseware to back which brought the us…
 2015-09-07 16:04:10 +05:00
Peter Fogg
1ba4200a84 Merge pull request #9624 from edx/peter-fogg/forum-teams-events 
Update discussion events to include team_id when appropriate.
 2015-09-04 13:58:43 -04:00
Peter Fogg
d7e1ec1922 Merge pull request #9613 from edx/peter-fogg/team-search-events 
Add teams eventing for search.
 2015-09-04 13:22:39 -04:00
Peter Fogg
607bd538e6 Update discussion events to include team_id when appropriate. 
TNL-3196
 2015-09-04 13:10:39 -04:00
Sarina Canelake
0dbcd397e9 Merge pull request #9571 from mirjamsk/mirjamsk/TNL-3183 
Addresses TNL-3183
 2015-09-04 13:01:07 -04:00
tasawernawaz
7179fac6a2 Merge pull request #9575 from edx/tasawer/story/xcom-285-removing-deprecated-view 
removing deprecated view VerifyLaterView
 2015-09-04 21:50:07 +05:00
Peter Fogg
86cce5f0ef Add teams eventing for search. 
TNL-3187
 2015-09-04 12:40:37 -04:00
Peter Fogg
c21976086c Merge pull request #9626 from edx/peter-fogg/disable-flaky-video-test 
Skip extra-flaky video test.
 2015-09-04 11:51:32 -04:00
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
Ned Batchelder
d567e5e3c8 Merge pull request #9591 from edx/ned/pylint-for-inherited-tests 
Update edx-lint to 0.2.6
 2015-09-04 11:18:33 -04:00
Sarina Canelake
88e380a383 Merge pull request #9628 from edx/sarina/20150904-update-translations 
Update translations (autogenerated message)
 2015-09-04 10:57:53 -04:00
Sarina Canelake
03f555210b Update translations (autogenerated message) 2015-09-04 10:56:27 -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
chrisndodge
ff0bacdea3 Merge pull request #9594 from edx/cdodge/edx-proctoring-0.8.0 
Update requirements of edx-proctoring to 0.8.x
 2015-09-04 10:37:24 -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
Matt Drayer
43da9f060e Merge pull request #9550 from edx/asadiqbal08/SOL-1157 
SOL-1157 Certs: Additional Studio UI cleanup
 2015-09-04 10:27:00 -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
Peter Fogg
ae006cffc4 Skip extra-flaky video test. 2015-09-04 09:53:47 -04:00
Fred Smith
b69c16293f Merge pull request #8692 from edx/derf/pymongo_2.8 
upgrade to pymongo 2.8 to support updated authenticated method SCRAM-SHA-1 for mongodb-server 3.0
 2015-09-04 09:47:15 -04:00
Afeef Janjua
d5389736f4 pushed the unit ribbon in lms courseware to back which brought the user drop down to front 
TNL-3094
 2015-09-04 18:44:20 +05: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
Marko Jevtić
ede8974419 Merge pull request #9478 from edx/mjevtic/SOL-1105 
(SOL-1154) Enabling search in devstack
 2015-09-04 15:13:58 +02:00
Muhammad Ammar
2df7585128 Merge pull request #9580 from edx/ammar/update-django-nose 
Update Django-nose
 2015-09-04 17:55:50 +05:00
Calen Pennington
dbfa6dafed Resolve conflicts in merge to master 2015-09-04 08:50:48 -04:00
Chris Dodge
d3474f2830 Update requirements of edx-proctoring to 0.8.x 2015-09-04 07:56:20 -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
Ben Patterson
97a11c1178 Merge pull request #9612 from edx/peter-fogg/mark-video-control-test-flaky 
Mark test_video_control_events as flaky.
 2015-09-03 18:59:49 -04:00
Ned Batchelder
f47a53eb66 Update edx-lint to 0.2.6 
This gets us checking for tests inheriting from other tests.  When that
happens, tests get run more than once, which is pointless.  We have a
few dozen new warnings due to this new check.

This also disables unused-wildcard-import.  That removes a few hundred
warnings.

Together, this means we can reduce the pylint limit to 5999. :)
 2015-09-03 18:22:21 -04:00
Ben Patterson
dff9f745e4 Reference appropriate JIRA ticket as a TODO. 2015-09-03 17:19:53 -04:00
Calen Pennington
821cc59415 Merge master into release-2015-09-02, leaving conflicts 2015-09-03 16:36:56 -04:00
Calen Pennington
7b492f1d92 Merge pull request #9521 from edx/rc/2015-09-02 
Rc/2015 09 02
 2015-09-03 16:28:02 -04:00
Matt Drayer
bf99963491 Merge pull request #9604 from edx/asadiqbal08/SOL-1128-enhancement 
SOL-1128 further enhancement
 2015-09-03 16:20:26 -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
Peter Fogg
447e0cf838 Mark test_video_control_events as flaky. 2015-09-03 16:12:38 -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
asadiqbal
725e186677 SOL-1128 further enhancement 2015-09-03 15:06:18 -04:00
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
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
Sven Marnach
2c7c4ba8b5 Merge pull request #9601 from open-craft/smarnach/update-xblock-hash 
Update the XBlock commit hash in the requirements to the latest version.
 2015-09-03 19:23:57 +02: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
raeeschachar
24c6a885f6 Merge pull request #9585 from edx/raees-fix-chrome-test-user-management 
Fixed Chrome test_user_management under LibraryUsersPageTest
 2015-09-03 22:06:05 +05:00
Chris Rodriguez
1c29763441 Overriding white color for messages on dashboard 2015-09-03 11:57:29 -04:00
Sven Marnach
f1bf3d1736 Update the XBlock commit hash in the requirements to the latest version. 
This includes the XBlock PRs #305, #308, #311, #313, #314, #316.
 2015-09-03 17:15:58 +02:00