Commit Graph

653 Commits

Author SHA1 Message Date
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
Colin-Fredericks
7624c63362 OSPR-535 Partial Credit
Squashed commit of the following:

commit 0f7c2af5f7b8caed575dd253a45299293b2729d7
Author: Colin-Fredericks <colin.fredericks@gmail.com>
Date:   Tue Jun 30 12:04:43 2015 -0400

    Forgot icon

commit b48970392741130f774709c54eb6e5ab0089812c
Author: Colin-Fredericks <colin.fredericks@gmail.com>
Date:   Tue Jun 30 11:49:57 2015 -0400

    OSPR-535 Partial Credit

    Squashed commit of the following:

    commit 6dd34f58f994e32d0d54bf1d67bffd04e0f8ef08
    Author: Colin-Fredericks <cof945@dhcp-140-247-184-176.fas.harvard.edu>
    Date:   Tue Jun 30 11:44:01 2015 -0400

        Fixing accidental overwrite.

    commit 1ff8fc4b0e83b90356e8e8dce1022f49bfd162cf
    Author: Colin-Fredericks <cof945@dhcp-140-247-184-176.fas.harvard.edu>
    Date:   Tue Jun 30 11:18:36 2015 -0400

        OSPR-535 Partial Credit

        Revised after first pull discussion.

Fixing scss typos

Fixing check/x display problem

Empty set is not []

Shuffling empty answer code to grade properly.

I don't think I ever wrote this in the first place...

Adding tests for MC and Checkbox

including proper partial-credit marking and scoring

Numerical and OptionResponse tests

Also a few improvements to NumericalResponse problem type and
exception-raising.

CustomResponse tests and more numerical tests

Increasing coverage and fixing typos

Exception added for pylint false positive

Hopefully fixing coverage issue

Retabulating line continuation

Bok Choy test for partial credit

Copypasta fix

Adding tooltip for partial credit

Improving and expanding comments

Minor fixes
2015-08-20 11:18:13 -04:00
Eric Fischer
c170ff44e3 Fixing flaky bokchoy TeamPageTests
The flaky test problems we've been seeing here are coming from not
waiting long enough after performing actions. By forcing
is_browser_on_page checks to wait until the page is fully loaded
instead of just looking for the presence of a single element, we
ensure that there will not be issues interacting with non-loaded
elements.

TNL-3069
2015-08-19 16:51:30 -04:00
Sarina Canelake
25a117613d Revert "Merge pull request #8724 from Colin-Fredericks/ColinF-partial-credit"
This reverts commit cea274dc52, reversing
changes made to 02cf9caca6.
2015-08-19 11:07:14 -04:00
Eric Fischer
ab3b2ebd9a Fixing problematic bok_choy test
By moving the team_page.first_member_username access to occur before
click_first_profile_image() is called, we avoid a potential issue
where the wrapper() method defined in page_object.py, which
decorates the property, calls into _verify_page() and raises a
WrongPageError.
2015-08-18 09:16:26 -04:00
Jesse Zoldak
996ce1d62c Mark TeamPageTest class as flaky TNL-3069 2015-08-14 16:07:54 -04:00
Andy Armstrong
1265d540ad Merge pull request #9302 from edx/andya/team-refresh-handling
Implement model refreshing for Teams tab
2015-08-14 11:50:54 -04:00
cahrens
c84abfab40 Bok choy tests for dynamic updating after team changes. 2015-08-14 11:12:11 -04:00
Andy Armstrong
a24e3cb0fc Implement model refreshing for Teams tab
TNL-2976
2015-08-14 11:12:11 -04:00
chrisndodge
460a4b5f99 Merge pull request #9069 from edx/cdodge/proctoring-lms-integration
Integration of Proctoring into the LMS
2015-08-14 07:18:14 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Diana Huang
afa587cc38 Remove invite link functionality from teams.
TNL-3062
2015-08-13 17:53:26 -04:00
muhammad-ammar
5fc612079b Support leaving a team
TNL-1910
2015-08-13 20:27:38 +05:00
muhammad-ammar
853f97afbc support joining a team
TNL-1909
2015-08-13 14:41:21 +05:00
muzaffaryousaf
a56e6bf743 Team details page.
TNL-1906
2015-08-13 14:20:07 +05:00
Peter Fogg
26bbbb967e Fix various team accessibility issues.
Authors:
  - Peter Fogg
  - Daniel Friedman

TNL-1953
2015-08-13 00:34:54 -04:00
Andy Armstrong
8bbf7c57ac Improve Teams tab navigation 2015-08-12 19:20:48 -04:00
Marko Jevtic
67b64a8026 Fixing bokchoy test failure 2015-08-12 14:44:11 +00:00
Usman Khalid
1de9fc6461 Merge pull request #9200 from edx/usman/tnl1911-my-teams
My teams tab.
2015-08-11 19:22:50 +05:00
Usman Khalid
b4ed9a28b0 My Teams tab.
TNL-1911
2015-08-11 17:27:53 +05:00
Colin-Fredericks
c940814c8c OSPR-535 Partial Credit
Squashed commit of the following:

commit 0f7c2af5f7b8caed575dd253a45299293b2729d7
Author: Colin-Fredericks <colin.fredericks@gmail.com>
Date:   Tue Jun 30 12:04:43 2015 -0400

    Forgot icon

commit b48970392741130f774709c54eb6e5ab0089812c
Author: Colin-Fredericks <colin.fredericks@gmail.com>
Date:   Tue Jun 30 11:49:57 2015 -0400

    OSPR-535 Partial Credit

    Squashed commit of the following:

    commit 6dd34f58f994e32d0d54bf1d67bffd04e0f8ef08
    Author: Colin-Fredericks <cof945@dhcp-140-247-184-176.fas.harvard.edu>
    Date:   Tue Jun 30 11:44:01 2015 -0400

        Fixing accidental overwrite.

    commit 1ff8fc4b0e83b90356e8e8dce1022f49bfd162cf
    Author: Colin-Fredericks <cof945@dhcp-140-247-184-176.fas.harvard.edu>
    Date:   Tue Jun 30 11:18:36 2015 -0400

        OSPR-535 Partial Credit

        Revised after first pull discussion.

Fixing scss typos

Fixing check/x display problem

Empty set is not []

Shuffling empty answer code to grade properly.

I don't think I ever wrote this in the first place...

Adding tests for MC and Checkbox

including proper partial-credit marking and scoring

Numerical and OptionResponse tests

Also a few improvements to NumericalResponse problem type and
exception-raising.

CustomResponse tests and more numerical tests

Increasing coverage and fixing typos

Exception added for pylint false positive

Hopefully fixing coverage issue

Retabulating line continuation

Bok Choy test for partial credit

Copypasta fix

Adding tooltip for partial credit

Improving and expanding comments

Minor fixes
2015-08-10 10:58:50 -04:00
Peter Fogg
e0e895a531 Add Bok Choy tests for teams page URL routing. 2015-08-06 13:32:48 -04:00
Peter Fogg
2f7fa6fd8b Enforce discussions permissions in teams UI.
Adds a read-only mode to the discussion module which disables any
controls for updating the discussion (votes, follows, replies,
etc). This mode is enabled for users who are not a member of the team,
and are also not moderators, admins, or community TAs.
2015-08-06 11:15:56 -04:00
Andy Armstrong
63da1907eb Show inline discussion component on Team view
TNL-2515
2015-08-06 11:15:55 -04:00
Ben Patterson
92c9c1d529 New bok-choy shard (#7). 2015-08-05 13:52:39 -04:00
muhammad-ammar
69450fce47 create a new team
TNL-1899
2015-08-05 17:55:26 +05:00
Awais Jibran
6d16da7339 Merge pull request #9015 from edx/aj/tnl2857-mathjax-probelm-in-problem-hints
Fixed MathJax rendering in problem hint
2015-08-04 23:12:03 +05:00
Awais Jibran
99cd48c858 Merge pull request #9179 from edx/aj/tnl2855-depricated-blocks-in-edge
Fixed ORA1 deprecated warning message
2015-08-04 23:09:00 +05:00
Awais Jibran
1ac90573ae Fixed ORA1 deprecated warning message when a component does not have a display_name
TNL-2855
2015-08-04 18:18:18 +05:00