Commit Graph

1094 Commits

Author SHA1 Message Date
Christine Lytwynec
ba53f97bf1 prevent duplicate #lean_overlay elements 2015-12-17 12:16:12 -05:00
Andy Armstrong
5b9e0e9dcf Merge pull request #10957 from edx/andya/studio-xblock-debugging
Support local debugging of XBlock JavaScript
2015-12-14 13:05:23 -05:00
Andy Armstrong
cc24ca55e6 Support local debugging of XBlock JavaScript
It turns out that loading JavaScript with $.getScript
causes Chrome to treat the file as an XHR request
and not JS. I've switched over to using RequireJS
to load the URL which already has the ability to
dynamically load files and have the browser
recognize them.
2015-12-11 15:50:38 -05:00
stv
0532b87a86 Remove ORA1 images 2015-12-11 15:07:07 -05:00
Chris Rodriguez
78c6a38ca6 LMS: new UI for video player + AFontGarde iconfonts 2015-11-12 16:37:29 -05:00
Andy Armstrong
7a1469633f Fix optimizing of draggabilly and json2 2015-11-06 09:40:20 -05:00
Andy Armstrong
0785aeb959 Merge pull request #10426 from edx/andya/update-draggabilly
Upgrade draggabilly.js to fix Firefox iframe bug
2015-11-05 11:01:35 -05:00
Andy Armstrong
18dabc3312 Upgrade draggabilly.js to fix Firefox iframe bug
TNL-3627
2015-11-05 10:10:39 -05:00
Sarina Canelake
e46b43963c Merge pull request #10416 from louyihua/underscore_ngettext
Fix underscore extraction error
2015-11-04 12:17:01 -05:00
louyihua
c78b306a30 Fix a underscore extraction error
ngettext and its parameters should not be separated into multiple lines.
2015-11-04 15:03:29 +08:00
Peter Fogg
759a3c4f1f Fix withData and withConfiguration helpers.
Both of them dynamically generate specs which close over the iteration
variable of a for loop. Closures capture *references*, not values, and
so when the variable is mutated on loop iteration its new value is
used when the spec is called. This means that instead of running a
spec with n different values, we run the spec n times with the same
value. This is bad.
2015-11-02 16:34:06 -05:00
Christina Roberts
3382a955c9 Merge pull request #10378 from edx/christina/fix-mathjax-preview
Disable Fast Preview for version 2.5.
2015-10-29 12:41:30 -04:00
cahrens
deb4e35f92 Disable Fast Preview for version 2.5.
Except for the Discussion Tab.
TNL-3693, TNL-3365
2015-10-29 11:56:08 -04:00
Sarina Canelake
2206b8a056 Merge pull request #10324 from stvstnfrd/debt/circuit
Remove circuit djangoapp from LMS
2015-10-29 11:15:15 -04:00
cahrens
c8f1987a84 Delete swfobject.js and analytics.js. 2015-10-28 14:52:43 -04:00
stv
a8d30c5de2 Remove circuit-schematic integration from wiki 2015-10-26 15:51:12 -07:00
Matjaz Gregoric
27238654fd Extract translatable strings from edx.utils.validate.js.
The JS validation utility functions from edx.utils.validate.js file
that are used on the combined login registration page include some
translatable strings that weren't getting extracted by the i18n tools
because they were defined inside underscore template strings.

This commit pulls the translatable strings out of the templates
to make sure gettext detects the strings at extraction time.
2015-10-22 10:40:24 +02:00
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