Commit Graph

32556 Commits

Author SHA1 Message Date
Ben Patterson
dff9f745e4 Reference appropriate JIRA ticket as a TODO. 2015-09-03 17:19:53 -04:00
Peter Fogg
447e0cf838 Mark test_video_control_events as flaky. 2015-09-03 16:12:38 -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
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
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
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
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
Adam
3792d67fd1 Merge pull request #9567 from edx/merge-release-into-master
Merge release into master
2015-09-02 09:21:45 -04: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
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 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
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
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
Davorin Šego
1d229a3293 Merge pull request #9540 from edx/dsego/SOL-1065
Use AjaxHelpers instead of Sinon fake server
2015-09-01 15:53:18 +02:00