Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,820 Commits 1 Branch 0 Tags
03e241ecc4be75f2f4dc86805ddac5a1d3ca3dd2
Commit Graph

6900 Commits

Author SHA1 Message Date
Ibrahim
a51143fe38 fix height of delete button to match the attached text field 2016-05-09 16:58:01 +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
Adam
97a893efdf Merge pull request #12334 from edx/adam/escape-library-html-only 
escape library.html
 2016-05-06 13:38:32 -04:00
Diana Huang
07573c5141 Replace old conditional lettuce test with bok choy version. 2016-05-06 09:38:36 -04:00
Adam Palay
9ea24bf5e3 escape library.html 
show_children_previews was not being evaluated before
 2016-05-06 09:24:56 -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
6ed935383b Remove xmodule_js prefix from paths of edx-ui-toolkit, edx-pattern-library and common. 2016-05-05 22:42:03 +05:00
Usman Khalid
2839a42e0c Moved jasmine addons to common/js/spec_helpers. 2016-05-05 22:42:02 +05:00
Usman Khalid
84412ef8ea Exclude translation files from coverage tracking. 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
Ned Batchelder
190c2ffc99 Update translations (autogenerated message) 2016-05-05 15:52:25 +00: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
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
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
Usman Khalid
78af4100cd Fixes for course updates date validation. 
If the first date the user selects is invalid it is not set on the
model. This is because jQuery datepicker's getDate returns the
current date when an invalid value is put in the field and the
model's initial value is also the current date. So always update
the date.
 2016-05-03 15:41:22 +05:00
Usman Khalid
8fef4148a5 Re-enabled videolist_spec, message_manager_spec and file_uploader_spec. 2016-05-02 20:54:59 +05:00
Ayub khan
d45c4d8caf Revert "Implement 'from_string_or_404' in utils" 2016-05-02 14:23:39 +05: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
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
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
Usman Khalid
09594d6305 Merge pull request #12243 from edx/usman/tnl4416-spec-nesting 
When using RequireJS load spec files one by one.
 2016-04-29 17:09:57 +05:00
Ehtesham Kafeel
8cf89d3a8e Merge pull request #12289 from edx/mzfr/backbone-cleanup 
Replace backbone-min.js to backbone.js
 2016-04-29 16:53:02 +05:00
Usman Khalid
6c26715a14 Make hashes unique so that they do not conflict with hashes from module_edit_spec.coffee. 2016-04-29 15:54:48 +05:00
Usman Khalid
4d228199d1 When using RequireJS load spec files one by one. 
Jasmine has a global stack for creating a tree of specs. We need to load
spec files one by one, otherwise some end up getting nested under others.
 2016-04-29 15:54:47 +05: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
Ned Batchelder
861e8a0e9e Update translations (autogenerated message) 2016-04-28 14:55:52 +00:00
Ayub khan
986209669d Revert "SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404" 2016-04-28 15:50:17 +05:00
muzaffaryousaf
928d9a2694 Replace backbone-min to actual file. 2016-04-28 12:46:29 +05: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
Ehtesham
c87821446b CMS event fixes required to upgrade backbonejs 2016-04-27 12:48:46 +05:00
Ehtesham
59e1cafc02 CMS fixes required to upgrade backbonejs 2016-04-27 12:48:45 +05:00
muzaffaryousaf
e89a32d5c6 Upgrade backbone via npm. 
TNL-4335
 2016-04-27 12:48:45 +05:00
Ibrahim Ahmed
8b014f2650 Merge pull request #12107 from edx/ibrahimahmed443/WL-309-new-fields-in-studio 
WL-309 Add new text fields to Studio schedule and details settings page
 2016-04-26 14:30:43 +05:00
Awais Jibran
b4e8086397 Merge pull request #12049 from edx/aj/safe-templates 
Safe templates
 2016-04-26 09:40:31 +05:00
Ibrahim
720bde1da9 add new text fields to schedule and details settings page 2016-04-25 23:44:13 -04:00
Andy Armstrong
fe88402982 Merge branch 'master' into alasdair/fedx-118-pattern-library-styles-with-current-partials 2016-04-25 16:51:25 -04:00
Andy Armstrong
56d003e47e Merge pull request #12219 from stvstnfrd/staticfiles/cms 
Remove LMS_ROOT / static from cms/common.py
 2016-04-25 16:50:29 -04:00
clrux
8e347f4078 Merge pull request #12101 from edx/clrux/ac-342-tweaking-skip-links 
AC-342 sending skip links to single main, relevant
 2016-04-25 11:36:26 -04:00
AlasdairSwan
a9971ef2ba FEDX-118 Adding header to test page 2016-04-25 10:56:28 -04:00
Chris Rodriguez
2a23757fbc Sending skip links to single main, making more relevant 2016-04-25 10:00:45 -04:00
Awais Jibran
34b06932e5 Safe tempaltes 2016-04-25 16:30:09 +05: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