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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
raeeschachar
|
70573ca859
|
Fixed Chrome test_user_management under LibraryUsersPageTest
|
2015-09-03 18:05:44 +05:00 |
|
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 |
|
Waheed Ahmed
|
8f12fdf6eb
|
Fixed duration not display on youtube player.
TNL-3056
|
2015-09-03 12:14:55 +05: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 |
|