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

1214 Commits

Author SHA1 Message Date
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
39f32f9869 Simplified normalizePathsForCoverage. 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
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
cahrens
b1f715690a Fix incorrect truncation issue. 
TNL-4238
 2016-05-04 13:28:06 -04:00
cahrens
d9bb206868 Jasmine-jquery was moved to npm. 2016-05-02 10:27:33 -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
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
muzaffaryousaf
928d9a2694 Replace backbone-min to actual file. 2016-04-28 12:46:29 +05:00
muhammad-ammar
4fd2a7d176 LMS fixes required to upgrade BackboneJS 2016-04-27 12:51:13 +05:00
muzaffaryousaf
a1cb7b8f39 Common, squire fixes required to upgrade backbonejs 
TNL-4358
 2016-04-27 12:48:45 +05:00
muzaffaryousaf
e89a32d5c6 Upgrade backbone via npm. 
TNL-4335
 2016-04-27 12:48:45 +05:00
Brian Jacobel
217ea5d074 remove usage of minifed Underscore.string 2016-04-25 16:24:51 -04:00
Ehtesham
5b12f7d3dd fixing quality 2016-04-22 19:09:36 +05:00
Ehtesham
8603026795 making preprocessor files path absolute to have coverage reporter include file only once 2016-04-22 19:09:35 +05:00
Ehtesham
51bf39fc35 adding includeAllSources property in coverage settings 2016-04-22 19:09:35 +05:00
Ehtesham
3507792b78 coverage fixes 2016-04-22 19:09:35 +05:00
muzaffaryousaf
1b0cda2430 Js test fixes for lms and lms-coffee. 2016-04-22 19:09:33 +05:00
muzaffaryousaf
c0fef0b0e0 Js test fixes for cms and cms-squire. 2016-04-22 19:09:33 +05:00
Usman Khalid
d28f487235 Post rebase fixes. 2016-04-22 19:09:32 +05:00
Usman Khalid
c369e0ea1b Increase Karma's browserNoActivityTimeout to prevent timeouts on Jenkins. 2016-04-22 19:09:32 +05:00
muzaffaryousaf
9cbfea2edd Js test fixes for common, common-requirejs, xmodule. 2016-04-22 19:09:31 +05:00
Usman Khalid
afabc44e9e Added karma-spec-reporter. 2016-04-22 19:09:30 +05:00
muzaffaryousaf
db672f4631 Karma configurations for common, lms and cms. 
TNL-4102
 2016-04-22 19:09:27 +05:00
wajeeha-khalid
014185eaba Merge pull request #12145 from edx/jia/TNL-3818-refactor 
refactored variable name
 2016-04-15 16:07:32 +05:00
Chris Rodriguez
df5520bdf9 Video player: adding Dragabilly to closed captions 
* tests for dragging
* icon location reference updates
* pattern library usage
 2016-04-14 15:29:38 -04:00
wajeeha-khalid
e020869089 refactored variable name 2016-04-14 16:42:57 +05:00
wajeeha-khalid
5b5fb2464d TNL-3818: fixed recent activity mapping in thread-list sort for Forums Web 2016-04-13 17:47:31 +05:00
Chris Rodriguez
fbe6160461 LMS: updating transcript skip links 2016-04-07 12:18:08 -04:00
Andy Armstrong
db62db295c Upgrade Underscore.string 
FEDX-117
 2016-04-04 10:18:43 -04:00
Jacek Bzdak
09f5277f3b Some tests for badges js 2016-04-01 21:06:07 +00:00
Jonathan Piacenti
17ec12c650 Address platform final review notes. 2016-04-01 21:06:07 +00:00
Jonathan Piacenti
a04a635efc Add accomplishments to user profile 2016-04-01 10:13:08 -05:00
Omar Khan
793bb0f1e9 Custom icons for third party auth login buttons 
- Icon images can be uploaded from the django admin
- Test coverage improved
 2016-04-01 08:57:43 +07:00
Andy Armstrong
2a204f7ffa Add static HtmlUtils/StringUtils into edx namespace 
This is a temporary workaround for code that needs
access to these classes from the UI Toolkit but
without using RequireJS.
 2016-03-30 10:30:39 -04:00
Andy Armstrong
6dd09a89cf Fix issues with Underscore in the asset pipeline 
FEDX-121

The previous approach for handling NPM assets was
to symlink them into the static directory. This appeared
to cause trouble with the asset pipeline where the files
in question were not installed and then old versions were
picked up instead.

This change instead copies NPM libraries to a new
static directory so that the pipeline can consume them
as with any other file. This new directory is added to
.gitignore so that the files don't get accidentally
checked in.
 2016-03-25 10:02:38 -04:00
attiyaIshaque
1e74f942f1 Merge branch 'master' into ai/tnl3964-forum-vote-button 2016-03-23 19:00:01 +05:00
Andy Armstrong
c7336b3d68 Merge pull request #11880 from edx/andya/add-ui-toolkit-only 
Add the UI Toolkit to edx-platform
 2016-03-22 16:34:54 -04:00
M. Rehan
c9e1a86086 Merge pull request #11860 from edx/adam/fix-math-input-ajax 
TNL-4217 – Initialize preview once for an input for the first time
 2016-03-23 00:58:18 +05:00
Andy Armstrong
0177eeded4 Add the UI Toolkit to edx-platform 
UITK-75
 2016-03-22 15:31:27 -04:00
Adam Palay
d3a467d366 Only add event listener if it hasn't been added yet 2016-03-23 00:00:27 +05:00
Andy Armstrong
e854690a99 Revert "Upgrade underscore.string.min.js." 
This reverts commit e5c7fdda03.

Unfortunately this change broke bundling on sandboxes, so reverting
it so that master isn't left in a bad state.
 2016-03-22 10:44:19 -04:00
Attiya Ishaque
269a8e9d4d Styling on forums response vote button. 2016-03-21 18:33:06 +05:00
Andy Armstrong
76b8e2e897 Merge pull request #11631 from edx/fedx/upgrade-libraries 
Upgrade Underscore.js and Underscore.string.js
 2016-03-18 16:32:16 -04:00
Toby Lawrence
f3d000ec18 Merge pull request #11812 from edx/PERF-276 
Clear out usages of deprecated vendor prefixes.
 2016-03-18 08:02:45 -04:00