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

40279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
sanfordstudent
db52e0334f Merge pull request #12333 from edx/sstudent/MA-2252 
Sstudent/ma 2252
 2016-05-05 12:52:09 -04:00
Ned Batchelder
850bc6bb06 Merge pull request #12375 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-05-05 12:46:35 -04:00
Ned Batchelder
190c2ffc99 Update translations (autogenerated message) 2016-05-05 15:52:25 +00:00
Sanford Student
d4146e7a1d accordion emits event 2016-05-05 11:48:09 -04:00
Peter Fogg
4a417f2832 Merge pull request #12372 from edx/feature/catalog-admin 
Merge catalog admin into master.
 2016-05-05 10:29:13 -04:00
Peter Fogg
e6f3af654b Merge pull request #12363 from edx/peter-fogg/fix-api-email 
Correctly pull in API access email config.
 2016-05-05 09:58:36 -04:00
Edward Zarecor
ce7d4f03ae Merge pull request #12339 from edx/e0d/update-libary 
Bump SAML version.
 2016-05-05 07:45:43 -04:00
Afzal Wali
bdc398de17 Bumped the proctoring version. 2016-05-05 00:53:58 -04:00
Douglas Hall
ab8093ccd6 Allow content gating to work with library_content blocks 2016-05-05 00:53:45 -04:00
Douglas Hall
ee7f0302b0 Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting 2016-05-05 00:53:33 -04:00
Douglas Hall
9c71395de1 Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting 2016-05-05 00:53:23 -04:00
Malik Shahzad
e8e713c508 Add CourseDetails model to course_about template context. 2016-05-05 00:53:09 -04:00
Douglas Hall
1feb4fdb9f Merge pull request #12366 from edx/douglashall/microsite_platform_name 
Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting
 2016-05-05 00:47:27 -04:00
Douglas Hall
53604648d3 Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting 2016-05-04 23:45:16 -04:00
Clinton Blackburn
546f5f3da4 Merge pull request #12365 from edx/release-2016-05-03-conflict 
Merging release 2016-05-03 into master
 2016-05-04 23:12:42 -04:00
Clinton Blackburn
868d962002 Merge branch 'release' into release-2016-05-03-conflict 2016-05-04 20:01:29 -04:00
AlasdairSwan
816882a130 Merge pull request #12358 from edx/alasdair/ECOM-4338-program-progress-a11y-update 
Alasdair/ecom 4338 program progress a11y update
 2016-05-04 19:41:49 -04:00
Douglas Hall
2a8f44ad5c Merge pull request #12362 from edx/douglashall/fix_logistration_platform_name_display 
Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting
 2016-05-04 18:33:01 -04:00
Ned Batchelder
ff9e9d8bcf Merge pull request #12357 from edx/ned/registered-trademark 
Add a circle-R to the initial welcome message
 2016-05-04 17:41:41 -04:00
Douglas Hall
f914c44b80 Merge branch 'master' into douglashall/fix_logistration_platform_name_display 2016-05-04 16:47:13 -04:00
AlasdairSwan
f5d2499420 UPdated a11y approach for program card progress bars 2016-05-04 15:39:05 -04:00
Ned Batchelder
16fbad3f56 Add a circle-R to the initial welcome message 2016-05-04 15:13:18 -04:00
Christina Roberts
8127158e2a Merge pull request #12360 from edx/christina/tnl-4238 
Fix incorrect truncation issue.
 2016-05-04 15:02:56 -04:00
Calen Pennington
e97af55eec Add a nicer repr to AccessResponse objects 2016-05-04 14:51:31 -04: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
e87a8a0de3 Make tests run in verbose mode 2016-05-04 14:51:31 -04:00
Calen Pennington
9986efb9d7 Enable nose-faulthandler to catch segfaults during tests 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
Douglas Hall
e97fa49bea Check microsite configurations for PLATFORM_NAME setting before defaulting to global setting 2016-05-04 14:31:26 -04:00
Peter Fogg
268cb2ea17 Correctly pull in API access email config. 2016-05-04 14:23:46 -04:00
cahrens
b1f715690a Fix incorrect truncation issue. 
TNL-4238
 2016-05-04 13:28:06 -04:00
Clinton Blackburn
d6f68ca5ff Merge pull request #12307 from edx/rc/2016-05-03 
Release Candidate rc/2016-05-03
 2016-05-04 12:44:10 -04:00
Peter Fogg
85a6954d87 Merge pull request #12265 from edx/peter-fogg/catalog-admin-ui 
Catalog admin UI.
 2016-05-04 12:31:56 -04:00
Brian Jacobel
6055205dd4 Merge pull request #12356 from edx/karma 
JS tests no longer use js-test-tool
 2016-05-04 12:27:23 -04:00
Peter Fogg
bcde8e5588 Flesh out UI now that the backend is there. 2016-05-04 11:50:14 -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
Calen Pennington
39ff841d1f Don't pass arguments to setUp (for UrlResetMixin) 
The TestCase API doesn't accept arguments, so passing arguments for some
TestCase subclasses makes adding new inheritance/mixins tricky. Instead,
prefer configuration via class attributes for TestCases.
 2016-05-04 11:34:51 -04:00
Douglas Hall
6ba7133ba7 Merge pull request #12343 from edx/afzaledx/SOL-1780-increased-in-exam-polling-interval 
Bumped the proctoring version.
 2016-05-04 11:14:16 -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
Brian Jacobel
df32d2a130 Path update for Karma debug runner 2016-05-04 10:34:59 -04:00
Brian Jacobel
1d49dd9d49 JS tests no longer use js-test-tool 2016-05-04 10:28:38 -04:00
Toby Lawrence
00cbc291e6 Merge pull request #12283 from edx/PERF-317 
Add NewRelic instrumentation to contentserver.
 2016-05-04 09:57:35 -04:00