Commit Graph

1077 Commits

Author SHA1 Message Date
cahrens
b67f07afc1 Move main_requirejs to live with the requirejs files. 2015-10-15 11:19:27 -04:00
cahrens
a099ff86e5 Move edx.utils.validate.
The test was not running where it lived before.
2015-10-15 11:02:12 -04:00
cahrens
5c12890da5 Delete old, unused version of MathJax.
This version was from 2012.
2015-10-09 15:24:15 -04:00
Andy Armstrong
8914aaf8d4 Refactor discussions code to address flaky test
TNL-3247

Removed remaining synchronous AJAX calls from discussions
Updated the profile view tests to use an attached view for testing
Removed one-time JQuery intiialization that could fail and break multiple tests
2015-10-07 11:22:48 -04:00
Marco Morales
ad5aab4cc1 Merge pull request #9666 from edx/marco/UX-2586/discussions-profile-photos
Discussion post cleanup (in preparation for post author images support)
2015-09-28 09:12:42 -04:00
Christine Lytwynec
80dafc2133 Merge pull request #9506 from edx/clytwynec/AC-157
Manage focus on delete component modal
2015-09-25 08:58:26 -04:00
Christine Lytwynec
2dc5b8e89c make verifyElementInFocus a ViewHelpers method 2015-09-24 16:25:49 -04:00
Andy Armstrong
5316cbee02 Merge pull request #8809 from edx/zoldak/update-sinon
Update Sinon library
2015-09-24 13:17:03 -04:00
Eric Fischer
cf5d5666a3 Merge pull request #9794 from edx/efischer/prevent_doubleclick
TNL 3294 - Prevent double click creating multiple teams
2015-09-24 11:01:43 -04:00
Jesse Zoldak
1aa181c90a Update sinon to version 1.17.0 2015-09-24 10:55:48 -04:00
Eric Fischer
02b72abccb Disable button while running
Now using withDisabledElement to prevent multiple event handling. I've
attempted to write this as a common function in view_utils, so that this
approach can be used more generally, wherever needed. Includes a unit test.

Thanks to Christina and Andy for all their help on this one.
2015-09-24 10:13:30 -04:00
louyihua
66678c103f i18n fix
1. Add missing '_()' in capa_base.py & video_xfields.py
2. Fix a bug in instructor_dashboard.py that causes crash when ANALYTICS_DASHBOARD_NAME contains non-ascii characters.
3. Workaround for mis-extractions inside .underscore files when using gettext along with interpolate.
2015-09-24 13:02:12 +08:00
Andy Armstrong
b2a0b2f728 Improve response handling in AjaxHelpers
I've changed the logic so that AjaxHelpers keeps
track of which requests have not yet had mock
responses sent. This ensures that every response
is handled before moving on to the next one,
rather than always handling the last request.
My intention is that this won't allow bugs to creep
in where a request isn't fired and instead the test
responds to an old request. It also should ensure
that extra events aren't accidentally fired.
2015-09-23 20:23:09 -04:00
Andy Armstrong
d09034e065 Improve team testing of routers 2015-09-23 13:10:46 -04:00
Colin-Fredericks
350387c0a9 TNL-3197 Partial Credit (not Dropdown)
Updated templates

Updating responsetype tests.

Updating other tests for PC

Putting OptionInput back the way it was.

Acceptance tests for partial credit

Testing tools

pep8

scss name fix

Missing }

icon fix

icon fix
2015-09-22 13:20:39 -04:00
Christine Lytwynec
f96d4b7142 Manage focus on modal confirmation prompt 2015-09-21 13:36:02 -04:00
Marco Morales
ad465d6ba6 Discussion forum styling cleanup to correct current visual styling issues in addition to cleaning up styles in preparation for adding post images 2015-09-21 09:24:47 -04:00
clrux
dfaef63595 Merge pull request #9140 from edx/clrux/ux-2620-new-post-focus
Assigning focus to the selected topic
2015-09-19 11:52:19 -04:00
Peter Fogg
0a2cfbe31c Merge pull request #9738 from edx/peter-fogg/change-studio-help-links
Remove Tender and change Studio help links.
2015-09-17 22:42:57 -04:00
Chris Rodriguez
f63ff69097 Assigning focus to the selected topic
TNL-2620
2015-09-17 17:31:30 -04:00
Peter Fogg
fec5129a49 Remove Tender and change Studio help links.
TNL-2695
2015-09-17 16:30:40 -04:00
John Eskew
7c0663f25e Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 15:58:08 -04:00
David Baumgold
1c21a0d250 Remove trailing whitespace from Sass files 2015-09-14 15:17:10 -04:00
Andy Armstrong
f80b6221d9 Fix duplicate calls to search API
TNL-3198

Also fixed a regression with the search breadcrumbs
where it wasn't possible to navigate back to the
full list.
2015-09-14 13:32:45 -04:00
Bill DeRusha
1cfadf39cc Add logic to handle not searching when focus is passed to the clear search button
TNL-3238
2015-09-14 11:08:33 -04:00
Peter Fogg
0612e914dc Various accessibility fixes for Teams.
Update teams breadcrumb aria-label, make team membership display as a
<ul>, fix contrast issues, and remove an extraneous angle bracket.
2015-09-11 15:25:30 -04:00
Andy Armstrong
6817e89f4a Fix i18n for last activity date on team cards 2015-09-09 17:59:25 -04:00
zubair-arbi
d2a4790855 use the standard syntax to load JavaScript dependencies on logistration js files
ECOM-2044
2015-09-07 18:19:56 +05:00
Andy Armstrong
4be74937df Add searching to the teams view
TNL-1935
2015-09-02 12:26:07 -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
Syed Hassan Raza
f82662356f Revert "OSPR-535 Partial Credit"
This reverts commit 7624c63362.
2015-09-01 14:04:42 -04:00
muhammad-ammar
4840b46716 i18n and rtl fixes
TNL-3125
2015-09-01 12:16:41 +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
muhammad-ammar
d8b419c64f Review changes 2015-08-26 20:26:35 +05:00
muhammad-ammar
6134e8b5ed Move studio dialog code into common 2015-08-26 20:26:27 +05:00
Peter Fogg
382909b7c3 Add sorting controls on Teams topics page.
TNL-1936
2015-08-25 16:59:52 -04: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
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
Jolyon Bloomfield
c9fe2b9756 Fixing drag and drop labels 2015-08-16 20:16:40 -04:00
cahrens
c929cdb54d Add an additional test case related to re-fetching data. 2015-08-14 14:48:09 -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
Andy Armstrong
a24e3cb0fc Implement model refreshing for Teams tab
TNL-2976
2015-08-14 11:12:11 -04:00
Frances Botsford
70a14ffe91 remove list margin and padding on cards lists 2015-08-13 16:44:31 -04: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
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
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
Marco Morales
dd67f8aa72 updated inline discussion styling to account for lack of expand / show message (which was being relied on for layout) and also removed issues of generic pagination styling impacting the older inline discussion pagination pattern with a class renaming 2015-08-06 11:15:55 -04:00
Andy Armstrong
63da1907eb Show inline discussion component on Team view
TNL-2515
2015-08-06 11:15:55 -04:00
Ned Batchelder
ff243eaa70 Merge pull request #9187 from edx/release
Release merge to master
2015-08-04 14:18:50 -04:00