Commits · 3c7b0b616853ba02462c5526bf632098757e3611 · edx / edx-platform · GitLab

04 Sep, 2015 2 commits
- remove django-robots · 3c7b0b61
  muhammad-ammar committed Sep 04, 2015
  
  3c7b0b61 Browse Files
- Merge pull request #9580 from edx/ammar/update-django-nose · 2df75851
```
Update Django-nose
```
  Muhammad Ammar committed Sep 04, 2015
  2df75851 Browse Files
03 Sep, 2015 20 commits
- Merge pull request #9612 from edx/peter-fogg/mark-video-control-test-flaky · 97a11c11
```
Mark test_video_control_events as flaky.
```
  Ben Patterson committed Sep 03, 2015
  97a11c11 Browse Files
- Reference appropriate JIRA ticket as a TODO. · dff9f745
  Ben Patterson committed Sep 03, 2015
  
  dff9f745 Browse Files
- Merge pull request #9604 from edx/asadiqbal08/SOL-1128-enhancement · bf999634
```
SOL-1128 further enhancement
```
  Matt Drayer committed Sep 03, 2015
  bf999634 Browse Files
- Merge pull request #9582 from edx/ormsbee/lti_passback_delay_config · 57085c01
```
Add lms/envs/aws.py entry for LTI_AGGREGATE_SCORE_PASSBACK_DELAY
```
  David Ormsbee committed Sep 03, 2015
  57085c01 Browse Files
- Mark test_video_control_events as flaky. · 447e0cf8
  Peter Fogg committed Sep 03, 2015
  
  447e0cf8 Browse Files
- SOL-1128 further enhancement · 725e1866
  asadiqbal committed Sep 03, 2015
  
  725e1866 Browse Files
- Merge pull request #9387 from cpennington/csm-count-requested-blocks · ec49576e
```
Record the number of blocks requested in get_many
```
  Calen Pennington committed Sep 03, 2015
  ec49576e Browse Files
- Merge pull request #9601 from open-craft/smarnach/update-xblock-hash · 2c7c4ba8
```
Update the XBlock commit hash in the requirements to the latest version.
```
  Sven Marnach committed Sep 03, 2015
  2c7c4ba8 Browse Files
- Merge pull request #9546 from edx/dan-f/add-profile-images-to-team-card · 210edb01
```
Add membership thumbnails to team cards
```
  Daniel Friedman committed Sep 03, 2015
  210edb01 Browse Files
- Merge pull request #9585 from edx/raees-fix-chrome-test-user-management · 24c6a885
```
Fixed Chrome test_user_management under LibraryUsersPageTest
```
  raeeschachar committed Sep 03, 2015
  24c6a885 Browse Files
- Update the XBlock commit hash in the requirements to the latest version. · f1bf3d17
```
This includes the XBlock PRs #305, #308, #311, #313, #314, #316.
```
  Sven Marnach committed Sep 03, 2015
  f1bf3d17 Browse Files
- adjusting team card profile pic styles · dd78e271
  Frances Botsford committed Sep 03, 2015
  
  dd78e271 Browse Files
- Add membership thumbnails to team cards. · 0e180bd2
```
TNL-3172
```
  Daniel Friedman committed Sep 03, 2015
  0e180bd2 Browse Files
- Merge pull request #9595 from… · 42181aea
```
Merge pull request #9595 from edx/muhhshoaib/MAYN-122-Enrollment-Codes-popup-is-not-completely-visible

MAYN-122
```
  Muhammad Shoaib committed Sep 03, 2015
  42181aea Browse Files
- Merge pull request #9584 from edx/mattdrayer/cert-webview-add-org-fields · c8129638
```
mattdrayer/cert-webview-add-org-fields: Added new fields to context
```
  Matt Drayer committed Sep 03, 2015
  c8129638 Browse Files
- MAYN-122 · 3bbd021a
```
added the scrolling for the registration_code_generation modal dialog box.
```
  Muhammad Shoaib committed Sep 03, 2015
  3bbd021a Browse Files
- Fixed Chrome test_user_management under LibraryUsersPageTest · 70573ca8
  raeeschachar committed Sep 03, 2015
  
  70573ca8 Browse Files
- Merge pull request #9533 from edx/ammar/update-mako · 4e5dc9f3
```
Update mako
```
  Muhammad Ammar committed Sep 03, 2015
  4e5dc9f3 Browse Files
- Merge pull request #9406 from edx/waheed/tnl3056-fix-duration-not-displaying-for-youtube-player · baa0f45e
```
Fixed duration not display on youtube player.
```
  Waheed Ahmed committed Sep 03, 2015
  baa0f45e Browse Files
- Fixed duration not display on youtube player. · 8f12fdf6
```
TNL-3056
```
  Waheed Ahmed committed Sep 03, 2015
  8f12fdf6 Browse Files
02 Sep, 2015 18 commits
- Merge pull request #9541 from edx/afzaledx/extending_auto_auth_for_verified_users · f80720d0
```
Added the ability to change the enrollment mode in the auto_auth API
```
  Afzal Wali Naushahi committed Sep 02, 2015
  f80720d0 Browse Files
- Merge pull request #9472 from edx/andya/team-search-ui · 7b77f816
```
Add searching to the teams view
```
  Andy Armstrong committed Sep 02, 2015
  7b77f816 Browse Files
- adjust teams search styles and add search clear · 0145ae7b
  Frances Botsford committed Sep 02, 2015
  
  0145ae7b Browse Files
- Add searching to the teams view · 4be74937
```
TNL-1935
```
  Andy Armstrong committed Sep 02, 2015
  4be74937 Browse Files
- Merge pull request #9583 from mirjamsk/patch-1 · 4de03b64
```
Update AUTHORS
```
  Sarina Canelake committed Sep 02, 2015
  4de03b64 Browse Files
- Merge pull request #9574 from edx/muzaffar/upgrade-sorl-thumbnail · 9473c297
```
Upgrade sorl-thumbnail to 12.3.
```
  Muzaffar yousaf committed Sep 02, 2015
  9473c297 Browse Files
- Merge pull request #9569 from edx/benp/TE-572-disable · 9fd1d907
```
TE-572 disable flaky test.
```
  Ben Patterson committed Sep 02, 2015
  9fd1d907 Browse Files
- Merge pull request #9577 from edx/benp/ECOM-1165-declare-it-flaky · e47eb205
```
Tagging this test as flaky.
```
  Ben Patterson committed Sep 02, 2015
  e47eb205 Browse Files
- mattdrayer/cert-webview-add-org-fields: Added new fields to context · f74c9b6d
  Matt Drayer committed Sep 02, 2015
  
  f74c9b6d Browse Files
- Merge pull request #9535 from edx/ziafazal/MAYN-119 · 49158fe0
```
MAYN-119: Hide shopping Cart menu
```
  Matt Drayer committed Sep 02, 2015
  49158fe0 Browse Files
- Added the ability to change the enrollment mode in the auto_auth API (used for… · 257aaaee
```
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
```
  Afzal Wali committed Sep 02, 2015
  257aaaee Browse Files
- Update AUTHORS · 3a6f4b99
  mirjamsk committed Sep 02, 2015
  
  3a6f4b99 Browse Files
- Add lms/envs/aws.py entry for LTI_AGGREGATE_SCORE_PASSBACK_DELAY · d81b6747
  David Ormsbee committed Sep 02, 2015
  
  d81b6747 Browse Files
- Merge pull request #9567 from edx/merge-release-into-master · 3792d67f
```
Merge release into master
```
  Adam committed Sep 02, 2015
  3792d67f Browse Files
- Update Django-nose · aa8e363c
  muhammad-ammar committed Sep 02, 2015
  
  aa8e363c Browse Files
- Tagging this test as flaky. · b4b0971c
```
ECOM-1165
```
  Ben Patterson committed Sep 02, 2015
  b4b0971c Browse Files
- Upgrade sorl-thumbnail to 12.3. · 65960ca0
  muzaffaryousaf committed Sep 02, 2015
  
  65960ca0 Browse Files
- Merge pull request #9023 from mcgachey/lti-collated-grades · 127467f2
```
[LTI Provider] Grade passback for non-leaf blocks.
```
  David Ormsbee committed Sep 02, 2015
  127467f2 Browse Files