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

36799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carol Tong
26ea2dff56 Merge pull request #12311 from edx/carol/doc/DOC-2862_All 
DOC-2862: Add doc for Courses API
 2016-05-06 17:08:32 -04:00
Renzo Lucioni
0a61ab7549 Merge pull request #12389 from edx/renzo/fix-sprintf-bug 
Revert "Add js test for analytics event on LMS receipt page"
 2016-05-06 16:01:41 -04:00
John Eskew
e50c660805 Merge pull request #12346 from edx/jeskew/django_upgrade_1_8_13 
Upgrade to Django 1.8.13
 2016-05-06 15:57:50 -04:00
Carol Tong
a1394e9945 Add documentation for Courses API 2016-05-06 15:40:21 -04: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
289a4a2abe Merge pull request #12382 from edx/ahodges/DOC-2866 
Updates link to learner info in Numerical Input template
 2016-05-06 14:46:22 -04:00
Renzo Lucioni
c697986a3e Revert "Add js test for analytics event on LMS receipt page" 
This reverts commit f995114d11.
 2016-05-06 14:37:23 -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
Clinton Blackburn
07fb1645aa Merge pull request #12381 from edx/clintonb/credit-fix 
Multiple Credit Fixes
 2016-05-06 12:40:25 -04:00
Ben Patterson
162135736c Merge pull request #12361 from edx/benp/skip-extra-flaky-tests-fedx-88 
Skip tests that are too flaky to be reliable. FEDX-88.
 2016-05-06 12:16:41 -04:00
Jesse Zoldak
611222fb7f Merge pull request #12387 from edx/zoldak/update-jshint-threshold 
Lower the jshint threshold to 7550
 2016-05-06 11:41:50 -04:00
Ben Patterson
72af8afd67 Skip tests that are too flaky to be reliable. FEDX-88. 2016-05-06 11:27:33 -04:00
Clinton Blackburn
bcd762ef91 Updated credit requirements logic 
Credit eligibility can be updated up to the point that the course is closed or the student submits a request for credit. Credit eligibility cannot be removed.

ECOM-4379
 2016-05-06 10:51:06 -04:00
Diana Huang
2c12deccdd Merge pull request #12124 from edx/diana/conditional-transaction 
Convert conditional module test to bok choy
 2016-05-06 10:48:21 -04:00
Jesse Zoldak
d7e9db66c9 Lower the jshint threshold to 7550 2016-05-06 09:56:23 -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
Clinton Blackburn
9b24735cb9 Credit test cleanup 
Removed a lot of duplicate code!

ECOM-4379
 2016-05-06 02:59:11 -04:00
Clinton Blackburn
51715b9ec5 Exposing CreditRequirement and CreditRequirementStatus in admin 
ECOM-4379
 2016-05-06 02:59:11 -04:00
Alison Hodges
afc5686391 Updates link to learner info in Numerical Input template 2016-05-05 22:29:57 -04:00
Kevin Falcone
61ef49b94c Merge pull request #11922 from edx/jibsheet/html-escape-activation 
Enable safe by default in the activation flow
 2016-05-05 20:52:58 -04:00
Kevin Falcone
15e8829308 Enable safe by default in the activation flow 
The largest changes here were around HTML escaping in the translations.
 2016-05-05 16:39:17 -04:00
Simon Chen
759ad2eaf9 Merge pull request #12379 from edx/schen/ECOM-4352 
ECOM-4352 Update the min height of the title of the program cards
 2016-05-05 16:15:01 -04:00
Simon Chen
e13ab68090 ECOM-4352 Update the min height of the title of the program cards 2016-05-05 15:21:07 -04:00
Usman Khalid
8b645754a1 Merge pull request #12344 from edx/usman/tnl4398-karma-config-improvements 
Karma config improvements.
 2016-05-05 23:36:42 +05: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
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
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