Commit Graph

7808 Commits

Author SHA1 Message Date
wajeeha-khalid
05b2e65e0f MA-2247 return student view data for discussion module 2016-05-09 17:37:31 +05:00
Calen Pennington
ccaafce05b Merge pull request #12205 from cpennington/disable-caching-in-tests
Disable caching in LMS tests
2016-05-06 15:22:48 -04:00
Alison Hodges
a422ad60f7 corrects guide name in template 2016-05-06 14:48:59 -04:00
Alison Hodges
afc5686391 Updates link to learner info in Numerical Input template 2016-05-05 22:29:57 -04:00
Usman Khalid
a2dadeaaf3 Added some documentation to Karma configuration files. 2016-05-05 22:42:04 +05:00
Usman Khalid
667a9b9ae6 Moved common files into karma.common.conf.js. 2016-05-05 22:42:04 +05:00
Usman Khalid
2839a42e0c Moved jasmine addons to common/js/spec_helpers. 2016-05-05 22:42:02 +05:00
Usman Khalid
15acec2054 Simplify paths patterns in karma config files.
Files which are loaded via RequireJs do not need to be individually
declared in karma config files. If we give karma directories,
it will serve all the files in them.
2016-05-05 22:42:00 +05:00
Usman Khalid
713c79e0aa Set included=false by default because we want to move towards RequireJs. 2016-05-05 22:39:59 +05:00
Usman Khalid
855fdbd387 Moved all logic from karma config files to karma.common.conf.js.
The config files just declare lists of files.
2016-05-05 22:38:34 +05:00
Usman Khalid
ecf233c1b4 Keep karma config file docs only in karma.common.conf.js. Duplicate stuff tends to get out of sync. 2016-05-05 22:35:54 +05:00
Usman Khalid
bb7b29b308 Deleted js-test-tool config files. 2016-05-05 22:35:53 +05:00
Calen Pennington
b3880714b9 Assert that caches are being overridden correctly (and being reset in the right order) 2016-05-04 14:51:31 -04:00
Calen Pennington
853bfe7a36 Add a TestCase mixin for enabling caches in tests
By default, disable all caching in tests, to preserve test independence.
In order to enable caching, inherit from CacheSetupMixin, and specify
which cache configuration is needed.

[EV-32]
2016-05-04 14:51:30 -04:00
Calen Pennington
18e1610043 Remove the create_user argument to setUp.
Instead, use a class attribute to define test behavior. This allows for
easier addition of new mixins over time.
2016-05-04 11:35:55 -04:00
clrux
972cee481f Merge pull request #12351 from edx/clrux/ac-452
AC-452 removing unnecessary and incorrect aria-label
2016-05-04 10:55:52 -04:00
Usman Khalid
d99978870a Merge pull request #12312 from edx/usman/tnl4398-fix-tests
Re-enable spec files that were disabled during the Jasmine upgrade.
2016-05-04 17:16:58 +05:00
Chris Rodriguez
0723b98283 AC-452 removing unnecessary and incorrect aria-label 2016-05-03 13:53:35 -04:00
John Eskew
b5ab64505a Merge pull request #11331 from CredoReference/invalid-studio-user-permissions
Invalid StudioPermissionsService object in API to show/save xblock settings in CMS
2016-05-03 13:16:43 -04:00
Nimisha Asthagiri
c6954902e3 Create courseware/views folder 2016-05-03 09:02:45 -04:00
clrux
15fc53c779 Merge pull request #12279 from edx/clrux/ac-448
AC-448 removing tabindex from canvas elements
2016-05-02 14:20:36 -04:00
Usman Khalid
68e2414053 Use triggerHandler instead of trigger to bypass Karma's global error handler.
Karma has a global event handler for events named "error" which
expects the event data to be a string and so fails when this
event is triggered. So we use triggerHandler which only invokes
handlers attached via jQuery.
2016-05-02 20:54:59 +05:00
David Ormsbee
f3b33ef14f Merge pull request #12275 from edx/ormsbee/video_state_opt_2
Remove unnecessary VideoModule save_states.
2016-05-02 10:54:40 -04:00
Chris Rodriguez
817449c761 AC-448 updating tabindex from 1 to 0 (zero) 2016-05-02 08:03:37 -04:00
asadiqbal
a4197eded5 WL-399 Course Details List Fields 2016-05-01 20:02:09 -04:00
Ibrahim
f7f281b65b WL-398 Add Course Background Image and Video Thumbnail Image Fields to Studio 2016-04-30 15:25:17 -04:00
David Ormsbee
f9d85e650c Remove unnecessary VideoModule save_states.
Before this commit, roughly half the save_state AJAX calls for the
VideoModule were done at load time, in order to send information about
YouTube availability (the value for which was almost always true).

This commit sends the value for what the LMS already thinks YouTube
availability is for this user, so that the AJAX callback is only
used in the case where the client side sees something different.

[PERF-262]
2016-04-29 16:32:17 -04:00
clrux
b69fea7233 Merge pull request #12306 from edx/clrux/tnl-4444
TNL-4444 correcting fullscreen transcript skip links
2016-04-29 14:16:15 -04:00
Christina Roberts
2497f0a0eb WIP: xblock pipeline work (#10176)
[PERF-303] Integer XBlocks/XModules into the static asset pipeline.

This PR, based on hackathon work from Christina/Andy, implements a way to discover all installed XBlocks and XModules and to enumerate their public assets, then pulling them in during the collectstatic phase and hashing them.  In turn, the methods for generating URLs to resources will then returned the hashed name for assets, allowing them to be served from nginx/CDNs, and cached heavily.
2016-04-29 10:52:42 -04:00
Chris Rodriguez
b20414bdbc TNL-4444 correcting fullscreen transcript skip links 2016-04-29 10:04:54 -04:00
Eric Fischer
955282f9c7 Merge pull request #12165 from edx/efischer/hide_timed_exams
TNL-4366 Hide Timed Exams
2016-04-29 09:28:16 -04:00
Eric Fischer
ea77c3ec42 Hide After Due setting for Timed Exams
TNL-4366
Changes in studio to allow the hide_after_due setting to be utilized.

Includes:
    -python changes to contentstore, where the data is stored.
    -refactoring of timed-examination-preference-editor.underscore, to add this
        setting and make the editor more accessible.
    -javascript changes to link the new setting to the correct data model.
    -sass updates to fix a11y issues on the editor modal.
    -addition of post-due visibility information to course outline in studio.
    -new tests: python, js, acceptance, and a11y
2016-04-28 13:27:19 -04:00
muzaffaryousaf
928d9a2694 Replace backbone-min to actual file. 2016-04-28 12:46:29 +05:00
Nimisha Asthagiri
036537f174 Merge pull request #12263 from edx/tnl/next-button-fix
Fix Next Button's 404 error
2016-04-27 13:18:39 -04:00
John Eskew
0899871958 Merge pull request #11042 from edx/jeskew/xml_removal
Remove XML modulestore code from most tests.
2016-04-27 11:20:02 -04:00
muhammad-ammar
4fd2a7d176 LMS fixes required to upgrade BackboneJS 2016-04-27 12:51:13 +05:00
muzaffaryousaf
e89a32d5c6 Upgrade backbone via npm.
TNL-4335
2016-04-27 12:48:45 +05:00
Nimisha Asthagiri
2396cc493d Fix Next Button's 404 error
MA-2305
2016-04-26 20:21:08 -04:00
Brian Jacobel
00fcb9ddc1 Fix FEDX-167: Both math inputs and adaptive hints are sized correctly 2016-04-25 14:31:53 -04:00
clrux
74db655ed9 Merge pull request #12239 from edx/clrux/ac-444
AC-444 Adding legacy event_type for language menu events
2016-04-25 13:58:44 -04:00
Chris Rodriguez
5137b9f8b6 Adding legacy event_type for language menu events 2016-04-25 08:58:43 -04:00
Chris Rodriguez
6ea7545cc3 AC-385 adding events for closed captions 2016-04-25 08:29:08 -04:00
J. Clifford Dyer
001874c42e Update seq_* to edx.ui.lms.sequence.* format
seq_next, seq_prev, and seq_goto events are all renamed, and maintain
legacy compatibility.

This PR also introduces new EventTransformer framework to shim events
based on name prefix.

MA-2221
2016-04-22 13:38:41 -04:00
Ehtesham
3507792b78 coverage fixes 2016-04-22 19:09:35 +05:00
Usman Khalid
d28f487235 Post rebase fixes. 2016-04-22 19:09:32 +05:00
Usman Khalid
3929bf50ce Disable video_bumper_spec.js 2016-04-22 19:09:32 +05:00
Usman Khalid
7bb96f6685 Added checks in video player methods which may get executed after the player has been destroyed. 2016-04-22 19:09:31 +05:00
muzaffaryousaf
9cbfea2edd Js test fixes for common, common-requirejs, xmodule. 2016-04-22 19:09:31 +05:00
muzaffaryousaf
db672f4631 Karma configurations for common, lms and cms.
TNL-4102
2016-04-22 19:09:27 +05:00
clrux
9f95c35872 Merge pull request #12198 from edx/clrux/ac-383
AC-383 language menu events only when menu opens
2016-04-22 09:51:50 -04:00