Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

1831 Commits

Author SHA1 Message Date
Diana Huang
8c1bf2cd3a Add events for tracking when teams are edited. 
TNL-3190
 2015-09-04 15:27:40 -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
Sarina Canelake
0dbcd397e9 Merge pull request #9571 from mirjamsk/mirjamsk/TNL-3183 
Addresses TNL-3183
 2015-09-04 13:01:07 -04: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
a743f4a642 Add teams eventing and tests. 2015-09-04 10:45:01 -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
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
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
mirjamsk
fb65874930 Addresses TNL-3183 2015-09-02 08:00:42 +00: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
Marko Jevtic
1531d8d250 (SOL-1160) mark test as flaky 2015-09-01 12:26:50 +00:00
Tasawer
58a2dc2466 Removing flaky decorator from test 
ECOM-1165
 2015-08-31 07:43:17 +00: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
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
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
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
Sarina Canelake
406c9bc556 Merge pull request #9464 from mirjamsk/mirjamsk/TNL-3096 
Adresses TNL-3096
 2015-08-27 19:36:43 -04:00
Peter Fogg
5d26938158 Merge pull request #9366 from edx/peter-fogg/team-signals 
Add signals for user's discussion activity.
 2015-08-27 14:07:29 -04:00
Ned Batchelder
2a0259095d Change imports from path to use the stablest name. 
The old line:

    from path import path

produced pylint errors because of the baroque way that path.py defined
"path".  We tried to get them to change how they defined it, but they
deleted the name instead: https://github.com/jaraco/path.py/issues/102

(Jason then changed his mind, but this is a better way to use path.py,
it avoids the pylint error at least.)
 2015-08-27 12:59:25 -04:00
mirjamsk
336982e42b Adresses TNL-3096 
Add acceptance test for TNL-3096

Adress comments on pull request

Fix test failing and img issue

Modify tests
 2015-08-27 15:50:33 +00:00
Syed Hassan Raza
a2bca09c86 fetch transcript for html5 with youtubeId if 404 2015-08-27 08:04:57 -07:00
raeeschachar
03520e663d Merge pull request #9417 from edx/raees-chrome-bok-choy-tests 
Fixed test_new_textbook_uplaod test that was failing on Chrome
 2015-08-27 17:33:50 +05:00
Peter Fogg
38fb6eaede Add signals for user's discussion activity. 
These signals are caught by the Teams app and used to update
`last_activity_at` on both teams and individual users.

TNL-2497
 2015-08-26 12:07:54 -04:00
Usman Khalid
6a1be48e1e Merge pull request #9418 from edx/usman/tnl2883-video-tests 
Fix video bumper tests.
 2015-08-26 16:59:42 +05:00
Usman Khalid
0dbb969be3 Fixed video bumper tests. 
TNL-2883
 2015-08-26 14:50:56 +05:00
Peter Fogg
382909b7c3 Add sorting controls on Teams topics page. 
TNL-1936
 2015-08-25 16:59:52 -04:00
raeeschachar
222fdec58f Fixed test_new_textbook_uplaod test that was failing on Chrome 2015-08-25 18:41:01 +05:00
Marko Jevtić
45832b986a Merge pull request #9283 from edx/mjevtic/SOL-1040 
(SOL-1040) Indexing capa problems
 2015-08-24 14:40:29 +02:00
Usman Khalid
e3bd509a39 Re-enable skipped video player tests. 
This reverts commit f58764875c.
 2015-08-21 02:55:04 +05:00