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

11801 Commits

Author SHA1 Message Date
Syed Hassan Raza
3849a8fa81 prevent delete public oprhans 2015-09-23 05:53:42 -07: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
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
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 Fogg
ae006cffc4 Skip extra-flaky video test. 2015-09-04 09:53:47 -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
William Ono
4d1194800e Support LTI third-party-auth providers 
PR #8930
 2015-09-03 22:53:45 -07: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
Peter Fogg
447e0cf838 Mark test_video_control_events as flaky. 2015-09-03 16:12:38 -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
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
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
4be74937df Add searching to the teams view 
TNL-1935
 2015-09-02 12:26:07 -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
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
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
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 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
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
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
Marko Jevtic
1531d8d250 (SOL-1160) mark test as flaky 2015-09-01 12:26:50 +00:00
Muhammad Ammar
f2b3ec5766 Merge pull request #9513 from edx/ammar/tnl3125-i18n-and-rtl-fixes 
i18n and rtl fixes
 2015-09-01 16:50:33 +05:00
muhammad-ammar
4840b46716 i18n and rtl fixes 
TNL-3125
 2015-09-01 12:16:41 +05:00
tasawernawaz
c217d986de Merge pull request #9516 from edx/tasawer/dev-story/ecom-1017-removing-experimental-logistration-endpoints-updated 
Removed unused url endpoints
 2015-09-01 11:50:52 +05:00
Andy Armstrong
9ff620dedf Merge pull request #9334 from jolyonb/dragdropfix 
Fixing drag and drop labels
 2015-08-31 17:12:49 -04:00
Kevin Falcone
e3c66f55e0 Optimize memory and CPU usage. 
The print_out_all_courses() routine consumes a ton of memory (2G and
causes noticable mongo usage spikes).  This actually causes other
processes on production boxes to be memory starved and killed
(such as worker children on edge when this was run recently).

The behavior of this script on production is
* Print several hundred courses
* Ask if you want to delete the one you specified
* print several hundred courses minus one
On a sandbox with 5 courses, you could tell by eye that 1 is gone, but
not in production (or even in stage).

The original PLAT-619 ticket for this suggested printing a course
listing on error, but instead it always printed the course listing.
Even in the error case, hundreds of course ids is confusing and obscures
the error message saying that your course_id is invalid.

You should be getting the course id from the UI or from ./manage.py lms
dump_course_ids, not by searching a list.

Adjusted the test accordingly

Remove get_courses_keys
 2015-08-31 11:28:26 -04:00
Tasawer
cd69ca2b23 Removed unused url endpoints + fixed broken tests 
ECOM-1017
 2015-08-31 12:50:08 +00:00
Tasawer
58a2dc2466 Removing flaky decorator from test 
ECOM-1165
 2015-08-31 07:43:17 +00:00
marcotuts
dc5c4660c7 updated partially correct capa icon, accounting for lack of status label or message on these problems. New icon used is an asterisk with the same green color. 2015-08-28 15:57:25 -04:00
Peter Fogg
2c774fd271 Allow sorting of teams in a topic. 
TNL-1937
 2015-08-28 15:46:07 -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
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
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
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